From 1744cd7fa5412f500e167eab8b0054d9302eb3e9 Mon Sep 17 00:00:00 2001
From: chris <leosameric@gmail.com>
Date: Wed, 18 Dec 2024 19:55:18 +1000
Subject: [PATCH] feat: Update meson token name, symbol and address

---
 .../aggregator/adapters/meson/MesonAdapter.ts        | 12 ++++++------
 .../transfer/components/Button/TransferButton.tsx    |  5 +++--
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/packages/canonical-bridge-widget/src/modules/aggregator/adapters/meson/MesonAdapter.ts b/packages/canonical-bridge-widget/src/modules/aggregator/adapters/meson/MesonAdapter.ts
index 726e6ab2..f0d06df7 100644
--- a/packages/canonical-bridge-widget/src/modules/aggregator/adapters/meson/MesonAdapter.ts
+++ b/packages/canonical-bridge-widget/src/modules/aggregator/adapters/meson/MesonAdapter.ts
@@ -59,7 +59,7 @@ export class MesonAdapter extends BaseAdapter<IMesonChain[], IMesonChain, IMeson
         symbolMap.set(chainId, new Map<string, IMesonToken>());
 
         filteredTokens.forEach((token) => {
-          symbolMap.get(chainId)?.set(token.id?.toUpperCase(), token);
+          symbolMap.get(chainId)?.set(token.symbol?.toUpperCase(), token);
         });
 
         tokenMap.set(chainId, filteredTokens);
@@ -85,7 +85,7 @@ export class MesonAdapter extends BaseAdapter<IMesonChain[], IMesonChain, IMeson
             const toToken = this.getToToken({
               fromChainId: Number(fromChain.chainId),
               toChainId: Number(toChain.chainId),
-              fromTokenSymbol: fromToken.id?.toUpperCase(),
+              fromTokenSymbol: fromToken.symbol?.toUpperCase(),
             });
 
             if (toToken) {
@@ -97,7 +97,7 @@ export class MesonAdapter extends BaseAdapter<IMesonChain[], IMesonChain, IMeson
                 fromTokenAddress: fromToken.addr,
                 toTokenAddress: toToken.addr,
               };
-              transferableTokenMap.set(fromToken.id?.toUpperCase(), tokenPair);
+              transferableTokenMap.set(fromToken.symbol?.toUpperCase(), tokenPair);
             }
           });
 
@@ -131,14 +131,14 @@ export class MesonAdapter extends BaseAdapter<IMesonChain[], IMesonChain, IMeson
 
   public getTokenInfo({ chainId, token }: { chainId: number; token: IMesonToken }) {
     return {
-      name: (token as any).id?.toUpperCase(), // TODO
-      symbol: token.id.toUpperCase(),
+      name: token.name?.toUpperCase(), // TODO
+      symbol: token.symbol.toUpperCase(),
       address: token.addr ?? '0x0000000000000000000000000000000000000000',
       decimals: token.decimals,
       ...this.getTokenDisplaySymbolAndIcon({
         chainId,
         tokenAddress: token.addr ?? '0x0000000000000000000000000000000000000000',
-        defaultSymbol: token.id.toUpperCase(),
+        defaultSymbol: token.symbol.toUpperCase(),
       }),
     };
   }
diff --git a/packages/canonical-bridge-widget/src/modules/transfer/components/Button/TransferButton.tsx b/packages/canonical-bridge-widget/src/modules/transfer/components/Button/TransferButton.tsx
index efd65ea0..7b13584d 100644
--- a/packages/canonical-bridge-widget/src/modules/transfer/components/Button/TransferButton.tsx
+++ b/packages/canonical-bridge-widget/src/modules/transfer/components/Button/TransferButton.tsx
@@ -434,12 +434,13 @@ export function TransferButton({
         const isValidToken = await bridgeSDK.meson.validateMesonToken({
           fromChainId: fromChain?.id,
           toChainId: toChain?.id,
-          fromTokenAddress: selectedToken.meson?.raw?.addr as `0x${string}`,
+          fromTokenAddress:
+            selectedToken.meson?.raw?.addr ?? '0x0000000000000000000000000000000000000000',
           fromTokenSymbol: selectedToken.meson?.raw?.id as string,
           fromTokenDecimals: selectedToken.meson?.raw?.decimals as number,
           fromChainType: fromChain?.chainType,
           toChainType: toChain?.chainType,
-          toTokenAddress: toToken?.meson?.raw?.addr as `0x${string}`,
+          toTokenAddress: toToken?.meson?.raw?.addr ?? '0x0000000000000000000000000000000000000000',
           toTokenSymbol: toToken?.meson?.raw?.id,
           toTokenDecimals: toToken?.meson?.raw?.decimals,
           amount: Number(sendValue),