From 725443f5901ee7b9832acb3085011f81fb2df599 Mon Sep 17 00:00:00 2001 From: jinoosss Date: Fri, 8 Dec 2023 18:43:43 +0900 Subject: [PATCH] fix: Fix a test data to foo token --- .../components/common/bar-graph/BarGraph.tsx | 86 +++++++++---------- .../TokenAmountInput.spec.tsx | 9 +- .../TokenAmountInput.stories.tsx | 8 +- .../common/token-amount/TokenAmount.spec.tsx | 8 +- .../token-amount/TokenAmount.stories.tsx | 8 +- .../EarnAddLiquidity.stories.tsx | 16 ++-- .../earn/pool-info/PoolInfo.stories.tsx | 8 +- .../home/home-swap/HomeSwap.stories.tsx | 4 +- .../TokenChartInfo.storeis.tsx | 2 +- .../token/token-swap/TokenSwap.stories.tsx | 8 +- .../deposit-modal/DepositModal.spec.tsx | 12 +-- .../deposit-modal/DepositModal.stories.tsx | 12 +-- .../withdraw-modal/WithDrawModal.spec.tsx | 12 +-- .../withdraw-modal/WithDrawModal.stories.tsx | 12 +-- .../AssetListContainer.tsx | 20 ++--- .../header-container/HeaderContainer.tsx | 8 +- .../home-swap-container/HomeSwapContainer.tsx | 4 +- .../WalletBalanceContainer.tsx | 12 +-- .../web/src/models/pool/mapper/pool-mapper.ts | 8 +- .../repositories/pool/mock/pool-detail.json | 4 +- .../web/src/repositories/pool/mock/pools.json | 4 +- 21 files changed, 133 insertions(+), 132 deletions(-) diff --git a/packages/web/src/components/common/bar-graph/BarGraph.tsx b/packages/web/src/components/common/bar-graph/BarGraph.tsx index b317fe5cd..1cbf70dc8 100644 --- a/packages/web/src/components/common/bar-graph/BarGraph.tsx +++ b/packages/web/src/components/common/bar-graph/BarGraph.tsx @@ -18,7 +18,7 @@ export interface BarGraphProps { tooltipOption?: string; svgColor?: string; currentIndex?: number; - customData?: { height: number, locationTooltip: number}; + customData?: { height: number, locationTooltip: number }; times?: string[]; radiusBorder?: number; } @@ -75,7 +75,7 @@ const BarGraph: React.FC = ({ height = VIEWPORT_DEFAULT_HEIGHT, tooltipOption = "default", svgColor = "default", - customData = { height: 0, locationTooltip: 0}, + customData = { height: 0, locationTooltip: 0 }, times = [], radiusBorder = 0, }) => { @@ -166,7 +166,7 @@ const BarGraph: React.FC = ({ setCurrentPointIndex(-1); return; } - const { currentTarget } = event; + const { currentTarget } = event; const { left, top } = currentTarget.getBoundingClientRect(); const positionX = (clientX || 0) - left; const clientWidth = currentTarget.clientWidth; @@ -190,7 +190,7 @@ const BarGraph: React.FC = ({ setCurrentPointIndex(currentPointIndex); } if (currentPoint) { - setChartPoint({ x: positionX, y: (clientY || 0) - top}); + setChartPoint({ x: positionX, y: (clientY || 0) - top }); setCurrentPoint(currentPoint); } } @@ -208,11 +208,11 @@ const BarGraph: React.FC = ({ return "right"; }, [currentPoint, width, locationTooltip, height, chartPoint, customHeight]); - + const onTouchMove = (event: React.MouseEvent | React.TouchEvent) => { onMouseMove(event); }; - + const onTouchStart = (event: React.MouseEvent | React.TouchEvent) => { event.preventDefault(); onMouseMove(event); @@ -230,45 +230,45 @@ const BarGraph: React.FC = ({ onTouchMove={onTouchMove} onTouchStart={onTouchStart} > - -1 && activated ? - -
- - {parseTime(times[currentPointIndex]).date} - -
-
- {`$${Number(BigNumber( - datas[currentPointIndex], - )).toLocaleString()}`} -
-
: - tooltipOption === "incentivized" && currentPointIndex > -1 && activated ? - -
-
Token
-
Amount
-
Price Range
-
-
-
- token logo - BTC + -1 && activated ? + +
+ + {parseTime(times[currentPointIndex]).date} +
-
-
-
19.30K - 21.45K ADN
-
-
-
- token logo - BTC +
+ {`$${Number(BigNumber( + datas[currentPointIndex], + )).toLocaleString()}`}
-
Amount
-
0.000046 - 0.000051 BTC
-
- : null - }> + : + tooltipOption === "incentivized" && currentPointIndex > -1 && activated ? + +
+
Token
+
Amount
+
Price Range
+
+
+
+ token logo + BTC +
+
-
+
19.30K - 21.45K ADN
+
+
+
+ token logo + BTC +
+
Amount
+
0.000046 - 0.000051 BTC
+
+
: null + }> diff --git a/packages/web/src/components/common/token-amount-input/TokenAmountInput.spec.tsx b/packages/web/src/components/common/token-amount-input/TokenAmountInput.spec.tsx index 9fe1fbd6d..cc5f1a1d1 100644 --- a/packages/web/src/components/common/token-amount-input/TokenAmountInput.spec.tsx +++ b/packages/web/src/components/common/token-amount-input/TokenAmountInput.spec.tsx @@ -9,18 +9,19 @@ const token: TokenModel = { createdAt: "2023-10-10T08:48:46+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, - symbol: "GNOS", - logoURI: "https://s2.coinmarketcap.com/static/img/coins/64x64/5994.png", + symbol: "GNS", + logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/grc20/images/gno_land_r_gns.svg", type: "grc20", - priceId: "gno.land/r/gnos" + priceId: "gno.land/r/gns" }; describe("TokenAmountInput Component", () => { it("TokenAmountInput render", () => { const args: TokenAmountInputProps = { token, + connected: true, amount: "12,211", balance: "12,211", usdValue: "12.3", diff --git a/packages/web/src/components/common/token-amount-input/TokenAmountInput.stories.tsx b/packages/web/src/components/common/token-amount-input/TokenAmountInput.stories.tsx index 3e2430e7c..bd68d546a 100644 --- a/packages/web/src/components/common/token-amount-input/TokenAmountInput.stories.tsx +++ b/packages/web/src/components/common/token-amount-input/TokenAmountInput.stories.tsx @@ -13,12 +13,12 @@ const token: TokenModel = { createdAt: "2023-10-10T08:48:46+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, - symbol: "GNOS", - logoURI: "https://s2.coinmarketcap.com/static/img/coins/64x64/5994.png", + symbol: "GNS", + logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/grc20/images/gno_land_r_gns.svg", type: "grc20", - priceId: "gno.land/r/gnos" + priceId: "gno.land/r/gns" }; export const Default: StoryObj = { diff --git a/packages/web/src/components/common/token-amount/TokenAmount.spec.tsx b/packages/web/src/components/common/token-amount/TokenAmount.spec.tsx index f751186e2..14f4f703f 100644 --- a/packages/web/src/components/common/token-amount/TokenAmount.spec.tsx +++ b/packages/web/src/components/common/token-amount/TokenAmount.spec.tsx @@ -9,12 +9,12 @@ const token: TokenModel = { createdAt: "2023-10-10T08:48:46+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, - symbol: "GNOS", - logoURI: "https://s2.coinmarketcap.com/static/img/coins/64x64/5994.png", + symbol: "GNS", + logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/grc20/images/gno_land_r_gns.svg", type: "grc20", - priceId: "gno.land/r/gnos" + priceId: "gno.land/r/gns" }; describe("TokenAmount Component", () => { diff --git a/packages/web/src/components/common/token-amount/TokenAmount.stories.tsx b/packages/web/src/components/common/token-amount/TokenAmount.stories.tsx index b2dd679e9..b94e0f7c9 100644 --- a/packages/web/src/components/common/token-amount/TokenAmount.stories.tsx +++ b/packages/web/src/components/common/token-amount/TokenAmount.stories.tsx @@ -12,12 +12,12 @@ const token: TokenModel = { createdAt: "2023-10-10T08:48:46+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, - symbol: "GNOS", - logoURI: "https://s2.coinmarketcap.com/static/img/coins/64x64/5994.png", + symbol: "GNS", + logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/grc20/images/gno_land_r_gns.svg", type: "grc20", - priceId: "gno.land/r/gnos" + priceId: "gno.land/r/gns" }; export const Default: StoryObj = { diff --git a/packages/web/src/components/earn-add/earn-add-liquidity/EarnAddLiquidity.stories.tsx b/packages/web/src/components/earn-add/earn-add-liquidity/EarnAddLiquidity.stories.tsx index 86fa2da99..37abd9456 100644 --- a/packages/web/src/components/earn-add/earn-add-liquidity/EarnAddLiquidity.stories.tsx +++ b/packages/web/src/components/earn-add/earn-add-liquidity/EarnAddLiquidity.stories.tsx @@ -18,24 +18,24 @@ const tokenA: TokenModel = { createdAt: "2023-10-10T08:48:46+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, - symbol: "GNOS", - logoURI: "https://s2.coinmarketcap.com/static/img/coins/64x64/5994.png", + symbol: "GNS", + logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/grc20/images/gno_land_r_gns.svg", type: "grc20", - priceId: "gno.land/r/gnos" + priceId: "gno.land/r/gns" }; const tokenB: TokenModel = { chainId: "dev", createdAt: "2023-10-10T08:48:46+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, - symbol: "GNOS", - logoURI: "https://s2.coinmarketcap.com/static/img/coins/64x64/5994.png", + symbol: "GNS", + logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/grc20/images/gno_land_r_gns.svg", type: "grc20", - priceId: "gno.land/r/gnos" + priceId: "gno.land/r/gns" }; export const Default = Template.bind({}); diff --git a/packages/web/src/components/earn/pool-info/PoolInfo.stories.tsx b/packages/web/src/components/earn/pool-info/PoolInfo.stories.tsx index 269c62309..92206e888 100644 --- a/packages/web/src/components/earn/pool-info/PoolInfo.stories.tsx +++ b/packages/web/src/components/earn/pool-info/PoolInfo.stories.tsx @@ -16,7 +16,7 @@ const pool: PoolCardInfo = { path: "gno.land/r/bar", decimals: 4, symbol: "BAR", - logoURI: "https://s2.coinmarketcap.com/static/img/coins/64x64/5994.png", + logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/grc20/images/gno_land_r_bar.svg", type: "grc20", priceId: "gno.land/r/bar" }, @@ -28,7 +28,7 @@ const pool: PoolCardInfo = { path: "gno.land/r/foo", decimals: 4, symbol: "FOO", - logoURI: "https://s2.coinmarketcap.com/static/img/coins/64x64/5994.png", + logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/grc20/images/gno_land_r_foo.svg", type: "grc20", priceId: "gno.land/r/foo" }, @@ -44,12 +44,12 @@ const pool: PoolCardInfo = { createdAt: "2023-10-12T06:56:12+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, symbol: "GNS", logoURI: "/gnos.svg", type: "grc20", - priceId: "gno.land/r/gnos" + priceId: "gno.land/r/gns" }, amount: 10 } diff --git a/packages/web/src/components/home/home-swap/HomeSwap.stories.tsx b/packages/web/src/components/home/home-swap/HomeSwap.stories.tsx index c6a08ebad..e4f380226 100644 --- a/packages/web/src/components/home/home-swap/HomeSwap.stories.tsx +++ b/packages/web/src/components/home/home-swap/HomeSwap.stories.tsx @@ -24,7 +24,7 @@ Default.args = { path: "gno.land/r/foo", decimals: 4, symbol: "FOO", - logoURI: "https://s2.coinmarketcap.com/static/img/coins/64x64/5994.png", + logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/grc20/images/gno_land_r_foo.svg", type: "grc20", priceId: "gno.land/r/foo" }, @@ -40,7 +40,7 @@ Default.args = { path: "gno.land/r/foo", decimals: 4, symbol: "FOO", - logoURI: "https://s2.coinmarketcap.com/static/img/coins/64x64/5994.png", + logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/grc20/images/gno_land_r_foo.svg", type: "grc20", priceId: "gno.land/r/foo" }, diff --git a/packages/web/src/components/token/token-chart-info/TokenChartInfo.storeis.tsx b/packages/web/src/components/token/token-chart-info/TokenChartInfo.storeis.tsx index 0845fbe74..2adbebb20 100644 --- a/packages/web/src/components/token/token-chart-info/TokenChartInfo.storeis.tsx +++ b/packages/web/src/components/token/token-chart-info/TokenChartInfo.storeis.tsx @@ -10,7 +10,7 @@ export const Default: StoryObj = { args: { token: { name: "Gnoswap", - symbol: "GNOS", + symbol: "GNS", image: "https://miro.medium.com/v2/resize:fill:44:44/1*61CWWk33Fx8vLVvto5nJHQ.png", }, priceInfo: { diff --git a/packages/web/src/components/token/token-swap/TokenSwap.stories.tsx b/packages/web/src/components/token/token-swap/TokenSwap.stories.tsx index d666f589a..17a1254f9 100644 --- a/packages/web/src/components/token/token-swap/TokenSwap.stories.tsx +++ b/packages/web/src/components/token/token-swap/TokenSwap.stories.tsx @@ -19,12 +19,12 @@ const TOKEN_A: TokenModel = { createdAt: "2023-10-10T08:48:46+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, - symbol: "GNOS", - logoURI: "https://s2.coinmarketcap.com/static/img/coins/64x64/5994.png", + symbol: "GNS", + logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/grc20/images/gno_land_r_gns.svg", type: "grc20", - priceId: "gno.land/r/gnos", + priceId: "gno.land/r/gns", } export const Default = Template.bind({}); diff --git a/packages/web/src/components/wallet/deposit-modal/DepositModal.spec.tsx b/packages/web/src/components/wallet/deposit-modal/DepositModal.spec.tsx index b45a40d11..9d198669c 100644 --- a/packages/web/src/components/wallet/deposit-modal/DepositModal.spec.tsx +++ b/packages/web/src/components/wallet/deposit-modal/DepositModal.spec.tsx @@ -14,39 +14,39 @@ describe("DepositModal Component", () => { createdAt: "2023-10-10T08:48:46+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, symbol: "GNOT", logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/gno-native/images/gnot.svg", type: "grc20", - priceId: "gno.land/r/gnos", + priceId: "gno.land/r/gns", }, fromToken: { chainId: "dev", createdAt: "2023-10-10T08:48:46+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, symbol: "GNOT", logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/gno-native/images/gnot.svg", type: "grc20", - priceId: "gno.land/r/gnos", + priceId: "gno.land/r/gns", }, toToken: { chainId: "dev", createdAt: "2023-10-10T08:48:46+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, symbol: "GNOT", logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/gno-native/images/gnot.svg", type: "grc20", - priceId: "gno.land/r/gnos", + priceId: "gno.land/r/gns", }, connected: true, changeToken: () => null, diff --git a/packages/web/src/components/wallet/deposit-modal/DepositModal.stories.tsx b/packages/web/src/components/wallet/deposit-modal/DepositModal.stories.tsx index 075acb501..ad316234a 100644 --- a/packages/web/src/components/wallet/deposit-modal/DepositModal.stories.tsx +++ b/packages/web/src/components/wallet/deposit-modal/DepositModal.stories.tsx @@ -21,39 +21,39 @@ Default.args = { createdAt: "2023-10-10T08:48:46+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, symbol: "GNOT", logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/gno-native/images/gnot.svg", type: "grc20", - priceId: "gno.land/r/gnos", + priceId: "gno.land/r/gns", }, fromToken: { chainId: "dev", createdAt: "2023-10-10T08:48:46+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, symbol: "GNOT", logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/gno-native/images/gnot.svg", type: "grc20", - priceId: "gno.land/r/gnos", + priceId: "gno.land/r/gns", }, toToken: { chainId: "dev", createdAt: "2023-10-10T08:48:46+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, symbol: "GNOT", logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/gno-native/images/gnot.svg", type: "grc20", - priceId: "gno.land/r/gnos", + priceId: "gno.land/r/gns", }, connected: true, changeToken: action("changeToken"), diff --git a/packages/web/src/components/wallet/withdraw-modal/WithDrawModal.spec.tsx b/packages/web/src/components/wallet/withdraw-modal/WithDrawModal.spec.tsx index 03a128224..6c0968ba0 100644 --- a/packages/web/src/components/wallet/withdraw-modal/WithDrawModal.spec.tsx +++ b/packages/web/src/components/wallet/withdraw-modal/WithDrawModal.spec.tsx @@ -14,39 +14,39 @@ describe("WithDrawModal Component", () => { createdAt: "2023-10-10T08:48:46+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, symbol: "GNOT", logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/gno-native/images/gnot.svg", type: "grc20", - priceId: "gno.land/r/gnos", + priceId: "gno.land/r/gns", }, fromToken: { chainId: "dev", createdAt: "2023-10-10T08:48:46+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, symbol: "GNOT", logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/gno-native/images/gnot.svg", type: "grc20", - priceId: "gno.land/r/gnos", + priceId: "gno.land/r/gns", }, toToken: { chainId: "dev", createdAt: "2023-10-10T08:48:46+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, symbol: "GNOT", logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/gno-native/images/gnot.svg", type: "grc20", - priceId: "gno.land/r/gnos", + priceId: "gno.land/r/gns", }, connected: true, changeToken: () => null, diff --git a/packages/web/src/components/wallet/withdraw-modal/WithDrawModal.stories.tsx b/packages/web/src/components/wallet/withdraw-modal/WithDrawModal.stories.tsx index 07f74baa0..bc16be0c4 100644 --- a/packages/web/src/components/wallet/withdraw-modal/WithDrawModal.stories.tsx +++ b/packages/web/src/components/wallet/withdraw-modal/WithDrawModal.stories.tsx @@ -21,39 +21,39 @@ Default.args = { createdAt: "2023-10-10T08:48:46+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, symbol: "GNOT", logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/gno-native/images/gnot.svg", type: "grc20", - priceId: "gno.land/r/gnos", + priceId: "gno.land/r/gns", }, fromToken: { chainId: "dev", createdAt: "2023-10-10T08:48:46+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, symbol: "GNOT", logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/gno-native/images/gnot.svg", type: "grc20", - priceId: "gno.land/r/gnos", + priceId: "gno.land/r/gns", }, toToken: { chainId: "dev", createdAt: "2023-10-10T08:48:46+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, symbol: "GNOT", logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/gno-native/images/gnot.svg", type: "grc20", - priceId: "gno.land/r/gnos", + priceId: "gno.land/r/gns", }, connected: true, changeToken: action("changeToken"), diff --git a/packages/web/src/containers/asset-list-container/AssetListContainer.tsx b/packages/web/src/containers/asset-list-container/AssetListContainer.tsx index d697c1ec1..b05c26424 100644 --- a/packages/web/src/containers/asset-list-container/AssetListContainer.tsx +++ b/packages/web/src/containers/asset-list-container/AssetListContainer.tsx @@ -137,13 +137,13 @@ const DEPOSIT_TO: TokenModel = { createdAt: "2023-10-10T08:48:46+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, symbol: "Cosmos", logoURI: "/cosmos.svg", type: "grc20", - priceId: "gno.land/r/gnos", + priceId: "gno.land/r/gns", }; const DEPOSIT_FROM: TokenModel = { @@ -151,26 +151,26 @@ const DEPOSIT_FROM: TokenModel = { createdAt: "2023-10-10T08:48:46+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, symbol: "Gnoland", logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/gno-native/images/gnot.svg", type: "grc20", - priceId: "gno.land/r/gnos", + priceId: "gno.land/r/gns", }; const DEPOSIT_INFO: TokenModel = { chainId: "dev", createdAt: "2023-10-10T08:48:46+09:00", name: "ATOM", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, symbol: "ATOM", logoURI: "/atom.svg", type: "grc20", - priceId: "gno.land/r/gnos", + priceId: "gno.land/r/gns", }; @@ -289,12 +289,12 @@ const AssetListContainer: React.FC = () => { createdAt: "2023-10-10T08:48:46+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, symbol: asset.symbol, logoURI: asset.logoUri, type: "grc20", - priceId: "gno.land/r/gnos", + priceId: "gno.land/r/gns", }); // console.debug("deposit", `address: ${address}`, `assetId: ${assetId}`); if (!address) return; @@ -311,12 +311,12 @@ const AssetListContainer: React.FC = () => { createdAt: "2023-10-10T08:48:46+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, symbol: asset.symbol, logoURI: asset.logoUri, type: "grc20", - priceId: "gno.land/r/gnos", + priceId: "gno.land/r/gns", }); // console.debug("withdraw", `address: ${address}`, `assetId: ${assetId}`); if (!address) return; diff --git a/packages/web/src/containers/header-container/HeaderContainer.tsx b/packages/web/src/containers/header-container/HeaderContainer.tsx index 532aef652..3ae73f02b 100644 --- a/packages/web/src/containers/header-container/HeaderContainer.tsx +++ b/packages/web/src/containers/header-container/HeaderContainer.tsx @@ -48,7 +48,7 @@ export const RecentdummyToken: Token[] = [ path: "1", name: "GNOT", symbol: "GNOT", - logoURI: "https://s2.coinmarketcap.com/static/img/coins/64x64/2.png", + logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/gno-native/images/gnot.svg", }, isLiquid: true, }, @@ -70,7 +70,7 @@ export const RecentdummyToken: Token[] = [ path: "1", name: "GNOT", symbol: "GNOT", - logoURI: "https://s2.coinmarketcap.com/static/img/coins/64x64/2.png", + logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/gno-native/images/gnot.svg", }, }, { @@ -91,7 +91,7 @@ export const RecentdummyToken: Token[] = [ path: "1", name: "GNOT", symbol: "GNOT", - logoURI: "https://s2.coinmarketcap.com/static/img/coins/64x64/2.png", + logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/gno-native/images/gnot.svg", }, }, ]; @@ -104,7 +104,7 @@ export const PopulardummyToken: Token[] = [ path: "2", name: "Gnoland", symbol: "GNOT", - logoURI: "https://s2.coinmarketcap.com/static/img/coins/64x64/2.png", + logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/gno-native/images/gnot.svg", }, price: "$12,090.09", priceOf1d: { diff --git a/packages/web/src/containers/home-swap-container/HomeSwapContainer.tsx b/packages/web/src/containers/home-swap-container/HomeSwapContainer.tsx index 36364042d..e17726045 100644 --- a/packages/web/src/containers/home-swap-container/HomeSwapContainer.tsx +++ b/packages/web/src/containers/home-swap-container/HomeSwapContainer.tsx @@ -30,12 +30,12 @@ const TOKEN_B: TokenModel = { createdAt: "2023-10-10T08:48:46+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, symbol: "GNS", logoURI: "/gnos.svg", type: "grc20", - priceId: "gno.land/r/gnos", + priceId: "gno.land/r/gns", }; const HomeSwapContainer: React.FC = () => { diff --git a/packages/web/src/containers/wallet-balance-container/WalletBalanceContainer.tsx b/packages/web/src/containers/wallet-balance-container/WalletBalanceContainer.tsx index 4bb731297..5926b402b 100644 --- a/packages/web/src/containers/wallet-balance-container/WalletBalanceContainer.tsx +++ b/packages/web/src/containers/wallet-balance-container/WalletBalanceContainer.tsx @@ -59,13 +59,13 @@ const DEPOSIT_TO: TokenModel = { createdAt: "2023-10-10T08:48:46+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, symbol: "Cosmos", logoURI: "/cosmos.svg", type: "grc20", - priceId: "gno.land/r/gnos", + priceId: "gno.land/r/gns", }; const DEPOSIT_FROM: TokenModel = { @@ -73,26 +73,26 @@ const DEPOSIT_FROM: TokenModel = { createdAt: "2023-10-10T08:48:46+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, symbol: "Gnoland", logoURI: "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/gno-native/images/gnot.svg", type: "grc20", - priceId: "gno.land/r/gnos", + priceId: "gno.land/r/gns", }; const DEPOSIT_INFO: TokenModel = { chainId: "dev", createdAt: "2023-10-10T08:48:46+09:00", name: "ATOM", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, symbol: "ATOM", logoURI: "/atom.svg", type: "grc20", - priceId: "gno.land/r/gnos", + priceId: "gno.land/r/gns", }; const WalletBalanceContainer: React.FC = () => { diff --git a/packages/web/src/models/pool/mapper/pool-mapper.ts b/packages/web/src/models/pool/mapper/pool-mapper.ts index 44c6a2b05..6fbb06434 100644 --- a/packages/web/src/models/pool/mapper/pool-mapper.ts +++ b/packages/web/src/models/pool/mapper/pool-mapper.ts @@ -35,12 +35,12 @@ export class PoolMapper { createdAt: "2023-10-12T06:56:12+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, symbol: "GNS", logoURI: "/gnos.svg", type: "grc20", - priceId: "gno.land/r/gnos", + priceId: "gno.land/r/gns", }, amount: 10, }; @@ -101,12 +101,12 @@ export class PoolMapper { createdAt: "2023-10-12T06:56:12+09:00", name: "Gnoswap", address: "g1sqaft388ruvsseu97r04w4rr4szxkh4nn6xpax", - path: "gno.land/r/gnos", + path: "gno.land/r/gns", decimals: 4, symbol: "GNS", logoURI: "/gnos.svg", type: "grc20", - priceId: "gno.land/r/gnos", + priceId: "gno.land/r/gns", }, amount: 10, }; diff --git a/packages/web/src/repositories/pool/mock/pool-detail.json b/packages/web/src/repositories/pool/mock/pool-detail.json index 106c66ed0..fa06849ae 100644 --- a/packages/web/src/repositories/pool/mock/pool-detail.json +++ b/packages/web/src/repositories/pool/mock/pool-detail.json @@ -10,7 +10,7 @@ "path": "gno.land/r/bar", "decimals": 4, "symbol": "BAR", - "logoURI": "https://s2.coinmarketcap.com/static/img/coins/64x64/5994.png", + "logoURI": "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/grc20/images/gno_land_r_bar.svg", "type": "grc20", "priceId": "gno.land/r/bar" }, @@ -22,7 +22,7 @@ "path": "gno.land/r/foo", "decimals": 4, "symbol": "FOO", - "logoURI": "https://s2.coinmarketcap.com/static/img/coins/64x64/5994.png", + "logoURI": "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/grc20/images/gno_land_r_foo.svg", "type": "grc20", "priceId": "gno.land/r/foo" }, diff --git a/packages/web/src/repositories/pool/mock/pools.json b/packages/web/src/repositories/pool/mock/pools.json index 6c0ac20a2..c70fcb1f5 100644 --- a/packages/web/src/repositories/pool/mock/pools.json +++ b/packages/web/src/repositories/pool/mock/pools.json @@ -14,7 +14,7 @@ "path": "gno.land/r/bar", "decimals": 4, "symbol": "BAR", - "logoURI": "https://s2.coinmarketcap.com/static/img/coins/64x64/5994.png", + "logoURI": "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/grc20/images/gno_land_r_bar.svg", "type": "grc20", "priceId": "gno.land/r/bar" }, @@ -26,7 +26,7 @@ "path": "gno.land/r/foo", "decimals": 4, "symbol": "FOO", - "logoURI": "https://s2.coinmarketcap.com/static/img/coins/64x64/5994.png", + "logoURI": "https://raw.githubusercontent.com/onbloc/gno-token-resource/main/grc20/images/gno_land_r_foo.svg", "type": "grc20", "priceId": "gno.land/r/foo" },