Nick/demo build earn zpw

app/components/UI/Earn/Views/EarnInputView/EarnInputView.tsx

@@ -74,6 +74,8 @@ import { trace, TraceName } from '../../../../../util/trace';
 import { useEndTraceOnMount } from '../../../../hooks/useEndTraceOnMount';
 import { EVM_SCOPE } from '../../constants/networks';
 import { selectConfirmationRedesignFlags } from '../../../../../selectors/featureFlagController/confirmations';
+import { ConfirmationLoader } from '../../../../Views/confirmations/components/confirm/confirm-component';
+import { useConfirmNavigation } from '../../../../Views/confirmations/hooks/useConfirmNavigation';
 ///: BEGIN:ONLY_INCLUDE_IF(tron)
 import useTronStake from '../../hooks/useTronStake';
 import useTronStakeApy from '../../hooks/useTronStakeApy';
@@ -86,6 +88,7 @@ const EarnInputView = () => {
   // navigation hooks
   const navigation = useNavigation();
   const route = useRoute<EarnInputViewProps['route']>();
+  const { navigateToConfirmation } = useConfirmNavigation();
   const { token } = route.params;
 
   // We want to keep track of the last quick amount pressed before navigating to review.
@@ -434,17 +437,19 @@ const EarnInputView = () => {
         type: TransactionType.lendingDeposit,
       };
 
+      // Navigate first so the loader shows while the transaction batch is being added
+      navigateToConfirmation({
+        loader: ConfirmationLoader.Default,
+        stack: 'StakeScreens',
+      });
+
       addTransactionBatch({
         from: (selectedAccount?.address as Hex) || '0x',
         networkClientId,
         origin: ORIGIN_METAMASK,
         transactions: [approveTx, lendingDepositTx],
         requireApproval: true,
       });
-
-      navigation.navigate('StakeScreens', {
-        screen: Routes.FULL_SCREEN_CONFIRMATIONS.REDESIGNED_CONFIRMATIONS,
-      });
     };
 
     const createLegacyLendingDepositConfirmation = (
@@ -491,6 +496,7 @@ const EarnInputView = () => {
     amountTokenMinimalUnit,
     networkClientId,
     navigation,
+    navigateToConfirmation,
     token,
     amountFiatNumber,
     annualRewardsToken,

app/components/UI/Earn/Views/EarnLendingWithdrawalConfirmationView/index.tsx

@@ -84,8 +84,7 @@ const EarnLendingWithdrawalConfirmationView = () => {
 
   const [isConfirmButtonDisabled, setIsConfirmButtonDisabled] = useState(false);
 
-  const { earnTokenPair, getTokenSnapshot, tokenSnapshot } =
-    useEarnToken(token);
+  const { earnTokenPair } = useEarnToken(token);
 
   const earnToken = earnTokenPair?.earnToken;
   const outputToken = earnTokenPair?.outputToken;
@@ -181,15 +180,6 @@ const EarnLendingWithdrawalConfirmationView = () => {
   //   return parseFloat(healthFactor).toFixed(2);
   // };
 
-  useEffect(() => {
-    if (!earnToken) {
-      getTokenSnapshot(
-        outputToken?.chainId as Hex,
-        outputToken?.experience.market?.underlying?.address as Hex,
-      );
-    }
-  }, [outputToken, getTokenSnapshot, earnToken]);
-
   // Needed to get token's network name
   const networkConfig =
     Engine.context.NetworkController.getNetworkConfigurationByChainId(
@@ -339,36 +329,8 @@ const EarnLendingWithdrawalConfirmationView = () => {
         },
         (transactionMeta) => transactionMeta.id === transactionId,
       );
-      Engine.controllerMessenger.subscribeOnceIf(
-        'TransactionController:transactionConfirmed',
-        () => {
-          if (!earnToken) {
-            try {
-              const tokenNetworkClientId =
-                Engine.context.NetworkController.findNetworkClientIdByChainId(
-                  tokenSnapshot?.chainId as Hex,
-                );
-              Engine.context.TokensController.addToken({
-                decimals: tokenSnapshot?.token?.decimals || 0,
-                symbol: tokenSnapshot?.token?.symbol || '',
-                address: tokenSnapshot?.token?.address || '',
-                name: tokenSnapshot?.token?.name || '',
-                networkClientId: tokenNetworkClientId,
-              }).catch(console.error);
-            } catch (error) {
-              console.error(
-                error,
-                `error adding counter-token for ${
-                  outputToken?.symbol || outputToken?.ticker || ''
-                } on confirmation`,
-              );
-            }
-          }
-        },
-        (transactionMeta) => transactionMeta.id === transactionId,
-      );
     },
-    [emitTxMetaMetric, tokenSnapshot, earnToken, outputToken, navigation],
+    [emitTxMetaMetric, navigation, outputToken?.chainId],
   );
 
   // Guards

app/components/UI/Earn/components/EarnTransactionMonitor.test.tsx

@@ -1,12 +1,17 @@
 import React from 'react';
 import { render } from '@testing-library/react-native';
 import EarnTransactionMonitor from './EarnTransactionMonitor';
+import { useEarnLendingTransactionStatus } from '../hooks/useEarnLendingTransactionStatus';
 import { useMusdConversionStatus } from '../hooks/useMusdConversionStatus';
 
 jest.mock('../hooks/useMusdConversionStatus');
+jest.mock('../hooks/useEarnLendingTransactionStatus');
 
 describe('EarnTransactionMonitor', () => {
   const mockUseMusdConversionStatus = jest.mocked(useMusdConversionStatus);
+  const mockUseEarnLendingTransactionStatus = jest.mocked(
+    useEarnLendingTransactionStatus,
+  );
 
   beforeEach(() => {
     jest.clearAllMocks();
@@ -28,6 +33,12 @@ describe('EarnTransactionMonitor', () => {
     expect(mockUseMusdConversionStatus).toHaveBeenCalledTimes(1);
   });
 
+  it('calls useEarnLendingTransactionStatus hook', () => {
+    render(<EarnTransactionMonitor />);
+
+    expect(mockUseEarnLendingTransactionStatus).toHaveBeenCalledTimes(1);
+  });
+
   it('returns null', () => {
     const { toJSON } = render(<EarnTransactionMonitor />);
 

app/components/UI/Earn/components/EarnTransactionMonitor.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import { useEarnLendingTransactionStatus } from '../hooks/useEarnLendingTransactionStatus';
 import { useMusdConversionStatus } from '../hooks/useMusdConversionStatus';
 
 /**
@@ -11,6 +12,9 @@ const EarnTransactionMonitor: React.FC = () => {
   // Enable mUSD conversion status monitoring and toasts
   useMusdConversionStatus();
 
+  // Enable lending transaction token addition (no toasts)
+  useEarnLendingTransactionStatus();
+
   // This component doesn't render anything
   return null;
 };