feat: Network & Gas & Assets & Utils controllers update

app/components/UI/CollectibleContracts/index.js

@@ -34,6 +34,7 @@ import {
   selectProviderType,
 } from '../../../selectors/networkController';
 import {
+  selectDisplayNftMedia,
   selectIsIpfsGatewayEnabled,
   selectSelectedAddress,
   selectUseNftDetection,
@@ -102,6 +103,7 @@ const CollectibleContracts = ({
   removeFavoriteCollectible,
   useNftDetection,
   isIpfsGatewayEnabled,
+  displayNftMedia,
 }) => {
   const collectibles = allCollectibles.filter(
     (singleCollectible) => singleCollectible.isCurrentlyOwned === true,
@@ -188,14 +190,22 @@ const CollectibleContracts = ({
   );
 
   useEffect(() => {
+    if (!isIpfsGatewayEnabled && !displayNftMedia) {
+      return;
+    }
     // TO DO: Move this fix to the controllers layer
     const updatableCollectibles = collectibles.filter((single) =>
       shouldUpdateCollectibleMetadata(single),
     );
     if (updatableCollectibles.length !== 0) {
       updateAllCollectibleMetadata(updatableCollectibles);
     }
-  }, [collectibles, updateAllCollectibleMetadata]);
+  }, [
+    collectibles,
+    updateAllCollectibleMetadata,
+    isIpfsGatewayEnabled,
+    displayNftMedia,
+  ]);
 
   /*   const updateCollectibleMetadata = useCallback(
     async (collectible) => {
@@ -424,9 +434,13 @@ CollectibleContracts.propTypes = {
    */
   useNftDetection: PropTypes.bool,
   /**
-   * Boolean to show if NFT detection is enabled
+   * Boolean to show content stored on IPFS
    */
   isIpfsGatewayEnabled: PropTypes.bool,
+  /**
+   * Boolean to show Nfts media stored on third parties
+   */
+  displayNftMedia: PropTypes.bool,
 };
 
 const mapStateToProps = (state) => ({
@@ -438,6 +452,7 @@ const mapStateToProps = (state) => ({
   collectibles: collectiblesSelector(state),
   favoriteCollectibles: favoritesCollectiblesSelector(state),
   isIpfsGatewayEnabled: selectIsIpfsGatewayEnabled(state),
+  displayNftMedia: selectDisplayNftMedia(state),
 });
 
 const mapDispatchToProps = (dispatch) => ({

app/components/Views/confirmations/SendFlow/Amount/index.js

@@ -847,7 +847,7 @@ class Amount extends PureComponent {
           weiBalance = hexToBN(accounts[selectedAddress].balance);
           weiInput = weiValue.add(estimatedTotalGas);
         } else {
-          weiBalance = contractBalances[selectedAsset.address];
+          weiBalance = hexToBN(contractBalances[selectedAsset.address]);
           weiInput = toTokenMinimalUnit(value, selectedAsset.decimals);
         }
         // TODO: weiBalance is not always guaranteed to be type BN. Need to consolidate type.

app/components/Views/confirmations/SendFlow/Confirm/index.js

@@ -337,11 +337,15 @@ class Confirm extends PureComponent {
      * Remove token that was added to the account temporarily
      * Ref.: https://github.com/MetaMask/metamask-mobile/pull/3989#issuecomment-1367558394
      */
-    if (selectedAsset.isETH || selectedAsset.tokenId) {
+    if (
+      selectedAsset.isETH ||
+      selectedAsset.tokenId ||
+      !selectedAsset.address
+    ) {
       return;
     }
 
-    const weiBalance = contractBalances[selectedAsset.address];
+    const weiBalance = hexToBN(contractBalances[selectedAsset.address]);
     if (weiBalance?.isZero()) {
       await TokensController.ignoreTokens([selectedAsset.address]);
     }
@@ -730,7 +734,9 @@ class Confirm extends PureComponent {
         }
       } else {
         const [, , amount] = decodeTransferData('transfer', transaction.data);
-        weiBalance = contractBalances[selectedAsset.address];
+
+        weiBalance = hexToBN(contractBalances[selectedAsset.address]);
+
         weiInput = hexToBN(amount);
         error =
           weiBalance && weiBalance.gte(weiInput)

app/components/Views/confirmations/components/ApproveTransactionReview/index.js

@@ -339,7 +339,7 @@ class ApproveTransactionReview extends PureComponent {
       tokenList,
       tokenAllowanceState,
     } = this.props;
-    const { TokenBalancesController } = Engine.context;
+    const { AssetsContractController } = Engine.context;
 
     let host;
 
@@ -362,7 +362,7 @@ class ApproveTransactionReview extends PureComponent {
       decodeApproveData(data);
     const encodedDecimalAmount = hexToBN(encodedHexAmount).toString();
 
-    const erc20TokenBalance = await TokenBalancesController.getERC20BalanceOf(
+    const erc20TokenBalance = await AssetsContractController.getERC20BalanceOf(
       to,
       from,
     );

app/components/hooks/useTokenBalance.tsx

@@ -22,13 +22,13 @@ const useTokenBalance = (
     useState<boolean>(true);
   const [error, setError]: [boolean, Dispatch<SetStateAction<boolean>>] =
     useState<boolean>(false);
-  const { TokenBalancesController }: any = Engine.context;
+  const { AssetsContractController }: any = Engine.context;
 
   const fetchBalance = async (
     tokenAddress: string,
     userAddress: string,
   ): Promise<void> => {
-    TokenBalancesController.getERC20BalanceOf(tokenAddress, userAddress)
+    AssetsContractController.getERC20BalanceOf(tokenAddress, userAddress)
       .then((balance: BN) => setTokenBalance(balance))
       .catch(() => setError(true))
       .finally(() => setLoading(false));

app/core/AppConstants.ts

@@ -181,6 +181,7 @@ export default {
   CANCEL_RATE: 'Transactions (Cancel)',
   SPEED_UP_RATE: 'Transactions (Speed Up)',
   NETWORK_STATE_CHANGE_EVENT: 'NetworkController:stateChange',
+  NETWORK_DID_CHANGE_EVENT: 'NetworkController:networkDidChange',
   KEYRING_STATE_CHANGE_EVENT: 'KeyringController:stateChange',
   TOKEN_LIST_STATE_CHANGE_EVENT: 'TokenListController:stateChange',
   ETH_SIGN_ERROR: 'eth_sign requires 32 byte message hash',