Merge branch 'main' into 2091-map-proposal-elements-for-testing

emiride · emiride · commit 1c32f0009b75 · 2025-04-25T09:48:25.000+02:00
diff --git a/catalyst_voices/apps/voices/e2e_tests/.nvmrc b/catalyst_voices/apps/voices/e2e_tests/.nvmrc
@@ -0,0 +1 @@
+v22.15.0
diff --git a/catalyst_voices/apps/voices/e2e_tests/pageobject/app-bar-page.ts b/catalyst_voices/apps/voices/e2e_tests/pageobject/app-bar-page.ts
@@ -1,15 +1,12 @@
 import { Locator, Page } from "@playwright/test";
-import intlEn from "./onboarding/localization-util";
 
 export class AppBarPage {
   getStartedBtn: Locator;
   page: Page;
 
   constructor(page: Page) {
     this.page = page;
-    this.getStartedBtn = page.getByRole("button", {
-      name: intlEn.getStarted,
-    });
+    this.getStartedBtn = this.page.getByTestId("GetStartedBtn");
   }
   async GetStartedBtnClick() {
     await this.getStartedBtn.click();
diff --git a/catalyst_voices/apps/voices/e2e_tests/pageobject/onboarding/create-flow/step-2-base-profile-info.ts b/catalyst_voices/apps/voices/e2e_tests/pageobject/onboarding/create-flow/step-2-base-profile-info.ts
@@ -1,5 +1,4 @@
 import { Locator, Page } from "@playwright/test";
-import intlEn from "../localization-util";
 import { GetStartedPanel } from "../step-1-get-started";
 
 export class BaseProfileInfoPanel {
@@ -8,9 +7,7 @@ export class BaseProfileInfoPanel {
 
   constructor(page: Page) {
     this.page = page;
-    this.createYourBaseProfileBtn = page.getByRole("button", {
-      name: intlEn.createBaseProfileInstructionsNext,
-    });
+    this.createYourBaseProfileBtn = page.getByTestId('CreateBaseProfileNextButton');
   }
 
   async goto() {
diff --git a/catalyst_voices/apps/voices/e2e_tests/pageobject/onboarding/localization-util.ts b/catalyst_voices/apps/voices/e2e_tests/pageobject/onboarding/localization-util.ts
diff --git a/catalyst_voices/apps/voices/e2e_tests/pageobject/onboarding/onboarding-base-page.ts b/catalyst_voices/apps/voices/e2e_tests/pageobject/onboarding/onboarding-base-page.ts
@@ -1,5 +1,4 @@
 import { type Locator, type Page } from "@playwright/test";
-import intlEn from "./localization-util";
 
 export class OnboardingBasePage {
   page: Page;
diff --git a/catalyst_voices/apps/voices/e2e_tests/pageobject/onboarding/step-1-get-started.ts b/catalyst_voices/apps/voices/e2e_tests/pageobject/onboarding/step-1-get-started.ts
@@ -1,6 +1,5 @@
 import { Locator, Page } from "@playwright/test";
 import { AppBarPage } from "../app-bar-page";
-import intlEn from "./localization-util";
 
 export class GetStartedPanel {
   createNewCatalystKeychain: Locator;
@@ -9,16 +8,8 @@ export class GetStartedPanel {
 
   constructor(page: Page) {
     this.page = page;
-    this.createNewCatalystKeychain = page.getByRole("group", {
-      name:
-        intlEn.accountCreationCreate + " " + intlEn.accountCreationOnThisDevice,
-    });
-    this.recoverCatalystKeychain = page.getByRole("group", {
-      name:
-        intlEn.accountCreationRecover +
-        " " +
-        intlEn.accountCreationOnThisDevice,
-    });
+    this.createNewCatalystKeychain = page.getByTestId("CreateAccountType.createNew");
+    this.recoverCatalystKeychain = page.getByTestId("CreateAccountType.recover");
   }
 
   async goto() {
diff --git a/catalyst_voices/apps/voices/e2e_tests/playwright.config.ts b/catalyst_voices/apps/voices/e2e_tests/playwright.config.ts
@@ -2,15 +2,18 @@ import { defineConfig, devices } from "@playwright/test";
 
 export default defineConfig({
   testDir: "./tests",
+  testIgnore: ["**/test‑fixtures.ts"],
+
   fullyParallel: true,
   forbidOnly: !!process.env.CI,
   retries: 3,
   workers: 1,
   use: {
+    testIdAttribute: "flt-semantics-identifier",
     ignoreHTTPSErrors: true,
     screenshot: "only-on-failure",
-    trace: "on",
-    video: "on",
+    trace: "retain-on-failure",
+    video: "retain-on-failure",
   },
 
   reporter: "html",
diff --git a/catalyst_voices/apps/voices/e2e_tests/tests/onboarding.spec.ts b/catalyst_voices/apps/voices/e2e_tests/tests/onboarding.spec.ts
@@ -9,15 +9,21 @@ import { WalletConfig } from "../utils/wallets/walletUtils";
 const walletConfig: WalletConfig = walletConfigs[3];
 
 // do some non-happy flows (wrong seed phrase, cancel connection, no wallet, etc)
+
+// test("Refactored restore flow demo", async ({ page }) => {
+//   await page.goto("http://localhost:51709/m4/discovery");
+//   await new UnlockPasswordSuccessPanel(page).goto("test1234");
+// });
+
 test(
   "Create keychain and link wallet for " + walletConfig.extension.Name,
   async ({ restoreWallet }) => {
     const browser = await restoreWallet(walletConfig);
     const page = browser.pages()[0];
 
     // await new WalletListPage(page).clickEnableWallet(walletConfig.extension.Name);
-    await page.goto("http://localhost:51709/m4/discovery");
-    await new WalletListPanel(page).goto('test1234');
+    await page.goto("http://localhost:55338/m4/discovery");
+    await new WalletListPanel(page).goto("test1234");
     const [walletPopup] = await Promise.all([
       browser.waitForEvent("page"),
       new WalletListPanel(page).clickYoroiWallet(),
@@ -35,9 +41,3 @@ test(
     await signPopup.locator("#confirmButton").click();
   }
 );
-
-test("Refactored restore flow demo", async ({ page }) => {
-  await page.goto("http://localhost:51709/m4/discovery");
-  await new UnlockPasswordSuccessPanel(page).goto("test1234");
-});
-
diff --git a/catalyst_voices/apps/voices/e2e_tests/utils/wallets/yoroiUtils.ts b/catalyst_voices/apps/voices/e2e_tests/utils/wallets/yoroiUtils.ts
@@ -36,8 +36,8 @@ export const onboardYoroiWallet = async (
   await page.locator('xpath=//*[@id="sidebar.settings"]').click();
   await page.locator('button:has-text("I Understand")').click();
   await page.locator('button:has-text("SWITCH NETWORK")').click();
-  await page.locator('xpath=//*[@id="selectedNetwork--55"]').click();
-  await page.locator("#selectNetwork-network_250-menuItem").click();
+  await page.locator("#switchNetworkDialog-selectNetwork-dropdown").click();
+  await page.locator("#switchNetworkDialog-selectNetwork_250-menuItem").click();
   await page.locator("#switchNetworkDialog-apply-button").click();
   await page.locator("#somewhere-checkbox").click();
   await page.locator('button:has-text("Continue")').click();
diff --git a/catalyst_voices/apps/voices/lib/pages/registration/create_base_profile/stage/instructions_panel.dart b/catalyst_voices/apps/voices/lib/pages/registration/create_base_profile/stage/instructions_panel.dart
@@ -100,12 +100,14 @@ class _NextButton extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return Semantics(
-      button: true,
-      child: VoicesFilledButton(
-        key: const Key('CreateBaseProfileNext'),
-        onTap: () => RegistrationCubit.of(context).nextStep(),
-        child: Text(context.l10n.createBaseProfileInstructionsNext),
+    return VoicesFilledButton(
+      key: const Key('CreateBaseProfileNext'),
+      onTap: () => RegistrationCubit.of(context).nextStep(),
+      child: Semantics(
+        identifier: 'CreateBaseProfileNextButton',
+        child: Text(
+          context.l10n.createBaseProfileInstructionsNext,
+        ),
       ),
     );
   }
diff --git a/catalyst_voices/apps/voices/lib/pages/registration/get_started/get_started_panel.dart b/catalyst_voices/apps/voices/lib/pages/registration/get_started/get_started_panel.dart
@@ -41,20 +41,22 @@ class GetStartedPanel extends StatelessWidget {
             mainAxisSize: MainAxisSize.min,
             children: CreateAccountType.values
                 .map<Widget>((type) {
-                  return RegistrationTile(
-                    key: Key(type.toString()),
-                    icon: type._icon,
-                    title: type._getTitle(context.l10n),
-                    subtitle: type._getSubtitle(context.l10n),
-                    onTap: () async {
-                      switch (type) {
-                        case CreateAccountType.createNew:
-                          await _handleCreateNewAccount(context);
-                        case CreateAccountType.recover:
-                          RegistrationCubit.of(context).recoverKeychain();
-                      }
-                    },
-                  );
+                  return Semantics(
+                      identifier: type.toString(),
+                      child: RegistrationTile(
+                        key: Key(type.toString()),
+                        icon: type._icon,
+                        title: type._getTitle(context.l10n),
+                        subtitle: type._getSubtitle(context.l10n),
+                        onTap: () async {
+                          switch (type) {
+                            case CreateAccountType.createNew:
+                              await _handleCreateNewAccount(context);
+                            case CreateAccountType.recover:
+                              RegistrationCubit.of(context).recoverKeychain();
+                          }
+                        },
+                      ),);
                 })
                 .separatedBy(const SizedBox(height: 12))
                 .toList(),
diff --git a/catalyst_voices/apps/voices/lib/pages/registration/wallet_link/stage/select_wallet_panel.dart b/catalyst_voices/apps/voices/lib/pages/registration/wallet_link/stage/select_wallet_panel.dart
@@ -259,14 +259,3 @@ class _WalletsError extends StatelessWidget {
     );
   }
 }
-
-class _WalletsLoading extends StatelessWidget {
-  const _WalletsLoading();
-
-  @override
-  Widget build(BuildContext context) {
-    return const Center(
-      child: VoicesCircularProgressIndicator(),
-    );
-  }
-}
diff --git a/catalyst_voices/apps/voices/lib/pages/registration/widgets/registration_stage_navigation.dart b/catalyst_voices/apps/voices/lib/pages/registration/widgets/registration_stage_navigation.dart
@@ -31,7 +31,6 @@ class RegistrationBackNextNavigation extends StatelessWidget {
         ),
         Semantics(
           child: VoicesNextButton(
-            key: const Key('NextButton'),
             onTap: isNextEnabled
                 ? onNextTap ?? () => RegistrationCubit.of(context).nextStep()
                 : null,
diff --git a/catalyst_voices/apps/voices/lib/pages/spaces/appbar/session_action_header.dart b/catalyst_voices/apps/voices/lib/pages/spaces/appbar/session_action_header.dart
@@ -57,6 +57,7 @@ class _GetStartedButton extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Semantics(
+      identifier: 'GetStartedButton',
       child: VoicesFilledButton(
         key: const Key('GetStartedButton'),
         onTap: () async => RegistrationDialog.show(
diff --git a/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano/example/lib/sign_and_submit_tx.dart b/catalyst_voices/packages/libs/catalyst_cardano/catalyst_cardano/example/lib/sign_and_submit_tx.dart
@@ -1,5 +1,51 @@
 part of 'main.dart';
 
+TransactionBuilderConfig _buildTransactionBuilderConfig() {
+  return const TransactionBuilderConfig(
+    feeAlgo: TieredFee(
+      constant: 155381,
+      coefficient: 44,
+      refScriptByteCost: 15,
+    ),
+    maxTxSize: 16384,
+    maxValueSize: 5000,
+    coinsPerUtxoByte: Coin(4310),
+  );
+}
+
+Transaction _buildUnsignedTx({
+  required Set<TransactionUnspentOutput> utxos,
+  required ShelleyAddress changeAddress,
+}) {
+  /* cSpell:disable */
+  final preprodFaucetAddress = ShelleyAddress.fromBech32(
+    'addr_test1vzpwq95z3xyum8vqndgdd9mdnmafh3djcxnc6jemlgdmswcve6tkw',
+  );
+  /* cSpell:enable */
+
+  final txOutput = PreBabbageTransactionOutput(
+    address: preprodFaucetAddress,
+    amount: const Balance(coin: Coin(1000000)),
+  );
+
+  final txBuilder = TransactionBuilder(
+    config: _buildTransactionBuilderConfig(),
+    inputs: utxos,
+    networkId: NetworkId.testnet,
+  );
+
+  final txBody = txBuilder
+      .withOutput(txOutput)
+      .withChangeAddressIfNeeded(changeAddress)
+      .buildBody();
+
+  return Transaction(
+    body: txBody,
+    isValid: true,
+    witnessSet: const TransactionWitnessSet(),
+  );
+}
+
 Future<void> _signAndSubmitTx({
   required BuildContext context,
   required CardanoWalletApi api,
@@ -45,49 +91,3 @@ Future<void> _signAndSubmitTx({
     );
   }
 }
-
-Transaction _buildUnsignedTx({
-  required Set<TransactionUnspentOutput> utxos,
-  required ShelleyAddress changeAddress,
-}) {
-  /* cSpell:disable */
-  final preprodFaucetAddress = ShelleyAddress.fromBech32(
-    'addr_test1vzpwq95z3xyum8vqndgdd9mdnmafh3djcxnc6jemlgdmswcve6tkw',
-  );
-  /* cSpell:enable */
-
-  final txOutput = TransactionOutput(
-    address: preprodFaucetAddress,
-    amount: const Balance(coin: Coin(1000000)),
-  );
-
-  final txBuilder = TransactionBuilder(
-    config: _buildTransactionBuilderConfig(),
-    inputs: utxos,
-    networkId: NetworkId.testnet,
-  );
-
-  final txBody = txBuilder
-      .withOutput(txOutput)
-      .withChangeAddressIfNeeded(changeAddress)
-      .buildBody();
-
-  return Transaction(
-    body: txBody,
-    isValid: true,
-    witnessSet: const TransactionWitnessSet(),
-  );
-}
-
-TransactionBuilderConfig _buildTransactionBuilderConfig() {
-  return const TransactionBuilderConfig(
-    feeAlgo: TieredFee(
-      constant: 155381,
-      coefficient: 44,
-      refScriptByteCost: 15,
-    ),
-    maxTxSize: 16384,
-    maxValueSize: 5000,
-    coinsPerUtxoByte: Coin(4310),
-  );
-}
diff --git a/catalyst_voices/packages/libs/catalyst_cardano_serialization/lib/src/builders/input_builder.dart b/catalyst_voices/packages/libs/catalyst_cardano_serialization/lib/src/builders/input_builder.dart
@@ -192,7 +192,7 @@ final class InputBuilder implements CoinSelector {
   ///   - This method ensures the transaction remains valid by confirming that
   ///     the accumulated balance exceeds or equals the required amount plus
   ///     fees.
-  (List<TransactionOutput>, Coin)? _getChangeAndFee(
+  (List<ShelleyMultiAssetTransactionOutput>, Coin)? _getChangeAndFee(
     AssetId assetId,
     TransactionBuilder builder,
     Set<TransactionUnspentOutput> selectedInputs,
@@ -246,7 +246,7 @@ final class InputBuilder implements CoinSelector {
   ///     the fee remains unchanged.
   ///   - This method handles multi-asset balances and ensures they are included
   ///     in the change outputs, if applicable.
-  (List<TransactionOutput>, Coin) _buildChangeOutputs(
+  (List<ShelleyMultiAssetTransactionOutput>, Coin) _buildChangeOutputs(
     TransactionBuilder builder,
     Balance remainingBalance,
     Coin minFee,
@@ -261,7 +261,7 @@ final class InputBuilder implements CoinSelector {
         ? remainingBalance
         : Balance(coin: remainingBalance.coin);
 
-    final output = TransactionOutput(
+    final output = PreBabbageTransactionOutput(
       address: builder.changeAddress!,
       amount: normalizedBalance,
     );
@@ -275,7 +275,7 @@ final class InputBuilder implements CoinSelector {
       builder.config.coinsPerUtxoByte,
     );
 
-    final changeOutputs = <TransactionOutput>[];
+    final changeOutputs = <ShelleyMultiAssetTransactionOutput>[];
     if (normalizedBalance.coin >= minAda + changeFee) {
       changeOutputs.add(
         output.copyWith(amount: normalizedBalance - Balance(coin: changeFee)),
diff --git a/catalyst_voices/packages/libs/catalyst_cardano_serialization/lib/src/builders/transaction_builder.dart b/catalyst_voices/packages/libs/catalyst_cardano_serialization/lib/src/builders/transaction_builder.dart
diff --git a/catalyst_voices/packages/libs/catalyst_cardano_serialization/lib/src/builders/types.dart b/catalyst_voices/packages/libs/catalyst_cardano_serialization/lib/src/builders/types.dart

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`import { type Locator, type Page } from "@playwright/test";`
`2`		`-import intlEn from "./localization-util";`
`3`	`2`
`4`	`3`	`export class OnboardingBasePage {`
`5`	`4`	`page: Page;`