diff --git a/packages/arb-token-bridge-ui/src/components/TransferPanel/TransferPanel.tsx b/packages/arb-token-bridge-ui/src/components/TransferPanel/TransferPanel.tsx index d8cc6eb772..4e07d5e7fb 100644 --- a/packages/arb-token-bridge-ui/src/components/TransferPanel/TransferPanel.tsx +++ b/packages/arb-token-bridge-ui/src/components/TransferPanel/TransferPanel.tsx @@ -409,7 +409,7 @@ export function TransferPanel() { return } - case 'tx': { + case 'tx_ethers': { try { const tx = await signer!.sendTransaction(step.payload.txRequest) const txReceipt = await tx.wait() diff --git a/packages/arb-token-bridge-ui/src/ui-driver/UiDriver.ts b/packages/arb-token-bridge-ui/src/ui-driver/UiDriver.ts index 5642c8aa8f..e8de84464a 100644 --- a/packages/arb-token-bridge-ui/src/ui-driver/UiDriver.ts +++ b/packages/arb-token-bridge-ui/src/ui-driver/UiDriver.ts @@ -26,7 +26,7 @@ export type UiDriverStep = | { type: 'dialog'; payload: Dialog } | { type: 'scw_tooltip' } | { - type: 'tx' + type: 'tx_ethers' payload: { txRequest: providers.TransactionRequest txRequestLabel: string @@ -55,7 +55,7 @@ export type UiDriverStepResultFor = ? boolean : TStepType extends 'scw_tooltip' ? void - : TStepType extends 'tx' + : TStepType extends 'tx_ethers' ? Result : never diff --git a/packages/arb-token-bridge-ui/src/ui-driver/UiDriverCctp.test.ts b/packages/arb-token-bridge-ui/src/ui-driver/UiDriverCctp.test.ts index 4878c4aec5..ad0666c7cb 100644 --- a/packages/arb-token-bridge-ui/src/ui-driver/UiDriverCctp.test.ts +++ b/packages/arb-token-bridge-ui/src/ui-driver/UiDriverCctp.test.ts @@ -155,7 +155,7 @@ it(` .hasType('dialog') .hasPayload('approve_token') expectStep(await nextStep(generator, [true])) - .hasType('tx') + .hasType('tx_ethers') .hasPayload(approveTokenPayload(mockedApproveTokenTxRequest)) expectStep(await nextStep(generator, [{ error: new Error() }])) // @@ -201,7 +201,7 @@ it(` .hasType('dialog') .hasPayload('approve_token') expectStep(await nextStep(generator, [true])) - .hasType('tx') + .hasType('tx_ethers') .hasPayload(approveTokenPayload(mockedApproveTokenTxRequest)) expectStep(await nextStep(generator, [{ data: {} as TransactionReceipt }])) // @@ -326,7 +326,7 @@ it(` // .hasType('scw_tooltip') expectStep(await nextStep(generator)) - .hasType('tx') + .hasType('tx_ethers') .hasPayload(approveTokenPayload(mockedApproveTokenTxRequest)) expectStep(await nextStep(generator, [{ data: {} as TransactionReceipt }])) // diff --git a/packages/arb-token-bridge-ui/src/ui-driver/UiDriverCctp.ts b/packages/arb-token-bridge-ui/src/ui-driver/UiDriverCctp.ts index 2a330e6423..4bad9150a7 100644 --- a/packages/arb-token-bridge-ui/src/ui-driver/UiDriverCctp.ts +++ b/packages/arb-token-bridge-ui/src/ui-driver/UiDriverCctp.ts @@ -2,7 +2,7 @@ import { step, UiDriverStepGenerator } from './UiDriver' import { stepGeneratorForDialog, stepGeneratorForSmartContractWalletDestinationDialog, - stepGeneratorForTransaction + stepGeneratorForTransactionEthers } from './UiDriverCommon' export const stepGeneratorForCctp: UiDriverStepGenerator = async function* ( @@ -27,7 +27,7 @@ export const stepGeneratorForCctp: UiDriverStepGenerator = async function* ( amount: context.amountBigNumber }) - yield* stepGeneratorForTransaction(context, { + yield* stepGeneratorForTransactionEthers(context, { txRequest: request, txRequestLabel: 'stepGeneratorForCctp.approveToken' }) diff --git a/packages/arb-token-bridge-ui/src/ui-driver/UiDriverCommon.ts b/packages/arb-token-bridge-ui/src/ui-driver/UiDriverCommon.ts index 3273931bb6..4de623071a 100644 --- a/packages/arb-token-bridge-ui/src/ui-driver/UiDriverCommon.ts +++ b/packages/arb-token-bridge-ui/src/ui-driver/UiDriverCommon.ts @@ -36,24 +36,24 @@ export const stepGeneratorForSmartContractWalletDestinationDialog: UiDriverStepG } } -export type UiDriverStepGeneratorForTransaction< +export type UiDriverStepGeneratorForTransactionEthers< TStep extends UiDriverStep = UiDriverStep > = ( context: UiDriverContext, - payload: UiDriverStepPayloadFor<'tx'> + payload: UiDriverStepPayloadFor<'tx_ethers'> ) => AsyncGenerator< TStep, providers.TransactionReceipt | void, UiDriverStepResultFor > -export const stepGeneratorForTransaction: UiDriverStepGeneratorForTransaction = +export const stepGeneratorForTransactionEthers: UiDriverStepGeneratorForTransactionEthers = async function* (context, payload) { if (context.isSmartContractWallet) { yield* step({ type: 'scw_tooltip' }) } - const { error, data } = yield* step({ type: 'tx', payload }) + const { error, data } = yield* step({ type: 'tx_ethers', payload }) if (typeof error !== 'undefined') { yield* step({ type: 'return' })