Merge branch 'e2e_fix' of github.com:MetaMask/metamask-mobile into e2…

…e_fix

app/components/Views/confirmations/Confirm/Confirm.test.tsx

@@ -10,6 +10,17 @@ import Confirm from './index';
 
 jest.mock('../../../../core/Engine', () => ({
   getTotalFiatAccountBalance: () => ({ tokenFiat: 10 }),
+  context: {
+    KeyringController: {
+      state: {
+        keyrings: [],
+      },
+      getOrAddQRKeyring: jest.fn(),
+    },
+  },
+  controllerMessenger: {
+    subscribe: jest.fn(),
+  },
 }));
 
 jest.mock('../../../../util/address', () => ({

app/components/Views/confirmations/components/SignatureRequest/Root/Root.test.tsx

@@ -23,6 +23,7 @@ jest.mock('../../../../../../core/Engine', () => ({
       getQRKeyringState: jest.fn(() =>
         Promise.resolve({ subscribe: jest.fn(), unsubscribe: jest.fn() }),
       ),
+      getOrAddQRKeyring: jest.fn(),
       state: {
         keyrings: [],
       },
@@ -33,6 +34,9 @@ jest.mock('../../../../../../core/Engine', () => ({
       },
     },
   },
+  controllerMessenger: {
+    subscribe: jest.fn(),
+  },
 }));
 
 jest.mock('@react-navigation/native', () => ({

app/components/Views/confirmations/hooks/useConfirmationRedesignEnabled.test.ts

@@ -0,0 +1,72 @@
+// eslint-disable-next-line import/no-namespace
+import * as AddressUtils from '../../../../util/address';
+import { renderHookWithProvider } from '../../../../util/test/renderWithProvider';
+import { personalSignatureConfirmationState } from '../../../../util/test/confirm-data-helpers';
+
+// eslint-disable-next-line import/no-namespace
+import * as QRHardwareAwareness from './useQRHardwareAwareness';
+import useConfirmationRedesignEnabled from './useConfirmationRedesignEnabled';
+
+jest.mock('../../../../core/Engine', () => ({
+  getTotalFiatAccountBalance: () => ({ tokenFiat: 10 }),
+  context: {
+    KeyringController: {
+      state: {
+        keyrings: [],
+      },
+      getOrAddQRKeyring: jest.fn(),
+    },
+  },
+  controllerMessenger: {
+    subscribe: jest.fn(),
+  },
+}));
+
+describe('useConfirmationRedesignEnabled', () => {
+  it('return true for personal sign request', async () => {
+    const { result } = renderHookWithProvider(
+      () => useConfirmationRedesignEnabled(),
+      {
+        state: personalSignatureConfirmationState,
+      },
+    );
+    expect(result?.current.isRedesignedEnabled).toBeTruthy();
+  });
+
+  it('return false for external accounts', async () => {
+    jest.spyOn(AddressUtils, 'isExternalHardwareAccount').mockReturnValue(true);
+    const { result } = renderHookWithProvider(
+      () => useConfirmationRedesignEnabled(),
+      {
+        state: personalSignatureConfirmationState,
+      },
+    );
+    expect(result?.current.isRedesignedEnabled).toBeFalsy();
+  });
+
+  it('return false if QR hardware is syncing', async () => {
+    jest
+      .spyOn(QRHardwareAwareness, 'default')
+      .mockReturnValue({ isSigningQRObject: true, isSyncingQRHardware: false });
+    const { result } = renderHookWithProvider(
+      () => useConfirmationRedesignEnabled(),
+      {
+        state: personalSignatureConfirmationState,
+      },
+    );
+    expect(result?.current.isRedesignedEnabled).toBeFalsy();
+  });
+
+  it('return false if QR hardware has synced successfully', async () => {
+    jest
+      .spyOn(QRHardwareAwareness, 'default')
+      .mockReturnValue({ isSigningQRObject: false, isSyncingQRHardware: true });
+    const { result } = renderHookWithProvider(
+      () => useConfirmationRedesignEnabled(),
+      {
+        state: personalSignatureConfirmationState,
+      },
+    );
+    expect(result?.current.isRedesignedEnabled).toBeFalsy();
+  });
+});

app/components/Views/confirmations/hooks/useConfirmationRedesignEnabled.ts

@@ -2,25 +2,42 @@ import { useMemo } from 'react';
 import { useSelector } from 'react-redux';
 
 import { ApprovalTypes } from '../../../../core/RPCMethods/RPCMethodMiddleware';
+import { isExternalHardwareAccount } from '../../../../util/address';
 import { selectRemoteFeatureFlags } from '../../../../selectors/featureFlagController';
 import useApprovalRequest from './useApprovalRequest';
+import useQRHardwareAwareness from './useQRHardwareAwareness';
 
 const useConfirmationRedesignEnabled = () => {
   const { approvalRequest } = useApprovalRequest();
+  const { isSigningQRObject, isSyncingQRHardware } = useQRHardwareAwareness();
   const { confirmation_redesign } = useSelector(selectRemoteFeatureFlags);
 
-  const { type: approvalRequestType } = approvalRequest ?? {
+  const {
+    type: approvalRequestType,
+    requestData: { from: fromAddress },
+  } = approvalRequest ?? {
     requestData: {},
   };
 
   const isRedesignedEnabled = useMemo(
     () =>
       (confirmation_redesign as Record<string, string>)?.signatures &&
+      // following condition will ensure that user is redirected to old designs is using QR scan aware hardware
+      !isSyncingQRHardware &&
+      !isSigningQRObject &&
+      // following condition will ensure that user is redirected to old designs for hardware wallets
+      !isExternalHardwareAccount(fromAddress) &&
       approvalRequestType &&
       [ApprovalTypes.PERSONAL_SIGN, ApprovalTypes.ETH_SIGN_TYPED_DATA].includes(
         approvalRequestType as ApprovalTypes,
       ),
-    [approvalRequestType, confirmation_redesign],
+    [
+      approvalRequestType,
+      confirmation_redesign,
+      fromAddress,
+      isSigningQRObject,
+      isSyncingQRHardware,
+    ],
   );
 
   return { isRedesignedEnabled };

app/components/Views/confirmations/hooks/useQRHardwareAwareness.ts

@@ -0,0 +1,38 @@
+import { useState, useEffect } from 'react';
+
+import Engine from '../../../../core/Engine';
+import { IQRState } from '../../../UI/QRHardware/types';
+
+const useQRHardwareAwareness = () => {
+  const [qrState, setQRState] = useState<IQRState>({
+    sync: {
+      reading: false,
+    },
+    sign: {},
+  });
+
+  const subscribe = (value: IQRState) => {
+    setQRState(value);
+  };
+
+  useEffect(() => {
+    Engine.context.KeyringController.getOrAddQRKeyring();
+    Engine.controllerMessenger.subscribe(
+      'KeyringController:qrKeyringStateChange',
+      subscribe,
+    );
+    return () => {
+      Engine.controllerMessenger.unsubscribe(
+        'KeyringController:qrKeyringStateChange',
+        subscribe,
+      );
+    };
+  }, []);
+
+  return {
+    isSigningQRObject: !!qrState.sign?.request,
+    isSyncingQRHardware: qrState.sync.reading,
+  };
+};
+
+export default useQRHardwareAwareness;