Skip to content

Commit 4ceb39c

Browse files
committed
[DDW-1076] Clean up
1 parent deda0ac commit 4ceb39c

File tree

2 files changed

+193
-168
lines changed

2 files changed

+193
-168
lines changed

source/renderer/app/components/wallet/WalletSendForm.spec.tsx

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import {
1010
cleanup,
1111
within,
1212
waitForElementToBeRemoved,
13-
waitFor,
1413
} from '@testing-library/react';
1514
import '@testing-library/jest-dom';
1615
import en from 'react-intl/locale-data/en';
@@ -22,7 +21,6 @@ import { BrowserLocalStorageBridge } from '../../features/local-storage';
2221
import { HwDeviceStatuses } from '../../domains/Wallet';
2322
import WalletTokenPicker from './tokens/wallet-token-picker/WalletTokenPicker';
2423
import WalletSendForm, { FormData } from './WalletSendForm';
25-
import { FORM_VALIDATION_DEBOUNCE_WAIT } from '../../config/timingConfig';
2624

2725
jest.mock(
2826
'../../containers/wallet/dialogs/send-confirmation/SendConfirmation.container',
@@ -79,9 +77,11 @@ describe('wallet/Wallet Send Form', () => {
7977
function SetupWallet({
8078
calculateTransactionFee,
8179
currentNumberFormat = NUMBER_OPTIONS[0].value,
80+
validationDebounceWait,
8281
}: {
8382
calculateTransactionFee: (...args: Array<any>) => any;
8483
currentNumberFormat?: string;
84+
validationDebounceWait?: number;
8585
}) {
8686
const [tokenPickerOpen, setTokenPickerOpen] = useState<boolean>(false);
8787
const [state, setState] = useState<{
@@ -125,6 +125,7 @@ describe('wallet/Wallet Send Form', () => {
125125
onTokenPickerDialogClose={() => setTokenPickerOpen(false)}
126126
onTokenPickerDialogOpen={() => setTokenPickerOpen(true)}
127127
confirmationDialogData={state.formData}
128+
validationDebounceWait={validationDebounceWait}
128129
/>
129130
</MobxProvider>
130131
</DiscreetModeFeatureProvider>
@@ -227,9 +228,7 @@ describe('wallet/Wallet Send Form', () => {
227228
}
228229

229230
async function waitForTransactionFee() {
230-
const transactionFeeSpinner = await screen.findByTestId(
231-
'transaction-fee-spinner'
232-
);
231+
const transactionFeeSpinner = screen.getByTestId('transaction-fee-spinner');
233232

234233
return waitForElementToBeRemoved(transactionFeeSpinner);
235234
}
@@ -468,13 +467,14 @@ describe('wallet/Wallet Send Form', () => {
468467
test('should not allow to submit before fees are calculated', async () => {
469468
expect.assertions(4);
470469

470+
const validationDebounceWait = 0;
471+
471472
const calculateTransactionFeeMock = jest
472473
.fn()
473474
.mockImplementationOnce(
474475
() =>
475476
new Promise(async (resolve) => {
476-
const lastInputBuffer = 5;
477-
await sleep(FORM_VALIDATION_DEBOUNCE_WAIT + lastInputBuffer);
477+
await sleep(5);
478478

479479
return resolve({
480480
fee: new BigNumber(1),
@@ -485,7 +485,7 @@ describe('wallet/Wallet Send Form', () => {
485485
.mockImplementationOnce(
486486
() =>
487487
new Promise(async (resolve) => {
488-
await sleep(FORM_VALIDATION_DEBOUNCE_WAIT);
488+
await sleep(5);
489489

490490
return resolve({
491491
fee: new BigNumber(2),
@@ -495,7 +495,10 @@ describe('wallet/Wallet Send Form', () => {
495495
);
496496

497497
render(
498-
<SetupWallet calculateTransactionFee={calculateTransactionFeeMock} />
498+
<SetupWallet
499+
calculateTransactionFee={calculateTransactionFeeMock}
500+
validationDebounceWait={validationDebounceWait}
501+
/>
499502
);
500503

501504
enterReceiverAddress();
@@ -507,7 +510,7 @@ describe('wallet/Wallet Send Form', () => {
507510
},
508511
});
509512

510-
await sleep(FORM_VALIDATION_DEBOUNCE_WAIT);
513+
await sleep(validationDebounceWait);
511514

512515
fireEvent.change(adaField, {
513516
target: {
@@ -519,8 +522,7 @@ describe('wallet/Wallet Send Form', () => {
519522

520523
expect(sendButton).not.toBeEnabled();
521524

522-
await waitForTransactionFee(); // 2.5 ADA
523-
await waitForTransactionFee(); // 1.5 ADA
525+
await waitForTransactionFee();
524526

525527
expect(sendButton).toBeEnabled();
526528

0 commit comments

Comments
 (0)