refactor: Update @metamask/assets-controllers patch

The `@metamask/assets-controllers` patch added as part of the permission system implementation [1] has been updated to more closely match how the feature was implemented upstream [2]. It should be functionally equivalent. This relates to MetaMask/mobile-planning#877 [1]: #5062 [2]: MetaMask/core#1124
MetaMask · Jul 26, 2023 · e4225ac · e4225ac
1 parent a936db3
commit e4225ac
Show file tree

Hide file tree

Showing 8 changed files with 128 additions and 129 deletions.
diff --git a/app/components/UI/AddCustomToken/index.js b/app/components/UI/AddCustomToken/index.js
@@ -117,7 +117,7 @@ export default class AddCustomToken extends PureComponent {
     if (!(await this.validateCustomToken())) return;
     const { TokensController } = Engine.context;
     const { address, symbol, decimals, name } = this.state;
-    await TokensController.addToken(address, symbol, decimals, null, name);
+    await TokensController.addToken(address, symbol, decimals, { name });
 
     AnalyticsV2.trackEvent(
       MetaMetricsEvents.TOKEN_ADDED,

diff --git a/app/components/UI/Ramp/hooks/useHandleSuccessfulOrder.ts b/app/components/UI/Ramp/hooks/useHandleSuccessfulOrder.ts
@@ -45,7 +45,7 @@ function useHandleSuccessfulOrder() {
           toLowerCaseEquals(t.address, address),
         )
       ) {
-        await TokensController.addToken(address, symbol, decimals, null, name);
+        await TokensController.addToken(address, symbol, decimals, { name });
       }
     },
     [selectedChainId],

diff --git a/app/components/UI/SearchTokenAutocomplete/index.tsx b/app/components/UI/SearchTokenAutocomplete/index.tsx
@@ -106,7 +106,10 @@ const SearchTokenAutocomplete = ({ navigation }: Props) => {
 
   const addToken = useCallback(async () => {
     const { TokensController } = Engine.context as any;
-    await TokensController.addToken(address, symbol, decimals, iconUrl, name);
+    await TokensController.addToken(address, symbol, decimals, {
+      image: iconUrl,
+      name,
+    });
 
     AnalyticsV2.trackEvent(MetaMetricsEvents.TOKEN_ADDED, getAnalyticsParams());
 

diff --git a/app/components/UI/Swaps/QuotesView.js b/app/components/UI/Swaps/QuotesView.js
@@ -348,7 +348,7 @@ async function addTokenToAssetsController(newToken) {
     )
   ) {
     const { address, symbol, decimals, name } = newToken;
-    await TokensController.addToken(address, symbol, decimals, null, name);
+    await TokensController.addToken(address, symbol, decimals, { name });
   }
 }
 

diff --git a/app/components/UI/Swaps/index.js b/app/components/UI/Swaps/index.js
@@ -528,7 +528,7 @@ function SwapsAmountView({
     ) {
       const { TokensController } = Engine.context;
       const { address, symbol, decimals, name } = sourceToken;
-      await TokensController.addToken(address, symbol, decimals, null, name);
+      await TokensController.addToken(address, symbol, decimals, { name });
     }
     return navigation.navigate(
       'SwapsQuotesView',

diff --git a/app/components/Views/SendFlow/Confirm/index.js b/app/components/Views/SendFlow/Confirm/index.js
@@ -545,7 +545,10 @@ class Confirm extends PureComponent {
       const { TokensController } = Engine.context;
 
       if (!contractBalances[address]) {
-        await TokensController.addToken(address, symbol, decimals, image, name);
+        await TokensController.addToken(address, symbol, decimals, {
+          image,
+          name,
+        });
       }
 
       const [, , rawAmount] = decodeTransferData('transfer', data);

diff --git a/app/components/hooks/useAddressBalance/useAddressBalance.ts b/app/components/hooks/useAddressBalance/useAddressBalance.ts
@@ -42,13 +42,10 @@ const useAddressBalance = (asset: Asset, address?: string) => {
         return;
       }
       if (!contractBalances[contractAddress]) {
-        TokensController.addToken(
-          contractAddress,
-          symbol,
-          decimals,
+        TokensController.addToken(contractAddress, symbol, decimals, {
           image,
           name,
-        );
+        });
       }
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps

diff --git a/patches/@metamask+assets-controllers+5.0.0.patch b/patches/@metamask+assets-controllers+5.0.0.patch