Merge remote-tracking branch 'origin/main' into papi-slice-1

dfinity · Oct 9, 2024 · e30156d · e30156d
2 parents 7834c3c + 1e78380
commit e30156d
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 3 deletions.
diff --git a/...-snapshots/should-display-homepage-in-logged-in-state-1-Google-Chrome-linux.png b/...-snapshots/should-display-homepage-in-logged-in-state-1-Google-Chrome-linux.png
diff --git a/e2e/utils/pages/homepage.page.ts b/e2e/utils/pages/homepage.page.ts
@@ -6,6 +6,7 @@ import {
 	RECEIVE_TOKENS_MODAL,
 	RECEIVE_TOKENS_MODAL_OPEN_BUTTON,
 	RECEIVE_TOKENS_MODAL_QR_CODE_OUTPUT,
+	TOKEN_BALANCE,
 	TOKEN_CARD
 } from '$lib/constants/test-ids.constants';
 import { type InternetIdentityPage } from '@dfinity/internet-identity-playwright';
@@ -137,6 +138,9 @@ abstract class Homepage {
 	protected async waitForTokensInitialization(options?: WaitForLocatorOptions): Promise<void> {
 		await this.#page.getByTestId(`${TOKEN_CARD}-ICP`).waitFor(options);
 		await this.#page.getByTestId(`${TOKEN_CARD}-ETH`).waitFor(options);
+
+		await this.#page.getByTestId(`${TOKEN_BALANCE}-ICP`).waitFor(options);
+		await this.#page.getByTestId(`${TOKEN_BALANCE}-ETH`).waitFor(options);
 	}
 
 	protected async clickMenuItem({ menuItemTestId }: ClickMenuItemParams): Promise<void> {

diff --git a/src/frontend/src/btc/components/send/BtcSendReview.svelte b/src/frontend/src/btc/components/send/BtcSendReview.svelte
@@ -18,4 +18,4 @@
 		}) || invalidAmount(amount);
 </script>
 
-<SendReview {source} {amount} {destination} disabled={invalid} />
+<SendReview on:icBack on:icSend {source} {amount} {destination} disabled={invalid} />
diff --git a/src/frontend/src/icp/components/send/IcSendReview.svelte b/src/frontend/src/icp/components/send/IcSendReview.svelte
@@ -26,4 +26,4 @@
 		invalidAmount(amount);
 </script>
 
-<SendReview {source} {amount} {destination} disabled={invalid} />
+<SendReview on:icBack on:icSend {source} {amount} {destination} disabled={invalid} />
diff --git a/src/frontend/src/lib/components/tokens/TokenBalance.svelte b/src/frontend/src/lib/components/tokens/TokenBalance.svelte
@@ -2,14 +2,15 @@
 	import { nonNullish } from '@dfinity/utils';
 	import TokenBalanceSkeleton from '$lib/components/tokens/TokenBalanceSkeleton.svelte';
 	import { ZERO } from '$lib/constants/app.constants';
+	import { TOKEN_BALANCE } from '$lib/constants/test-ids.constants';
 	import type { TokenUi } from '$lib/types/token';
 	import { formatToken } from '$lib/utils/format.utils';
 
 	export let token: TokenUi;
 </script>
 
 <TokenBalanceSkeleton {token}>
-	<output class="break-all">
+	<output class="break-all" data-tid={`${TOKEN_BALANCE}-${token.symbol}`}>
 		{#if nonNullish(token.balance)}
 			{formatToken({
 				value: token.balance,

diff --git a/src/frontend/src/lib/constants/test-ids.constants.ts b/src/frontend/src/lib/constants/test-ids.constants.ts
@@ -5,6 +5,7 @@ export const LOGOUT_BUTTON = 'logout-button';
 export const LOGIN_BUTTON = 'login-button';
 
 export const TOKEN_CARD = 'token-card';
+export const TOKEN_BALANCE = 'token-balance';
 
 export const ABOUT_WHAT_MODAL_OPEN_BUTTON = 'about-what-modal-open-button';
 export const ABOUT_WHAT_MODAL = 'about-what-modal';