Merge pull request #1921 from galacticcouncil/disable-atoken-transfer

Disable atoken transfer
galacticcouncil · Dec 3, 2024 · e20229a · e20229a
2 parents 6605273 + 93f8a2e
commit e20229a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/sections/wallet/assets/table/actions/WalletAssetsTableActions.tsx b/src/sections/wallet/assets/table/actions/WalletAssetsTableActions.tsx
@@ -91,7 +91,7 @@ export const WalletAssetsTableActions = (props: Props) => {
       icon: <PlusIcon />,
       label: t("wallet.assets.table.actions.deposit"),
       onSelect: () => navigate({ to: LINKS.cross_chain }),
-      disabled: account?.isExternalWalletConnected,
+      disabled: account?.isExternalWalletConnected || props.asset.meta.isErc20,
     },
   ]
 
@@ -176,8 +176,10 @@ export const WalletAssetsTableActions = (props: Props) => {
             account?.isExternalWalletConnected
               ? []
               : [
-                  ...buttons.filter((button) =>
-                    hiddenElementsKeys.includes(button.key),
+                  ...buttons.filter(
+                    (button) =>
+                      hiddenElementsKeys.includes(button.key) &&
+                      !button.disabled,
                   ),
                   ...actionItems,
                 ]

diff --git a/src/sections/wallet/assets/table/actions/WalletAssetsTableActionsMob.tsx b/src/sections/wallet/assets/table/actions/WalletAssetsTableActionsMob.tsx
@@ -195,7 +195,9 @@ export const WalletAssetsTableActionsMob = ({
                   <Button
                     sx={{ width: "100%" }}
                     size="small"
-                    disabled={account?.isExternalWalletConnected}
+                    disabled={
+                      account?.isExternalWalletConnected || row.meta.isErc20
+                    }
                   >
                     <PlusIcon />
                     {t("wallet.assets.table.actions.deposit")}

diff --git a/src/sections/wallet/transfer/onchain/WalletTransferSectionOnchain.tsx b/src/sections/wallet/transfer/onchain/WalletTransferSectionOnchain.tsx
@@ -120,10 +120,10 @@ export function WalletTransferSectionOnchain({
     return await createTransaction(
       {
         tx:
-          asset.toString() === native.id
+          asset.toString() === native.id || assetMeta.isErc20
             ? api.tx.currencies.transfer(
                 normalizedDest,
-                native.id,
+                asset.toString(),
                 amount.toFixed(),
               )
             : api.tx.tokens.transfer(normalizedDest, asset, amount.toFixed()),