From 29bf1090023a5549568791bedb712748e8938f42 Mon Sep 17 00:00:00 2001 From: Manuel Alessandro Collazo Date: Thu, 11 Jan 2024 16:32:32 -0300 Subject: [PATCH 1/6] fix: LUNC asset page display --- src/data/token.tsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/data/token.tsx b/src/data/token.tsx index 7cef36fd9..f3c8a0c24 100644 --- a/src/data/token.tsx +++ b/src/data/token.tsx @@ -205,6 +205,7 @@ export const useNativeDenoms = () => { icon: "https://assets.terra.dev/icon/svg/LUNC.svg", decimals: 6, isNonWhitelisted: false, + chainID: "colombus-5", } } else if (chainID === "phoenix-1" || chainID === "pisco-1") { return { @@ -395,7 +396,7 @@ export const useParsedAssetList = () => { const chainTokenItem = { denom, - id: `${token}*${chain}`, + id: `${token}*${nativeChain}*${chain}`, decimals, balance: parseInt(amount), tokenPrice, From cce714fde163ecfd8022703e1e6529fca908078b Mon Sep 17 00:00:00 2001 From: Terence Lim Date: Mon, 15 Jan 2024 22:06:58 +0800 Subject: [PATCH 2/6] Fixed typo in Ledger Flow --- src/utils/ledger.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/ledger.tsx b/src/utils/ledger.tsx index 7aff47752..e342dfb9e 100644 --- a/src/utils/ledger.tsx +++ b/src/utils/ledger.tsx @@ -59,7 +59,7 @@ const LedgerActionOverlay = () => { appName: appName ?? "Terra", }) case LedgerDeviceAction.CONFIRM: - return t("Confirm the transaction on yout Ledger") + return t("Confirm the transaction on your Ledger") } } From 976de3a8382e4240cec46d79fbd32d42d912d596 Mon Sep 17 00:00:00 2001 From: Michael Merz Date: Mon, 15 Jan 2024 14:55:49 -0500 Subject: [PATCH 3/6] fix: persist recipient address from tx component --- src/pages/wallet/SendPage/Confirm.tsx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/pages/wallet/SendPage/Confirm.tsx b/src/pages/wallet/SendPage/Confirm.tsx index 41dd490bd..deada88bc 100644 --- a/src/pages/wallet/SendPage/Confirm.tsx +++ b/src/pages/wallet/SendPage/Confirm.tsx @@ -82,13 +82,18 @@ const Confirm = () => { }, [assetInfo, destination, chain]) const createTx = useCallback( - ({ address, memo }: TxValues) => { + ({ address, memo, recipient: txRecipient }: TxValues) => { const amount = toAmount(input, { decimals: assetInfo?.decimals }) const { senderAddress, denom, channel } = assetInfo ?? {} + if (!(recipient && AccAddress.validate(recipient))) return if (!(chain && destination && denom && amount && senderAddress)) return - const execute_msg = { transfer: { recipient: address, amount } } + const execute_msg = { + transfer: { recipient: txRecipient ?? address, amount }, + } + + console.log({ txRecipient, address, execute_msg }) let msgs if (destination === chain) { @@ -111,7 +116,7 @@ const Confirm = () => { msg: Buffer.from( JSON.stringify({ channel, - remote_address: address, + remote_address: txRecipient ?? address, }) ).toString("base64"), }, From 4e6c1131b3d2a3af419ab7a08c553976ee0ca9b6 Mon Sep 17 00:00:00 2001 From: Michael Merz Date: Mon, 15 Jan 2024 14:58:04 -0500 Subject: [PATCH 4/6] chore: remove excess logging --- src/pages/wallet/SendPage/Confirm.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/wallet/SendPage/Confirm.tsx b/src/pages/wallet/SendPage/Confirm.tsx index deada88bc..06ce68da4 100644 --- a/src/pages/wallet/SendPage/Confirm.tsx +++ b/src/pages/wallet/SendPage/Confirm.tsx @@ -93,7 +93,6 @@ const Confirm = () => { transfer: { recipient: txRecipient ?? address, amount }, } - console.log({ txRecipient, address, execute_msg }) let msgs if (destination === chain) { From a408e79f321b10097f04e2f88acb9601c1a562f1 Mon Sep 17 00:00:00 2001 From: Michael Merz Date: Mon, 15 Jan 2024 17:17:29 -0500 Subject: [PATCH 5/6] feat: improve cw20 fix --- src/pages/wallet/SendPage/Confirm.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/wallet/SendPage/Confirm.tsx b/src/pages/wallet/SendPage/Confirm.tsx index 06ce68da4..6de47ace5 100644 --- a/src/pages/wallet/SendPage/Confirm.tsx +++ b/src/pages/wallet/SendPage/Confirm.tsx @@ -82,7 +82,7 @@ const Confirm = () => { }, [assetInfo, destination, chain]) const createTx = useCallback( - ({ address, memo, recipient: txRecipient }: TxValues) => { + ({ memo }: TxValues) => { const amount = toAmount(input, { decimals: assetInfo?.decimals }) const { senderAddress, denom, channel } = assetInfo ?? {} @@ -90,7 +90,7 @@ const Confirm = () => { if (!(chain && destination && denom && amount && senderAddress)) return const execute_msg = { - transfer: { recipient: txRecipient ?? address, amount }, + transfer: { recipient, amount }, } let msgs @@ -115,7 +115,7 @@ const Confirm = () => { msg: Buffer.from( JSON.stringify({ channel, - remote_address: txRecipient ?? address, + remote_address: recipient, }) ).toString("base64"), }, From 9bf9755668b695d0549ade71357188279b8a1f80 Mon Sep 17 00:00:00 2001 From: Michael Merz Date: Mon, 15 Jan 2024 21:14:25 -0500 Subject: [PATCH 6/6] chore: bump version --- public/manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/manifest.json b/public/manifest.json index c6b32cabb..7937d80a9 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -1,8 +1,8 @@ { "manifest_version": 3, "name": "Station Wallet", - "version": "8.0.5", - "version_name": "8.0.5", + "version": "8.0.5.1", + "version_name": "8.0.5.1", "background": { "service_worker": "background.js" },