Enable hardware accounts for transaction confirmations

Author: OGPoyraz

app/components/Views/confirmations/context/ledger-context/ledger-context.tsx

@@ -14,6 +14,7 @@ import {
   isHardwareAccount,
 } from '../../../../../util/address';
 import useApprovalRequest from '../../hooks/useApprovalRequest';
+import { useTransactionMetadataRequest } from '../../hooks/transactions/useTransactionMetadataRequest';
 import LedgerSignModal from '../../components/modals/ledger-sign-modal';
 
 export interface LedgerContextType {
@@ -36,7 +37,10 @@ export const LedgerContextProvider: React.FC<{
   children: ReactElement[] | ReactElement;
 }> = ({ children }) => {
   const { approvalRequest } = useApprovalRequest();
-  const fromAddress = approvalRequest?.requestData?.from as string;
+  const transactionMetadata = useTransactionMetadataRequest();
+  const fromAddress =
+    (approvalRequest?.requestData?.from as string) ||
+    (transactionMetadata?.txParams?.from as string);
   const isLedgerAccount =
     isHardwareAccount(fromAddress, [ExtendedKeyringTypes.ledger]) ?? false;
   const [ledgerSigningInProgress, setLedgerSigningInProgress] =

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

@@ -183,7 +183,7 @@ describe('useConfirmationRedesignEnabled', () => {
           expect(result.current.isRedesignedEnabled).toBe(false);
         });
 
-        it('returns false when from address is external hardware account', async () => {
+        it('returns true when from address is external hardware account', async () => {
           confirmationRedesignFlagsMock.mockReturnValue({
             ...disabledFeatureFlags,
             signatures: true,
@@ -198,7 +198,7 @@ describe('useConfirmationRedesignEnabled', () => {
             },
           );
 
-          expect(result.current.isRedesignedEnabled).toBe(false);
+          expect(result.current.isRedesignedEnabled).toBe(true);
         });
 
         it('only redesign if transactions is staking deposit', async () => {

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

@@ -10,7 +10,6 @@ import {
   ConfirmationRedesignRemoteFlags,
   selectConfirmationRedesignFlags,
 } from '../../../../selectors/featureFlagController/confirmations';
-import { isHardwareAccount } from '../../../../util/address';
 import { isStakingConfirmation } from '../utils/confirm';
 import {
   REDESIGNED_APPROVE_TYPES,
@@ -39,12 +38,10 @@ function isRedesignedSignature({
 function isRedesignedTransaction({
   approvalRequestType,
   confirmationRedesignFlags,
-  fromAddress,
   transactionMetadata,
 }: {
   approvalRequestType: ApprovalType;
   confirmationRedesignFlags: ConfirmationRedesignRemoteFlags;
-  fromAddress: string;
   transactionMetadata?: TransactionMeta;
 }) {
   const transactionType = transactionMetadata?.type as TransactionType;
@@ -54,8 +51,7 @@ function isRedesignedTransaction({
   if (
     !isTransactionTypeRedesigned ||
     approvalRequestType !== ApprovalType.Transaction ||
-    !transactionMetadata ||
-    isHardwareAccount(fromAddress)
+    !transactionMetadata
   ) {
     return false;
   }
@@ -114,7 +110,6 @@ export const useConfirmationRedesignEnabled = () => {
       isRedesignedTransaction({
         approvalRequestType,
         confirmationRedesignFlags,
-        fromAddress,
         transactionMetadata,
       }) ||
       isBatchTransaction(approvalRequestType),

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

@@ -15,7 +15,6 @@ import { connect } from 'react-redux';
 import {
   setSelectedAsset,
   prepareTransaction,
-  setTransactionObject,
   resetTransaction,
   setMaxValueMode,
 } from '../../../../../../actions/transaction';
@@ -707,8 +706,7 @@ class Amount extends PureComponent {
     );
 
     const shouldUseRedesignedTransferConfirmation =
-      isRedesignedTransferConfirmationEnabledForTransfer &&
-      !isHardwareAccount(transaction.from);
+      isRedesignedTransferConfirmationEnabledForTransfer;
 
     setSelectedAsset(selectedAsset);
     if (onConfirm) {

app/components/Views/confirmations/legacy/SendFlow/Amount/index.test.tsx

@@ -11,7 +11,6 @@ import { AmountViewSelectorsIDs } from '../../../../../../../e2e/selectors/SendF
 import { backgroundState } from '../../../../../../util/test/initial-root-state';
 import { setMaxValueMode } from '../../../../../../actions/transaction';
 import Routes from '../../../../../../constants/navigation/Routes';
-import { isHardwareAccount } from '../../../../../../util/address';
 
 const mockTransactionTypes = TransactionTypes;
 
@@ -229,14 +228,12 @@ describe('Amount', () => {
   const mockSelectConfirmationRedesignFlags = jest.mocked(
     selectConfirmationRedesignFlags,
   );
-  const mockIsHardwareAccount = jest.mocked(isHardwareAccount);
 
   beforeEach(() => {
     mockNavigate.mockClear();
     mockSelectConfirmationRedesignFlags.mockReturnValue({
       transfer: false,
     } as ReturnType<typeof selectConfirmationRedesignFlags>);
-    mockIsHardwareAccount.mockReturnValue(false);
   });
 
   it('renders correctly', () => {