Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jonator/hotfix round 1 #985

Merged
merged 280 commits into from
Nov 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
280 commits
Select commit Hold shift + click to select a range
8cccbbf
Tweak banner and add event listeners
jonator Oct 1, 2022
323028c
Remove non-external data from external query store
jonator Oct 3, 2022
7cb051e
Fix external query ref
jonator Oct 3, 2022
d29c14c
Fix memoization issues
jonator Oct 3, 2022
e1deac6
Refactor + add "add liquidity" quick action
jonator Oct 3, 2022
afcbb20
Move toasts
jonator Oct 3, 2022
89f969f
Add quick actions to external incentives table
jonator Oct 3, 2022
f909ee6
Add remove liquidity + filter options for user-relevance
jonator Oct 4, 2022
7307aaa
Fix quick action menu filter
jonator Oct 4, 2022
f5bdae2
Add superfluid config, naming
jonator Oct 5, 2022
418e587
Only show remove liquidity if liquidity available
jonator Oct 5, 2022
248a4bf
Add quick lock callbacks
jonator Oct 5, 2022
173c583
Merge branch 'stage' into feat/redesign
jonator Oct 6, 2022
e2d31e1
Update .gitignore
jonator Oct 6, 2022
c417372
Add pool detail and gauge wrapper hooks
jonator Oct 7, 2022
a0dd329
Add superfluid modal to quick action
jonator Oct 7, 2022
814b41f
Remove logs
jonator Oct 7, 2022
f422d24
Tweaks for assets page
jonator Oct 7, 2022
6824cee
Fix ref error
jonator Oct 7, 2022
fd0e575
Merge branch 'feat/redesign' into jonator/redesign/assets-page
jonator Oct 9, 2022
d81ad34
Rename pool detail and SFS pool store -> config
jonator Oct 11, 2022
e807cd1
Remove highcharts from bundle
jonator Oct 11, 2022
1552b28
Fix nav bar button reset bug
jonator Oct 11, 2022
834079d
Merge pull request #888 from osmosis-labs/jonator/redesign/assets-page
jonator Oct 11, 2022
3808ffd
Overload nav bar hook
jonator Oct 11, 2022
3a5cb3b
WIP new pool page (header)
jonator Oct 12, 2022
686c450
Merge branch 'master' into jonator/redesign/pool-detail
jonator Oct 12, 2022
20d0552
Create pool, step 1
jonator Oct 12, 2022
9370f53
Progress on create pool modal
jonator Oct 13, 2022
7a28297
Responsive pool page overview graphic
jonator Oct 13, 2022
387e031
Filter pool dust via user setting
jonator Oct 13, 2022
62f444e
Store dust setting in local storage
jonator Oct 13, 2022
2e00f60
Filter assets
jonator Oct 13, 2022
4590930
Filter pools in assets page
jonator Oct 13, 2022
b18fb45
Fix nav bar store
jonator Oct 14, 2022
335e14b
Fix error state + button disabled state
jonator Oct 14, 2022
d4ccee4
Update step 2
jonator Oct 14, 2022
d0b1a35
Step 3 create pool
jonator Oct 14, 2022
5b02f2c
Trade tokens modal
jonator Oct 14, 2022
402ac90
Remove primary 200
jonator Oct 14, 2022
964a0c9
Use name in nav bar instead of address
jonator Oct 15, 2022
3939b5a
WIP new pool detail page
jonator Oct 15, 2022
481d8e6
Accumulate prior internal incentives
jonator Oct 15, 2022
ef86d97
Move superfluid info
jonator Oct 16, 2022
c1cf621
Add superfluid UI
jonator Oct 16, 2022
ee7aa45
Go superfluid
jonator Oct 17, 2022
bad5505
Add unlock token functionality WIP
jonator Oct 17, 2022
e8b3278
Tweak drawer
jonator Oct 19, 2022
c3df21d
Set up add and remove liquidity modals, remove manage liquidity modal
jonator Oct 19, 2022
7100c6e
WIP new remove liquidity
jonator Oct 19, 2022
aa6c092
New slider
jonator Oct 19, 2022
f1ddbd3
Update remove liquidity
jonator Oct 19, 2022
13f79ba
Fix build errors
jonator Oct 19, 2022
15c8d5c
Fix swap fee apy
jonator Oct 19, 2022
953d92f
Update display of APRs + refactor external query store
jonator Oct 19, 2022
bcd4802
Add swap fee row
jonator Oct 19, 2022
3664cac
Fix drawer positioning
jonator Oct 19, 2022
2a019b6
Increase height of drawer
jonator Oct 20, 2022
ed9c184
Add vial images
jonator Oct 20, 2022
3c30868
Use memoization
jonator Oct 20, 2022
cb2b84d
Add updated "go superfluid"
jonator Oct 20, 2022
0d18b64
Handle go superfluid
jonator Oct 20, 2022
7cfb470
Move details button on drawer expansion
jonator Oct 20, 2022
cbd7b1d
Add fallback img for sfs validators
jonator Oct 20, 2022
6167f39
Tweak drawer
jonator Oct 20, 2022
4b4686c
WIP update lock tokens modal
jonator Oct 20, 2022
fdabc6d
remove shadows
jonator Oct 20, 2022
07b7f09
Update lock tokens modal w/ apr
jonator Oct 20, 2022
01e1015
Remove max button
jonator Oct 20, 2022
65bc42b
Update add liquidity modal
jonator Oct 20, 2022
a22de80
Show shares in remove liquidity
jonator Oct 20, 2022
39fdc06
Fix react warning
jonator Oct 20, 2022
e876f2a
Fix unlock bug
jonator Oct 20, 2022
c32da97
Fix color
jonator Oct 20, 2022
f1f45d2
Tweak create pool UI
jonator Oct 21, 2022
8851b5c
Show unbonding shares
jonator Oct 21, 2022
b27b04b
Localization (#899)
DLatouche Oct 21, 2022
eadb570
Tweak
jonator Oct 21, 2022
d75a0b5
Merge branch 'master' into feat/redesign
jonator Oct 21, 2022
4832bbc
Merge branch 'feat/redesign' into jonator/redesign/pool-detail
jonator Oct 21, 2022
2027f41
Fix errors from merge
jonator Oct 21, 2022
7dcef91
Merge branch 'master' into feat/redesign
jonator Oct 21, 2022
bf22387
Merge branch 'feat/redesign' into jonator/redesign/pool-detail
jonator Oct 21, 2022
0a17131
Add pool catalyst view
jonator Oct 22, 2022
d2b8370
Fix drawer
jonator Oct 22, 2022
f31f810
Add user stats
jonator Oct 23, 2022
98c9027
Add user stats view WIP
jonator Oct 23, 2022
323c8cc
Merge branch 'master' into jonator/redesign/pool-detail
jonator Oct 25, 2022
ed2bd90
Update gauge APR calculation
jonator Oct 25, 2022
ebc22cc
APY -> APR
jonator Oct 25, 2022
2d5027e
Merge pull request #912 from osmosis-labs/jonator/redesign/pool-detail
jonator Oct 26, 2022
9bb7408
WIP sidebar and pool detail page
jonator Oct 26, 2022
c22ed3e
WIP mobile pool detail page - level 1
jonator Oct 26, 2022
96825fd
Mobile navbar WIP
jonator Oct 26, 2022
e275186
Progress on mobile nav
jonator Oct 27, 2022
e8074ae
Pools page and pool detail page WIP
jonator Oct 27, 2022
ff0ff37
Fix pool detail
jonator Oct 27, 2022
50ff260
Pools page
jonator Oct 27, 2022
03ccfc9
Update tab text
jonator Oct 27, 2022
9a39e70
Asset table
jonator Oct 27, 2022
40c2256
Tweak assets page
jonator Oct 27, 2022
b0b8e2f
New pre-transfer modal
jonator Oct 27, 2022
06a0d1e
Fix build errors
jonator Oct 28, 2022
c6e7b1f
Add fiat on ramps (#924)
jonator Oct 28, 2022
af1cd30
Merge branch 'feat/redesign' into jonator/redesign/mobile
jonator Oct 28, 2022
8b1ab2c
Update buttons
jonator Oct 28, 2022
53d4de4
Fix null check
jonator Oct 28, 2022
06058df
Fix connect wallet buttons
jonator Oct 28, 2022
1e6adca
Fix padding
jonator Oct 28, 2022
3f448de
Mobile remove and add liquidity
jonator Oct 28, 2022
682ad5a
Update pool page with create pool at bottom
jonator Oct 28, 2022
d554f09
Update to Kevin's recommended preview image
jonator Oct 31, 2022
cc1dcae
Add pool rewards query
jonator Oct 31, 2022
a391d78
Fix daily reward query
jonator Oct 31, 2022
cabe9f3
Fix formatting
jonator Oct 31, 2022
4933475
Fix metric being displayed
jonator Oct 31, 2022
722872e
User stats on mobile + missing title
jonator Oct 31, 2022
918d7d5
Update pool detail page translations
jonator Oct 31, 2022
d470b1e
Translate errors, cleanup
jonator Oct 31, 2022
654f4b1
Lock tokens modal tx
jonator Oct 31, 2022
b810cf7
More translations
jonator Oct 31, 2022
22da364
Create pool + go superfluid
jonator Oct 31, 2022
ad303f0
Fix liquidity buttons on various screen sizes
jonator Oct 31, 2022
0f8c5bb
More tweaks for localization and lock token modal
jonator Oct 31, 2022
5edb285
Fix mobile nav bar + menu
jonator Oct 31, 2022
a31e652
Tweaks
jonator Oct 31, 2022
f68aad3
Update colors and tooltip + update icons
jonator Nov 1, 2022
25a2ea6
Add translations (#947)
DLatouche Nov 1, 2022
62a155e
Fix translations
jonator Nov 1, 2022
aa1e0df
Fix incentive drawer text wrap + rem log
jonator Nov 1, 2022
a41f306
Mobile redesign + fixes (#937)
jonator Nov 1, 2022
3c081d6
Merge branch 'jonator/redesign/mobile' into feat/redesign
jonator Nov 1, 2022
c2df5e9
Don't show on ramps on mobile
jonator Nov 1, 2022
69c359c
Add missing translations
jonator Nov 1, 2022
7ba214c
update fr translations (#949)
DLatouche Nov 2, 2022
cbba96e
Updates
jonator Nov 2, 2022
d7df03c
Remove space
jonator Nov 2, 2022
8416e53
Remove old button component
jonator Nov 2, 2022
1312aa7
Remove old colors, update sfs modal
jonator Nov 2, 2022
2dcfa89
Update trade clipboard WIP
jonator Nov 2, 2022
7d7223c
Trade clipboard mobile
jonator Nov 2, 2022
db63d57
Always use token select modal
jonator Nov 2, 2022
4889ed9
Update colors in pool token select
jonator Nov 2, 2022
7f3be44
Remove bg-card
jonator Nov 2, 2022
d49a0d4
Remove bg-card 2
jonator Nov 2, 2022
6ed1888
Fix colors
jonator Nov 2, 2022
c42887e
CSS fixes
jonator Nov 2, 2022
77cab8a
Update menu label, add missing translations
jonator Nov 2, 2022
d4d3058
Tweak trade clipboard
jonator Nov 2, 2022
78aa89c
Tweaks and add learn more link
jonator Nov 2, 2022
6b88269
Merge branch 'stage' into feat/redesign
jonator Nov 2, 2022
1ced752
Disable button
jonator Nov 2, 2022
4215937
Text over graphic
jonator Nov 2, 2022
31eb3a0
Update readme, remove unused code
jonator Nov 2, 2022
dbdea44
Tweaks
jonator Nov 2, 2022
fbfcf6a
Adjust modal background
jonator Nov 2, 2022
ba2b760
Transfer modal fixes
jonator Nov 2, 2022
80c3a4f
Fix address display issue
jonator Nov 2, 2022
08459c9
Fix from address logic
jonator Nov 2, 2022
bde7267
Colors
jonator Nov 3, 2022
0ef2c2a
Add insufficient balance error
jonator Nov 3, 2022
ea16e8b
Add error message to create pool
jonator Nov 3, 2022
cf95884
Add superfluid APR, remove log
jonator Nov 3, 2022
818bc56
save settings in local storage in UserSetting (#951)
DLatouche Nov 3, 2022
a1c1c28
Adjust shares on mobile/ handle overflow
jonator Nov 3, 2022
e8543f7
Add feature flag for transak
jonator Nov 3, 2022
c6a1618
Mobile- reduce size
jonator Nov 3, 2022
cfce47e
Use configured base urls
jonator Nov 3, 2022
c2cd787
add frontier colors - remove unused gradients
jonator Nov 4, 2022
d4c8b2a
Update superfluid color
jonator Nov 4, 2022
0e2cba8
add korean WIP (#953)
gnujoow Nov 4, 2022
685b1e9
Merge remote-tracking branch 'origin/feat/redesign' into feat/redesign
jonator Nov 4, 2022
2d6764b
Remove language icons, use native language in menu
jonator Nov 4, 2022
2642611
Add levels to bond liquidity config
jonator Nov 4, 2022
a3798e0
Subtract the sfs APR
jonator Nov 4, 2022
355e6f8
Comment
jonator Nov 4, 2022
4a84966
Declare type explicitly
jonator Nov 4, 2022
1a81520
Merge branch 'stage' into feat/redesign
jonator Nov 4, 2022
369cae6
Added Polish translation (#960)
pawarm Nov 4, 2022
87d9e1c
Use cloudflare price middleware
jonator Nov 4, 2022
c1bb675
Español esta aqui amigos (#962)
daniel-farina Nov 5, 2022
31bf8ad
Turkish Language Added
HuginnAcademy Nov 5, 2022
864a310
Merge branch 'feat/redesign' into Turkish-Localization
HuginnAcademy Nov 6, 2022
fa24334
Superfulid text, wallet info button
jonator Nov 6, 2022
be89dd6
Left align transfer table text
jonator Nov 7, 2022
a336567
Animate pool card hover
jonator Nov 7, 2022
d8e6d93
Fix superfluid texts
jonator Nov 7, 2022
5fab005
Reduce size of
jonator Nov 7, 2022
0724672
Center switch icon
jonator Nov 7, 2022
9565a73
Manual slippage bg
jonator Nov 7, 2022
9ca0357
Merge pull request #966 from HuginnAcademy/Turkish-Localization
jonator Nov 7, 2022
ba3745d
Fix turkish
jonator Nov 7, 2022
3841150
Button height and color transition
jonator Nov 7, 2022
7f6a8aa
Use normal position for token select
jonator Nov 7, 2022
7d5463c
Various fixes
jonator Nov 7, 2022
b938932
Fix quick action dropdown location, close others
jonator Nov 7, 2022
7fcf12b
Fix menu dropdowns, use border button swap tool
jonator Nov 7, 2022
8d330bc
Fixes + improvements
jonator Nov 7, 2022
3d408c5
Fixes
jonator Nov 7, 2022
46e2cd0
Use coingecko
jonator Nov 7, 2022
a1ff503
Update bond card arrangement
jonator Nov 7, 2022
e64541a
Fix bond card backdrop
jonator Nov 7, 2022
ccf4798
Revert "Use coingecko"
jonator Nov 7, 2022
eb03da2
Fix pool quick action bug
jonator Nov 7, 2022
5f00223
Auto set superfluid
jonator Nov 7, 2022
4b83ff4
Frontier button black text
jonator Nov 7, 2022
77b9ed5
Black -> osmoverse
jonator Nov 7, 2022
f309446
Update nav bar, buttons, tablet
jonator Nov 7, 2022
0863856
Tweak asset table controls
jonator Nov 7, 2022
665921b
Input box animation on focus
jonator Nov 7, 2022
42994fe
Caret color
jonator Nov 7, 2022
3ba92f3
Trade page bg
jonator Nov 7, 2022
7481579
Lock token menu, make sidebar text AX
jonator Nov 7, 2022
8fe3840
Dropdown hover state
jonator Nov 7, 2022
02e8051
Remove selected language from dropdown
jonator Nov 7, 2022
324067e
Pool detail gap
jonator Nov 7, 2022
83a698e
Tweaks
jonator Nov 7, 2022
a1d6b45
Close quick action modal on tx complete
jonator Nov 7, 2022
ab18d8d
Lock tokens on mobile modal tweak
jonator Nov 7, 2022
b804755
Lock token modal - mobile
jonator Nov 7, 2022
96cf2e3
Add arrow button
jonator Nov 8, 2022
e55ce79
Fix quick action modal titles
jonator Nov 8, 2022
0378519
Update bond card
jonator Nov 8, 2022
7c98b35
Merge branch 'master' into stage
jonator Nov 8, 2022
000e798
Merge branch 'stage' into feat/redesign
jonator Nov 8, 2022
d34f02f
Tweak table spacing
jonator Nov 8, 2022
04deea8
remove scrollbar style
jonator Nov 8, 2022
d2daf23
Match button sizes
jonator Nov 8, 2022
af822f6
Pool table control spacing + focus effect
jonator Nov 8, 2022
3000433
Update Spanish (#973)
daniel-farina Nov 8, 2022
e94bec5
Fix button style
jonator Nov 8, 2022
e3ab607
Translate wrap asset link
jonator Nov 8, 2022
9fcea34
Fix external links
jonator Nov 8, 2022
73c3e4f
UI for no bonding periods
jonator Nov 9, 2022
32104dc
Merge pull request #927 from osmosis-labs/feat/redesign
jonator Nov 9, 2022
c28eb6a
Tweaks on mobile pool detail page
jonator Nov 9, 2022
a7c2bed
Tablet pool detail tweaks
jonator Nov 9, 2022
f4bd2d0
Mobile tweaks
jonator Nov 9, 2022
77f2d62
Tweak nav bar spacing
jonator Nov 9, 2022
6effe64
Tweak search bar offset
jonator Nov 9, 2022
2504d78
Remove white background
jonator Nov 9, 2022
83f9fc7
Add files via upload (#981)
HuginnAcademy Nov 9, 2022
b7e097c
Fix text wrap error
jonator Nov 9, 2022
0555249
Fix stablecoin info box
jonator Nov 9, 2022
e88706f
Close swap modal in pool detail page
jonator Nov 9, 2022
5284075
Handle asset select edge caes
jonator Nov 9, 2022
2e1d2f9
Merge branch 'master' into jonator/hotfix
jonator Nov 9, 2022
85d1976
Fix obscure assets table button bug
jonator Nov 9, 2022
d5c6107
Preload hovered images
jonator Nov 9, 2022
5dfc8ec
Fix network dropdown
jonator Nov 9, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 21 additions & 5 deletions packages/web/components/alert/info.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export const Info: FunctionComponent<
{ size?: "large" | "subtle" } & Alert & {
data?: string;
borderClassName?: string;
textClassName?: string;
} & CustomClasses &
MobileProps
> = ({
Expand All @@ -15,6 +16,7 @@ export const Info: FunctionComponent<
caption,
data,
borderClassName,
textClassName,
className,
isMobile = false,
}) =>
Expand All @@ -25,7 +27,14 @@ export const Info: FunctionComponent<
className
)}
>
<span className="subtitle1 text-white-mid md:caption">{message}</span>
<span
className={classNames(
"subtitle1 text-wosmongton-100 md:caption",
textClassName
)}
>
{message}
</span>
</div>
) : (
<div
Expand All @@ -36,7 +45,7 @@ export const Info: FunctionComponent<
>
<div
className={classNames(
"flex grow place-content-between md:gap-1 px-5 py-4 md:p-2 bg-osmoverse-800 rounded-2xlinset",
"flex grow place-content-between md:gap-1 px-3 py-2 md:p-2 bg-osmoverse-800 rounded-2xlinset",
{
"items-center": !data,
},
Expand All @@ -45,15 +54,22 @@ export const Info: FunctionComponent<
>
<div className="flex flex-col">
{isMobile ? (
<span className="caption">
<span className={classNames("caption", textClassName)}>
{message}
{data && ` - ${data}`}
</span>
) : (
<h6>{message}</h6>
<span className={classNames("body2", textClassName)}>
{message}
</span>
)}
{caption && (
<span className="text-osmoverse-400 body2 md:caption">
<span
className={classNames(
"text-wosmongton-100 body2 md:caption",
textClassName
)}
>
{caption}
</span>
)}
Expand Down
28 changes: 11 additions & 17 deletions packages/web/components/complex/add-liquidity.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,23 +94,6 @@ export const AddLiquidity: FunctionComponent<
key={currency.coinDenom}
className="flex flex-col gap-1 w-full md:p-3 p-4 border border-osmoverse-700 md:rounded-xl rounded-2xl"
>
{isPeggedCurrency && (
<Info
size="subtle"
className="border-2 border-rust-200/30"
message={`You are adding liquidity to ${
currency!.originCurrency!.coinDenom
}, ${
["a", "e", "i", "o", "u"].some((vowel) =>
currency.originCurrency!.pegMechanism!.startsWith(vowel)
)
? "an"
: "a"
} ${
currency.originCurrency!.pegMechanism
}-backed stablecoin.`}
/>
)}
<div className="flex items-center w-full place-content-between">
{addLiquidityConfig.isSingleAmountIn ? (
<PoolTokenSelect
Expand Down Expand Up @@ -197,6 +180,17 @@ export const AddLiquidity: FunctionComponent<
</div>
</div>
</div>
{isPeggedCurrency && (
<Info
className="text-wosmongton-100"
borderClassName="bg-gradient-neutral"
textClassName="w-full text-center"
message={t("addLiquidity.stablecoinWarning", {
denom: currency!.originCurrency!.coinDenom,
mechanism: currency.originCurrency!.pegMechanism!,
})}
/>
)}
</div>
);
})}
Expand Down
1 change: 1 addition & 0 deletions packages/web/components/navbar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,7 @@ const NavBarButton: FunctionComponent<
src={hovered ? hovericonurl : iconurl}
height={24}
width={24}
priority={true}
/>
</button>
);
Expand Down
2 changes: 2 additions & 0 deletions packages/web/components/table/cells/transfer-button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,15 @@ const TransferButton: FunctionComponent<{
src="/icons/chevron-right-rust.svg"
height={13}
width={13}
priority={true}
/>
) : (
<Image
alt="chevron"
src="/icons/chevron-right.svg"
height={13}
width={13}
priority={true}
/>
)}
</button>
Expand Down
Loading