From d2d8b73a2cf558df6d43a786de5d9cbea6b70bc0 Mon Sep 17 00:00:00 2001
From: Sylva Elendu <iamsylvaelendu@gmail.com>
Date: Fri, 6 Oct 2023 18:23:50 +0100
Subject: [PATCH 1/2] wip

---
 .../ApproveTransactionHeader.tsx                         | 3 ++-
 .../ApproveTransactionHeader.types.ts                    | 1 +
 app/components/UI/ApproveTransactionReview/index.js      | 7 ++++---
 .../hooks/useAddressBalance/useAddressBalance.ts         | 9 +++++++--
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/app/components/UI/ApproveTransactionHeader/ApproveTransactionHeader.tsx b/app/components/UI/ApproveTransactionHeader/ApproveTransactionHeader.tsx
index f773938f4a1..ec269e5879a 100644
--- a/app/components/UI/ApproveTransactionHeader/ApproveTransactionHeader.tsx
+++ b/app/components/UI/ApproveTransactionHeader/ApproveTransactionHeader.tsx
@@ -38,6 +38,7 @@ const ApproveTransactionHeader = ({
   url,
   currentEnsName,
   asset,
+  dontWatchAsset,
 }: ApproveTransactionHeaderI) => {
   const [accountName, setAccountName] = useState('');
 
@@ -46,7 +47,7 @@ const ApproveTransactionHeader = ({
   const [isOriginMMSDKRemoteConn, setIsOriginMMSDKRemoteConn] = useState(false);
 
   const { styles } = useStyles(stylesheet, {});
-  const { addressBalance } = useAddressBalance(asset, from);
+  const { addressBalance } = useAddressBalance(asset, from, dontWatchAsset);
 
   const accounts = useSelector(selectAccounts);
 
diff --git a/app/components/UI/ApproveTransactionHeader/ApproveTransactionHeader.types.ts b/app/components/UI/ApproveTransactionHeader/ApproveTransactionHeader.types.ts
index 6c3eac30e6f..c58baf8f77a 100644
--- a/app/components/UI/ApproveTransactionHeader/ApproveTransactionHeader.types.ts
+++ b/app/components/UI/ApproveTransactionHeader/ApproveTransactionHeader.types.ts
@@ -15,4 +15,5 @@ export interface ApproveTransactionHeaderI {
   currentEnsName?: string;
   from: string;
   asset: Asset;
+  dontWatchAsset?: boolean;
 }
diff --git a/app/components/UI/ApproveTransactionReview/index.js b/app/components/UI/ApproveTransactionReview/index.js
index d08344b5e04..af95adaf519 100644
--- a/app/components/UI/ApproveTransactionReview/index.js
+++ b/app/components/UI/ApproveTransactionReview/index.js
@@ -391,9 +391,9 @@ class ApproveTransactionReview extends PureComponent {
           tokenName = name;
           tokenSymbol = symbol;
           tokenStandard = standard;
-          tokenDecimals = await AssetsContractController.getERC20TokenDecimals(
-            to,
-          );
+          // tokenDecimals = await AssetsContractController.getERC20TokenDecimals(
+          //   to,
+          // );
         } else {
           tokenDecimals = decimals;
           tokenSymbol = symbol;
@@ -789,6 +789,7 @@ class ApproveTransactionReview extends PureComponent {
         <View style={styles.section} testID={'approve-modal-test-id'}>
           {from && (
             <ApproveTransactionHeader
+              dontWatchAsset
               origin={origin}
               url={activeTabUrl}
               from={from}
diff --git a/app/components/hooks/useAddressBalance/useAddressBalance.ts b/app/components/hooks/useAddressBalance/useAddressBalance.ts
index f0851324cb3..d83f8c97a5d 100644
--- a/app/components/hooks/useAddressBalance/useAddressBalance.ts
+++ b/app/components/hooks/useAddressBalance/useAddressBalance.ts
@@ -15,7 +15,11 @@ import { selectContractBalances } from '../../../selectors/tokenBalancesControll
 import { selectSelectedAddress } from '../../../selectors/preferencesController';
 import { Asset } from './useAddressBalance.types';
 
-const useAddressBalance = (asset: Asset, address?: string) => {
+const useAddressBalance = (
+  asset: Asset,
+  address?: string,
+  dontWatchAsset?: boolean,
+) => {
   const [addressBalance, setAddressBalance] = useState('0');
 
   const { accounts, contractBalances, selectedAddress } = useSelector(
@@ -41,7 +45,8 @@ const useAddressBalance = (asset: Asset, address?: string) => {
       if (!contractAddress || !decimals) {
         return;
       }
-      if (!contractBalances[contractAddress]) {
+
+      if (!contractBalances[contractAddress] && !dontWatchAsset) {
         TokensController.addToken(contractAddress, symbol, decimals, {
           image,
           name,

From 726d395b0db855c60540b29318fe546ef1b0b55b Mon Sep 17 00:00:00 2001
From: Sylva Elendu <iamsylvaelendu@gmail.com>
Date: Mon, 9 Oct 2023 10:31:09 +0100
Subject: [PATCH 2/2] remove getERC20TokenDecimals for !erc20

---
 app/components/UI/ApproveTransactionReview/index.js | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/app/components/UI/ApproveTransactionReview/index.js b/app/components/UI/ApproveTransactionReview/index.js
index af95adaf519..0af12f85572 100644
--- a/app/components/UI/ApproveTransactionReview/index.js
+++ b/app/components/UI/ApproveTransactionReview/index.js
@@ -335,8 +335,7 @@ class ApproveTransactionReview extends PureComponent {
       tokenList,
       tokenAllowanceState,
     } = this.props;
-    const { AssetsContractController, TokenBalancesController } =
-      Engine.context;
+    const { TokenBalancesController } = Engine.context;
 
     let host;
 
@@ -391,9 +390,6 @@ class ApproveTransactionReview extends PureComponent {
           tokenName = name;
           tokenSymbol = symbol;
           tokenStandard = standard;
-          // tokenDecimals = await AssetsContractController.getERC20TokenDecimals(
-          //   to,
-          // );
         } else {
           tokenDecimals = decimals;
           tokenSymbol = symbol;