Skip to content

Commit e3bb652

Browse files
committed
fix: resolve TypeScript lint failures
1 parent 7467509 commit e3bb652

5 files changed

Lines changed: 38 additions & 7 deletions

File tree

app/components/Views/MultichainAccounts/AddressList/AddressList.test.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,8 @@ describe('AddressList', () => {
382382
});
383383

384384
const toastOptions = toastShowMock.mock.calls[0][0];
385-
toastOptions.closeButtonOptions?.onPress?.();
385+
const closeToast = toastOptions.closeButtonOptions?.onPress as () => void;
386+
closeToast();
386387

387388
expect(Toast.hide).toHaveBeenCalled();
388389
});

app/components/Views/MultichainAccounts/PrivateKeyList/PrivateKeyList.test.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,8 @@ describe('PrivateKeyList', () => {
311311
});
312312

313313
const toastOptions = toastShowMock.mock.calls[0][0];
314-
toastOptions.closeButtonOptions?.onPress?.();
314+
const closeToast = toastOptions.closeButtonOptions?.onPress as () => void;
315+
closeToast();
315316

316317
expect(Toast.hide).toHaveBeenCalled();
317318
});

app/components/Views/confirmations/components/activity/transaction-details-summary/fiat-order-summary-line.tsx

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,32 @@ import { getIntlDateTimeFormatter } from '../../../../../../util/intl';
99
import { ProgressListItem } from '../../progress-list';
1010
import { useFiatOrderStatus } from '../../../hooks/activity/useFiatOrderStatus';
1111

12+
interface FiatOrderMetadata {
13+
orderId?: string;
14+
provider?: string;
15+
}
16+
17+
type MetamaskPayMetadataWithFiatOrder = NonNullable<
18+
TransactionMeta['metamaskPay']
19+
> & {
20+
fiat?: FiatOrderMetadata;
21+
};
22+
23+
export function getFiatOrderMetadata(
24+
transactionMeta: TransactionMeta,
25+
): FiatOrderMetadata | undefined {
26+
return (
27+
transactionMeta.metamaskPay as MetamaskPayMetadataWithFiatOrder | undefined
28+
)?.fiat;
29+
}
30+
1231
export function FiatOrderSummaryLine({
1332
parentTransaction,
1433
}: {
1534
parentTransaction: TransactionMeta;
1635
}) {
1736
const navigation = useNavigation();
18-
const { fiat } = parentTransaction.metamaskPay ?? {};
37+
const fiat = getFiatOrderMetadata(parentTransaction);
1938
const fiatOrderId = fiat?.orderId;
2039
const fiatProvider = fiat?.provider;
2140
const walletAddress = parentTransaction.txParams.from;

app/components/Views/confirmations/components/activity/transaction-details-summary/transaction-details-summary.tsx

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@ import { DepositSummaryLine } from './deposit-summary-line';
2323
import { ApprovalSummaryLine } from './approval-summary-line';
2424
import { ReceiveSummaryLine } from './receive-summary-line';
2525
import { DefaultSummaryLine } from './default-summary-line';
26-
import { FiatOrderSummaryLine } from './fiat-order-summary-line';
26+
import {
27+
FiatOrderSummaryLine,
28+
getFiatOrderMetadata,
29+
} from './fiat-order-summary-line';
2730

2831
export function TransactionDetailsSummary() {
2932
const { transactionMeta } = useTransactionDetails();
@@ -68,8 +71,8 @@ export function TransactionDetailsSummary() {
6871
const hasDepositTransactions =
6972
(requiredTransactionIds?.length ?? 0) > 0 || batchTransactionIds.length > 0;
7073

71-
const { sourceHash, fiat } = metamaskPay ?? {};
72-
const { orderId: fiatOrderId } = fiat ?? {};
74+
const { sourceHash } = metamaskPay ?? {};
75+
const fiatOrderId = getFiatOrderMetadata(transactionMeta)?.orderId;
7376

7477
return (
7578
<Box gap={12}>

app/components/Views/confirmations/hooks/pay/useFiatConfirm.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
useHeadlessBuy,
66
type HeadlessBuyError,
77
} from '../../../../UI/Ramp/headless';
8+
import type { TransactionFiatPayment } from '@metamask/transaction-pay-controller';
89
import type { Quote } from '../../../../UI/Ramp/types';
910
import Engine from '../../../../../core/Engine';
1011
import { useTransactionMetadataRequest } from '../transactions/useTransactionMetadataRequest';
@@ -13,9 +14,15 @@ import { useConfirmationContext } from '../../context/confirmation-context';
1314

1415
const log = createProjectLogger('fiat-confirm');
1516

17+
type HeadlessFiatPayment = TransactionFiatPayment & {
18+
caipAssetId?: string;
19+
};
20+
1621
export function useFiatConfirm() {
1722
const transactionMetadata = useTransactionMetadataRequest();
18-
const fiatPayment = useTransactionPayFiatPayment();
23+
const fiatPayment = useTransactionPayFiatPayment() as
24+
| HeadlessFiatPayment
25+
| undefined;
1926
const { setIsHeadlessBuyInProgress, setHeadlessBuyError } =
2027
useConfirmationContext();
2128
const { startHeadlessBuy } = useHeadlessBuy();

0 commit comments

Comments
 (0)