Skip to content

Commit 467771c

Browse files
committed
chore: pr feedback
- throw error when can't resolve sender - clean up the tests
1 parent c81b576 commit 467771c

File tree

2 files changed

+13
-25
lines changed

2 files changed

+13
-25
lines changed

src/features/transaction-wizard/utils/resolve-sender-address.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,11 @@ import { betanetId, mainnetId, testnetId, fnetId, localnetId } from '@/features/
1111
import { algorandClient } from '@/features/common/data/algo-client'
1212

1313
export async function resolveTransactionSender(data: { value?: string; resolvedAddress?: string }): Promise<TransactionSender> {
14-
const val = data.value ?? ''
15-
16-
if (val) {
17-
return data as TransactionSender
14+
if (data.value && data.resolvedAddress) {
15+
return {
16+
value: data.value,
17+
resolvedAddress: data.resolvedAddress,
18+
}
1819
}
1920

2021
const { id: networkId } = settingsStore.get(networkConfigAtom)
@@ -36,5 +37,5 @@ export async function resolveTransactionSender(data: { value?: string; resolvedA
3637
return { value: TESTNET_FEE_SINK_ADDRESS, resolvedAddress: TESTNET_FEE_SINK_ADDRESS, autoPopulated: true }
3738
}
3839

39-
return data as TransactionSender
40+
throw new Error(`Cannot resolve a default sender address for network "${networkId}"`)
4041
}

src/features/transaction-wizard/utils/transactions-url-search-params.test.tsx

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { createMemoryRouter, RouterProvider } from 'react-router-dom'
22
import { afterEach, beforeEach, describe, expect, it, vitest } from 'vitest'
33
import { TransactionWizardPage } from '../transaction-wizard-page'
4-
import { render, screen, cleanup, waitFor } from '@testing-library/react'
4+
import { render, screen, cleanup } from '@testing-library/react'
55
import { algorandFixture } from '@algorandfoundation/algokit-utils/testing'
66
import { TooltipProvider } from '@/features/common/components/tooltip'
77
import { ToastContainer } from 'react-toastify'
@@ -133,9 +133,7 @@ describe('Render transactions page with search params', () => {
133133
}),
134134
})
135135

136-
const senderElements = await screen.findAllByText(localnetDispenserAccount.addr.toString(), {}, { timeout: 10_000 })
137-
138-
expect(senderElements.length).toBeGreaterThanOrEqual(1)
136+
expect(await screen.findByText(localnetDispenserAccount.addr.toString(), {}, { timeout: 10_000 })).toBeInTheDocument()
139137
})
140138
})
141139

@@ -224,9 +222,7 @@ describe('Render transactions page with search params', () => {
224222
}),
225223
})
226224

227-
const senderElements = await screen.findAllByText(localnetDispenserAccount.addr.toString(), {}, { timeout: 10_000 })
228-
229-
expect(senderElements.length).toBeGreaterThanOrEqual(1)
225+
expect(await screen.findByText(localnetDispenserAccount.addr.toString(), {}, { timeout: 10_000 })).toBeInTheDocument()
230226
})
231227

232228
it.each([
@@ -402,9 +398,7 @@ describe('Render transactions page with search params', () => {
402398
}),
403399
})
404400

405-
const senderElements = await screen.findAllByText(localnetDispenserAccount.addr.toString(), {}, { timeout: 10_000 })
406-
407-
expect(senderElements.length).toBeGreaterThanOrEqual(1)
401+
expect(await screen.findByText(localnetDispenserAccount.addr.toString(), {}, { timeout: 10_000 })).toBeInTheDocument()
408402
})
409403

410404
it.each([
@@ -1026,9 +1020,7 @@ describe('Render transactions page with search params', () => {
10261020
}),
10271021
})
10281022

1029-
const senderElements = await screen.findAllByText(localnetDispenserAccount.addr.toString(), {}, { timeout: 10_000 })
1030-
1031-
expect(senderElements.length).toBeGreaterThanOrEqual(1)
1023+
expect(await screen.findByText(localnetDispenserAccount.addr.toString(), {}, { timeout: 10_000 })).toBeInTheDocument()
10321024
})
10331025

10341026
it.each([
@@ -1467,13 +1459,8 @@ describe('Render transactions page with search params', () => {
14671459
}),
14681460
})
14691461

1470-
await waitFor(
1471-
() => {
1472-
expect(screen.getByText(assetId)).toBeInTheDocument()
1473-
expect(screen.getByText(localnetDispenserAccount.addr.toString())).toBeInTheDocument()
1474-
},
1475-
{ timeout: 10_000 }
1476-
)
1462+
expect(await screen.findByText(assetId)).toBeInTheDocument()
1463+
expect(await screen.findByText(localnetDispenserAccount.addr.toString(), {}, { timeout: 10_000 })).toBeInTheDocument()
14771464
})
14781465

14791466
it.each([

0 commit comments

Comments
 (0)