Merge remote-tracking branch 'origin/sync-8.0.5.1'

stationmoney · Jan 16, 2024 · 4e10cbc · 4e10cbc
2 parents fb25a5e + 9bf9755
commit 4e10cbc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git 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"
   },

diff --git 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 {
@@ -385,7 +386,7 @@ export const useParsedAssetList = () => {
         const { name: chainName, icon: chainIcon } = networks[chain] || {}
         const chainTokenItem = {
           denom,
-          id: `${token}*${chain}`,
+          id: `${token}*${nativeChain}*${chain}`,
           decimals,
           balance: parseInt(amount),
           tokenPrice,

diff --git a/src/pages/wallet/SendPage/Confirm.tsx b/src/pages/wallet/SendPage/Confirm.tsx
@@ -82,13 +82,17 @@ const Confirm = () => {
   }, [assetInfo, destination, chain])
 
   const createTx = useCallback(
-    ({ address, memo }: TxValues) => {
+    ({ memo }: 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, amount },
+      }
+
       let msgs
 
       if (destination === chain) {
@@ -111,7 +115,7 @@ const Confirm = () => {
                   msg: Buffer.from(
                     JSON.stringify({
                       channel,
-                      remote_address: address,
+                      remote_address: recipient,
                     })
                   ).toString("base64"),
                 },

diff --git 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")
     }
   }