kylefang/wallet
1
0
Fork 0
mirror of https://github.com/zhigang1992/wallet.git synced 2026-01-12 22:53:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(ledger): broken activity page

Browse Source
This commit is contained in:
kyranjamie
2023-06-28 13:54:13 +02:00
committed by kyranjamie
parent f5476de731
commit eeb535e902
3 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/app/features/activity-list/activity-list.tsx
View File

@@ -15,14 +15,21 @@ import { PendingTransactionList } from './components/pending-transaction-list/pe
import { SubmittedTransactionList } from './components/submitted-transaction-list/submitted-transaction-list';
import { TransactionList } from './components/transaction-list/transaction-list';
export function ActivityList() {
const nativeSegwitSigner = useCurrentAccountNativeSegwitIndexZeroSigner();
// TODO: temporary really ugly fix while we address conditional data problem of
// bitcoin sometimes being undefined
function useBitcoinAddress() {
try {
return useCurrentAccountNativeSegwitIndexZeroSigner().address;
} catch (e) {
return '';
}
}
export function ActivityList() {
const bitcoinAddress = useBitcoinAddress();
const { isInitialLoading: isInitialLoadingBitcoinTransactions, data: bitcoinTransactions } =
useGetBitcoinTransactionsByAddressQuery(nativeSegwitSigner.address);
const { data: bitcoinPendingTxs = [] } = useBitcoinPendingTransactions(
nativeSegwitSigner.address
);
useGetBitcoinTransactionsByAddressQuery(bitcoinAddress);
const { data: bitcoinPendingTxs = [] } = useBitcoinPendingTransactions(bitcoinAddress);
const {
isInitialLoading: isInitialLoadingStacksTransactions,
data: stacksTransactionsWithTransfers,

3
tests/specs/ledger/ledger.spec.ts
View File

@@ -17,7 +17,6 @@ test.describe('App with Ledger', () => {
test('that you can navigate to activity page', async ({ homePage }) => {
await homePage.clickActivityTab();
const noActivityText = homePage.page.getByText('No activity yet');
test.expect(await noActivityText.count()).toBeGreaterThan(0);
await test.expect(noActivityText).toBeVisible();
});
});

8
tests/specs/onboarding/onboarding.spec.ts
View File

@@ -31,6 +31,14 @@ test.describe('Onboarding an existing user', () => {
test.expect(walletState).toEqual(testSoftwareAccountDefaultWalletState);
});
test('Activity tab', async ({ extensionId, globalPage, onboardingPage, homePage }) => {
await globalPage.setupAndUseApiCalls(extensionId);
await onboardingPage.signUpNewUser();
await homePage.clickActivityTab();
const noActivityText = homePage.page.getByText('No activity yet');
await test.expect(noActivityText).toBeVisible();
});
test.describe('Address generation', () => {
test.beforeEach(async ({ extensionId, globalPage, onboardingPage }) => {
await globalPage.setupAndUseApiCalls(extensionId);