Skip to content

Commit 55ea0ab

Browse files
committed
revert: remove confirmation changes from MUL-1692
1 parent e3bb652 commit 55ea0ab

3 files changed

Lines changed: 5 additions & 34 deletions

File tree

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

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,13 @@ 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-
3112
export function FiatOrderSummaryLine({
3213
parentTransaction,
3314
}: {
3415
parentTransaction: TransactionMeta;
3516
}) {
3617
const navigation = useNavigation();
37-
const fiat = getFiatOrderMetadata(parentTransaction);
18+
const { fiat } = parentTransaction.metamaskPay ?? {};
3819
const fiatOrderId = fiat?.orderId;
3920
const fiatProvider = fiat?.provider;
4021
const walletAddress = parentTransaction.txParams.from;

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@ 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 {
27-
FiatOrderSummaryLine,
28-
getFiatOrderMetadata,
29-
} from './fiat-order-summary-line';
26+
import { FiatOrderSummaryLine } from './fiat-order-summary-line';
3027

3128
export function TransactionDetailsSummary() {
3229
const { transactionMeta } = useTransactionDetails();
@@ -71,8 +68,8 @@ export function TransactionDetailsSummary() {
7168
const hasDepositTransactions =
7269
(requiredTransactionIds?.length ?? 0) > 0 || batchTransactionIds.length > 0;
7370

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

7774
return (
7875
<Box gap={12}>

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

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

1514
const log = createProjectLogger('fiat-confirm');
1615

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

0 commit comments

Comments
 (0)