Skip to content

Commit 35dad41

Browse files
dimlbcdimlbc
authored
Merge pull request #315 from mstable/feat/burn-musd-page
Feat/burn musd page
2 parents 59a20c5 + 7b046fe commit 35dad41

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+10022
-9319
lines changed

‎.github/workflows/dhedge-dev.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- uses: actions/setup-node@v3
3030
name: Setup node
3131
with:
32-
node-version: 18
32+
node-version: 20
3333
cache: 'yarn'
3434

3535
- name: Install jq

‎.github/workflows/dhedge-main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/setup-node@v3
1919
name: Setup node
2020
with:
21-
node-version: 18
21+
node-version: 20
2222
cache: 'yarn'
2323

2424
- name: Install jq

‎.github/workflows/dhedge-preview.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- uses: actions/setup-node@v3
2626
name: Setup node
2727
with:
28-
node-version: 18
28+
node-version: 20
2929
cache: 'yarn'
3030

3131
- name: webfactory/ssh-agent

‎.github/workflows/lts-dev.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- uses: actions/setup-node@v3
3030
name: Setup node
3131
with:
32-
node-version: 18
32+
node-version: 20
3333
cache: 'yarn'
3434

3535
- name: Install jq

‎.github/workflows/lts-main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/setup-node@v3
1919
name: Setup node
2020
with:
21-
node-version: 18
21+
node-version: 20
2222
cache: 'yarn'
2323

2424
- name: Install jq

‎.github/workflows/lts-preview.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- uses: actions/setup-node@v3
2626
name: Setup node
2727
with:
28-
node-version: 18
28+
node-version: 20
2929
cache: 'yarn'
3030

3131
- name: webfactory/ssh-agent

‎.github/workflows/mstable-dev.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- uses: actions/setup-node@v3
3030
name: Setup node
3131
with:
32-
node-version: 18
32+
node-version: 20
3333
cache: 'yarn'
3434

3535
- name: Install jq

‎.github/workflows/mstable-main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/setup-node@v3
1919
name: Setup node
2020
with:
21-
node-version: 18
21+
node-version: 20
2222
cache: 'yarn'
2323

2424
- name: Install jq

‎.github/workflows/mstable-preview.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- uses: actions/setup-node@v3
2626
name: Setup node
2727
with:
28-
node-version: 18
28+
node-version: 20
2929
cache: 'yarn'
3030

3131
- name: webfactory/ssh-agent

‎apps/lts/i18n/en.json

+12
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
"6T7RIi": {
1818
"defaultMessage": "BuyBack MTA"
1919
},
20+
"GH3iro": {
21+
"defaultMessage": "BuyBack mUSD"
22+
},
2023
"PXAur5": {
2124
"defaultMessage": "Withdraw"
2225
},
@@ -197,6 +200,15 @@
197200
"wqlXwW": {
198201
"defaultMessage": "Wrong Network"
199202
},
203+
"OWWJyo": {
204+
"defaultMessage": "Your {symbol} tokens will be sent to the same {network} address you used."
205+
},
206+
"XW7Rd1": {
207+
"defaultMessage": "After redeeming your vault tokens from Ethereum, please wait while the bridge issues your {symbol} tokens."
208+
},
209+
"j5iKZ9": {
210+
"defaultMessage": "Burn your mUSD and receive"
211+
},
200212
"20X0BC": {
201213
"defaultMessage": "Transaction Cancelled"
202214
},

‎apps/lts/src/assets/lang/en.json

+48
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,12 @@
550550
"value": "Discord"
551551
}
552552
],
553+
"GH3iro": [
554+
{
555+
"type": 0,
556+
"value": "BuyBack mUSD"
557+
}
558+
],
553559
"Gh1Vm9": [
554560
{
555561
"type": 0,
@@ -696,6 +702,28 @@
696702
"value": "Trading"
697703
}
698704
],
705+
"OWWJyo": [
706+
{
707+
"type": 0,
708+
"value": "Your "
709+
},
710+
{
711+
"type": 1,
712+
"value": "symbol"
713+
},
714+
{
715+
"type": 0,
716+
"value": " tokens will be sent to the same "
717+
},
718+
{
719+
"type": 1,
720+
"value": "network"
721+
},
722+
{
723+
"type": 0,
724+
"value": " address you used."
725+
}
726+
],
699727
"ObjU4O": [
700728
{
701729
"type": 0,
@@ -969,6 +997,20 @@
969997
"value": "Redeem"
970998
}
971999
],
1000+
"XW7Rd1": [
1001+
{
1002+
"type": 0,
1003+
"value": "After redeeming your vault tokens from Ethereum, please wait while the bridge issues your "
1004+
},
1005+
{
1006+
"type": 1,
1007+
"value": "symbol"
1008+
},
1009+
{
1010+
"type": 0,
1011+
"value": " tokens."
1012+
}
1013+
],
9721014
"XYEIBG": [
9731015
{
9741016
"type": 0,
@@ -1236,6 +1278,12 @@
12361278
"value": "Margin Deposited"
12371279
}
12381280
],
1281+
"j5iKZ9": [
1282+
{
1283+
"type": 0,
1284+
"value": "Burn your mUSD and receive"
1285+
}
1286+
],
12391287
"jvo0vs": [
12401288
{
12411289
"type": 0,

‎apps/lts/src/clients/wagmi.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import {
1414
walletConnectWallet,
1515
} from '@rainbow-me/rainbowkit/wallets';
1616
import { configureChains, createClient } from 'wagmi';
17-
import { mainnet, optimism, polygon } from 'wagmi/chains';
17+
import { arbitrum, mainnet, optimism, polygon } from 'wagmi/chains';
1818
import { alchemyProvider } from 'wagmi/providers/alchemy';
1919

2020
import type { Chain as RainbowKitChain, Wallet } from '@rainbow-me/rainbowkit';
@@ -30,7 +30,7 @@ const optimismWithCustomIconUrl = {
3030
const POLLING_INTERVAL = 15_000;
3131

3232
export const { chains, provider } = configureChains(
33-
[mainnet, polygon, optimismWithCustomIconUrl],
33+
[mainnet, polygon, optimismWithCustomIconUrl, arbitrum],
3434
[
3535
alchemyProvider({ apiKey: process.env['NX_ALCHEMY_MAIN_API_KEY'] }),
3636
alchemyProvider({ apiKey: process.env['NX_ALCHEMY_FALLBACK_API_KEY'] }),

‎apps/lts/src/routes.tsx

+9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Burn } from '@frontend/lts-burn';
2+
import { BurnMusd } from '@frontend/lts-burn-musd';
23
import { Withdraw } from '@frontend/lts-withdraw';
34
import { defineMessage } from 'react-intl';
45

@@ -29,4 +30,12 @@ export const routes: Route<LTSRoute>[] = [
2930
path: '/burn',
3031
element: <Burn />,
3132
},
33+
{
34+
id: 'burn-musd',
35+
meta: {
36+
label: defineMessage({ defaultMessage: 'BuyBack mUSD', id: 'GH3iro' }),
37+
},
38+
path: '/burn-musd',
39+
element: <BurnMusd />,
40+
},
3241
];

‎apps/mstable/i18n/en.json

+12-3
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
"6T7RIi": {
1818
"defaultMessage": "BuyBack MTA"
1919
},
20+
"GH3iro": {
21+
"defaultMessage": "BuyBack mUSD"
22+
},
2023
"PXAur5": {
2124
"defaultMessage": "Withdraw"
2225
},
@@ -197,6 +200,15 @@
197200
"wqlXwW": {
198201
"defaultMessage": "Wrong Network"
199202
},
203+
"OWWJyo": {
204+
"defaultMessage": "Your {symbol} tokens will be sent to the same {network} address you used."
205+
},
206+
"XW7Rd1": {
207+
"defaultMessage": "After redeeming your vault tokens from Ethereum, please wait while the bridge issues your {symbol} tokens."
208+
},
209+
"j5iKZ9": {
210+
"defaultMessage": "Burn your mUSD and receive"
211+
},
200212
"20X0BC": {
201213
"defaultMessage": "Transaction Cancelled"
202214
},
@@ -485,9 +497,6 @@
485497
"TL3yAY": {
486498
"defaultMessage": "Position Value"
487499
},
488-
"Tp2Mnw": {
489-
"defaultMessage": "Due to possible high slippage on lower withdrawal amounts, please consider withdrawing a minimum of ${minWithdrawalUsd} or manually increasing the maximum slippage."
490-
},
491500
"VyTtUL": {
492501
"defaultMessage": "The {symbol} Vault charges a {fee} entry fee."
493502
},

‎apps/mstable/src/assets/lang/en.json

+48-14
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,12 @@
550550
"value": "Discord"
551551
}
552552
],
553+
"GH3iro": [
554+
{
555+
"type": 0,
556+
"value": "BuyBack mUSD"
557+
}
558+
],
553559
"Gh1Vm9": [
554560
{
555561
"type": 0,
@@ -696,6 +702,28 @@
696702
"value": "Trading"
697703
}
698704
],
705+
"OWWJyo": [
706+
{
707+
"type": 0,
708+
"value": "Your "
709+
},
710+
{
711+
"type": 1,
712+
"value": "symbol"
713+
},
714+
{
715+
"type": 0,
716+
"value": " tokens will be sent to the same "
717+
},
718+
{
719+
"type": 1,
720+
"value": "network"
721+
},
722+
{
723+
"type": 0,
724+
"value": " address you used."
725+
}
726+
],
699727
"ObjU4O": [
700728
{
701729
"type": 0,
@@ -823,20 +851,6 @@
823851
"value": "Position Value"
824852
}
825853
],
826-
"Tp2Mnw": [
827-
{
828-
"type": 0,
829-
"value": "Due to possible high slippage on lower withdrawal amounts, please consider withdrawing a minimum of $"
830-
},
831-
{
832-
"type": 1,
833-
"value": "minWithdrawalUsd"
834-
},
835-
{
836-
"type": 0,
837-
"value": " or manually increasing the maximum slippage."
838-
}
839-
],
840854
"Ty3dr6": [
841855
{
842856
"type": 0,
@@ -969,6 +983,20 @@
969983
"value": "Redeem"
970984
}
971985
],
986+
"XW7Rd1": [
987+
{
988+
"type": 0,
989+
"value": "After redeeming your vault tokens from Ethereum, please wait while the bridge issues your "
990+
},
991+
{
992+
"type": 1,
993+
"value": "symbol"
994+
},
995+
{
996+
"type": 0,
997+
"value": " tokens."
998+
}
999+
],
9721000
"XYEIBG": [
9731001
{
9741002
"type": 0,
@@ -1236,6 +1264,12 @@
12361264
"value": "Margin Deposited"
12371265
}
12381266
],
1267+
"j5iKZ9": [
1268+
{
1269+
"type": 0,
1270+
"value": "Burn your mUSD and receive"
1271+
}
1272+
],
12391273
"jvo0vs": [
12401274
{
12411275
"type": 0,

‎libs/dhedge/withdraw/src/components/UnclaimedTokens/index.tsx

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import { Stack, Typography } from '@mui/material';
22

33
import { l2Token } from '../../constants';
4-
import { useUnclaimedL2Tokens } from '../../hooks/useUnclaimedL2Tokens';
4+
import { useUnclaimedL2TokenAmount } from '../../hooks/useUnclaimedL2TokenAmount';
55
import { ClaimButton } from './ClaimButton';
66

77
import type { FC } from 'react';
88

99
export const UnclaimedTokens: FC = () => {
10-
const unclaimedL2Tokens = useUnclaimedL2Tokens();
10+
const unclaimedL2Tokens = useUnclaimedL2TokenAmount();
1111

1212
if (!unclaimedL2Tokens.length) return null;
1313

0 commit comments

Comments
 (0)