Merge branch 'main' into test/maintenance-21-Feb-2025

input-output-hk · Feb 24, 2025 · 155fb8d · 155fb8d
2 parents 2433924 + 9984e61
commit 155fb8d
Show file tree

Hide file tree

Showing 21 changed files with 248 additions and 193 deletions.
diff --git a/apps/browser-extension-wallet/package.json b/apps/browser-extension-wallet/package.json
@@ -41,15 +41,15 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@cardano-sdk/cardano-services-client": "0.26.4",
-    "@cardano-sdk/core": "0.45.2",
-    "@cardano-sdk/dapp-connector": "0.13.5",
-    "@cardano-sdk/input-selection": "0.14.3",
-    "@cardano-sdk/tx-construction": "0.26.2",
+    "@cardano-sdk/cardano-services-client": "0.26.5",
+    "@cardano-sdk/core": "0.45.3",
+    "@cardano-sdk/dapp-connector": "0.13.6",
+    "@cardano-sdk/input-selection": "0.14.4",
+    "@cardano-sdk/tx-construction": "0.26.3",
     "@cardano-sdk/util": "0.15.7",
-    "@cardano-sdk/util-rxjs": "0.9.6",
-    "@cardano-sdk/wallet": "0.51.12",
-    "@cardano-sdk/web-extension": "0.38.15",
+    "@cardano-sdk/util-rxjs": "0.9.7",
+    "@cardano-sdk/wallet": "0.51.13",
+    "@cardano-sdk/web-extension": "0.38.16",
     "@emurgo/cip14-js": "~3.0.1",
     "@input-output-hk/lace-ui-toolkit": "3.2.1",
     "@lace/cardano": "0.1.0",
@@ -104,7 +104,7 @@
     "zustand": "3.5.14"
   },
   "devDependencies": {
-    "@cardano-sdk/hardware-ledger": "0.15.3",
+    "@cardano-sdk/hardware-ledger": "0.15.4",
     "@emurgo/cardano-message-signing-asmjs": "1.0.1",
     "@openpgp/web-stream-tools": "0.0.11-patch-0",
     "@pdfme/common": "^4.0.2",

diff --git a/apps/browser-extension-wallet/src/stores/slices/wallet-activities-slice.ts b/apps/browser-extension-wallet/src/stores/slices/wallet-activities-slice.ts
@@ -418,7 +418,8 @@ export const mapWalletActivities = memoize(
     { cardanoCoin, assetDetails, isSharedWallet }
   ) =>
     `${transactions.history.map(({ id }) => id).join('')}_${transactions.outgoing.inFlight
-      .map(({ id }) => id)
+      // eslint-disable-next-line sonarjs/no-nested-template-literals
+      .map(({ id, submittedAt }) => `${id}_${submittedAt}`)
       .join('')}_${transactions.outgoing.signed?.map(({ tx: { id } }) => id).join('')}_${assetInfo.size}_${
       rewardsHistory.all.length
     }_${cardanoFiatPrice}_${fiatCurrency.code}_${cardanoCoin?.id}_${assetDetails?.id}_${

diff --git a/packages/cardano/package.json b/packages/cardano/package.json
@@ -40,16 +40,16 @@
     "watch": "yarn build --watch"
   },
   "dependencies": {
-    "@cardano-sdk/cardano-services-client": "0.26.4",
-    "@cardano-sdk/core": "0.45.2",
+    "@cardano-sdk/cardano-services-client": "0.26.5",
+    "@cardano-sdk/core": "0.45.3",
     "@cardano-sdk/crypto": "0.2.2",
-    "@cardano-sdk/hardware-ledger": "0.15.3",
-    "@cardano-sdk/hardware-trezor": "0.7.2",
-    "@cardano-sdk/key-management": "0.27.2",
-    "@cardano-sdk/tx-construction": "0.26.2",
+    "@cardano-sdk/hardware-ledger": "0.15.4",
+    "@cardano-sdk/hardware-trezor": "0.7.3",
+    "@cardano-sdk/key-management": "0.27.3",
+    "@cardano-sdk/tx-construction": "0.26.3",
     "@cardano-sdk/util": "0.15.7",
-    "@cardano-sdk/wallet": "0.51.12",
-    "@cardano-sdk/web-extension": "0.38.15",
+    "@cardano-sdk/wallet": "0.51.13",
+    "@cardano-sdk/web-extension": "0.38.16",
     "@lace/common": "0.1.0",
     "@ledgerhq/devices": "^8.4.4",
     "@stablelib/chacha20poly1305": "1.0.1",
@@ -73,7 +73,7 @@
   },
   "devDependencies": {
     "@blockfrost/blockfrost-js": "^5.5.0",
-    "@cardano-sdk/util-dev": "0.25.6",
+    "@cardano-sdk/util-dev": "0.25.7",
     "@emurgo/cardano-message-signing-browser": "1.0.1",
     "@types/webextension-polyfill": "0.10.0",
     "axios": "^1.7.4",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -43,8 +43,8 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@cardano-sdk/wallet": "0.51.12",
-    "@cardano-sdk/web-extension": "0.38.15",
+    "@cardano-sdk/wallet": "0.51.13",
+    "@cardano-sdk/web-extension": "0.38.16",
     "@input-output-hk/lace-ui-toolkit": "1.19.0",
     "@lace/cardano": "0.1.0",
     "@lace/common": "0.1.0",

diff --git a/packages/e2e-tests/src/assert/consoleAssert.ts b/packages/e2e-tests/src/assert/consoleAssert.ts
@@ -7,5 +7,15 @@ class ConsoleAssert {
     const errors: ConsoleLogEntry[] = logs.filter((log) => log.level === 'error');
     expect(errors).is.empty;
   };
+
+  assertLogsAreCollected = async (shouldBeCollected: boolean) => {
+    await browser.pause(1000); // some delay to let logs populate
+    const logs: ConsoleLogEntry[] = await consoleManager.getLogs();
+    if (shouldBeCollected) {
+      expect(logs.length).to.be.greaterThan(10);
+    } else {
+      expect(logs).is.empty;
+    }
+  };
 }
 export default new ConsoleAssert();
diff --git a/packages/e2e-tests/src/assert/settings/SettingsPageAssert.ts b/packages/e2e-tests/src/assert/settings/SettingsPageAssert.ts
@@ -41,9 +41,11 @@ class SettingsPageAssert {
     expect(await SettingsPage.showRecoveryPhraseLink.getTitleText()).to.equal(
       await t('browserView.settings.security.showPassphrase.title')
     );
-    expect(await SettingsPage.generatePaperWallet.getTitleText()).to.equal(
-      await t('browserView.settings.generatePaperWallet.title')
-    );
+    if (!popupView) {
+      expect(await SettingsPage.generatePaperWallet.getTitleText()).to.equal(
+        await t('browserView.settings.generatePaperWallet.title')
+      );
+    }
     // TODO: temporarily disabled due to LW-2907
     // expect(await SettingsPage.passphraseVerificationLink.getTitleText()).to.equal(
     //   await t('browserView.settings.security.passphrasePeriodicVerification.title')
@@ -101,9 +103,11 @@ class SettingsPageAssert {
     expect(await SettingsPage.showRecoveryPhraseLink.getDescriptionText()).to.equal(
       await t('browserView.settings.security.showPassphrase.description')
     );
-    expect(await SettingsPage.generatePaperWallet.getDescriptionText()).to.equal(
-      await t('browserView.settings.generatePaperWallet.description')
-    );
+    if (!popupView) {
+      expect(await SettingsPage.generatePaperWallet.getDescriptionText()).to.equal(
+        await t('browserView.settings.generatePaperWallet.description')
+      );
+    }
     // TODO: temporarily disabled due to LW-2907
     // expect(await SettingsPage.passphraseVerificationLink.getDescriptionText()).to.equal(
     //   await t('browserView.settings.security.passphrasePeriodicVerification.description')

diff --git a/packages/e2e-tests/src/features/ForgotPassword.feature b/packages/e2e-tests/src/features/ForgotPassword.feature
@@ -121,4 +121,4 @@ Feature: Forgot password
     Then header menu displays "TestAutomationWallet" as a wallet name
     When I close header menu
     And I navigate to Settings extended page
-    Then Analytics toggle is enabled: false
+    Then Analytics toggle is not enabled
diff --git a/packages/e2e-tests/src/features/OnboardingCreateWallet.part2.feature b/packages/e2e-tests/src/features/OnboardingCreateWallet.part2.feature
@@ -45,7 +45,7 @@ Feature: Onboarding - Create wallet
     And I see LW homepage
     And "N_8J@bne87A" password is not in snapshot
     And I open settings from header menu
-    Then Analytics toggle is enabled: true
+    Then Analytics toggle is enabled
     When I open settings from header menu
     And I click on Remove wallet button
     And I click "Remove wallet" button on "Remove wallet" modal
@@ -57,7 +57,7 @@ Feature: Onboarding - Create wallet
     When I click "Enter wallet" button
     And I see LW homepage
     And I open settings from header menu
-    Then Analytics toggle is enabled: false
+    Then Analytics toggle is not enabled
 
   @LW-2627
   Scenario: Create Wallet - autofill words

diff --git a/packages/e2e-tests/src/features/OnboardingRestoreWallet.part1.feature b/packages/e2e-tests/src/features/OnboardingRestoreWallet.part1.feature
@@ -68,7 +68,7 @@ Feature: Onboarding - Restore wallet
     Then I see LW homepage
     When I confirm multi-address discovery modal
     And I open settings from header menu
-    Then Analytics toggle is enabled: true
+    Then Analytics toggle is enabled
     When I open settings from header menu
     And I click on Remove wallet button
     And I click "Remove wallet" button on "Remove wallet" modal
@@ -79,7 +79,7 @@ Feature: Onboarding - Restore wallet
     Then I see LW homepage
     When I confirm multi-address discovery modal
     And I open settings from header menu
-    Then Analytics toggle is enabled: false
+    Then Analytics toggle is not enabled
 
   @LW-2628
   Scenario: Restore Wallet - autofill words

diff --git a/packages/e2e-tests/src/features/SettingsPageExtended.part2.feature b/packages/e2e-tests/src/features/SettingsPageExtended.part2.feature
@@ -17,7 +17,7 @@ Feature: General Settings - Extended Browser View
     And I click on "FAQs" setting
     Then FAQ page is displayed
 
-  @LW-3058 @Mainnet @Testnet
+  @LW-3058 @LW-12253 @Mainnet @Testnet
   Scenario Outline: Extended view - Settings - <option_name> option displayed
     When I open settings from header menu
     Then I see <option_name> option with proper description and toggle
@@ -209,6 +209,18 @@ Feature: General Settings - Extended Browser View
     When I close "Custom submit API" drawer
     Then "Custom submit API" is marked as disabled on Settings page
 
+  @LW-12255 @Mainnet @Testnet
+  Scenario Outline: Extended view - Settings - Debugging option enables verbose logging in console
+    Given I enable console logs collection
+    When I open settings from header menu
+    And Debugging toggle <debugging_enabled> enabled
+    And I navigate to NFTs extended page
+    Then I verify that logs <logs_collected> collected
+    Examples:
+      | debugging_enabled | logs_collected |
+      | is not            | are not        |
+      | is                | are            |
+
   # this test should be executed as the last one in this suite
   @LW-2521 @LW-9113 @Mainnet @Testnet
   Scenario: Extended View - Remove wallet and confirm

diff --git a/packages/e2e-tests/src/features/SettingsPagePopup.part2.feature b/packages/e2e-tests/src/features/SettingsPagePopup.part2.feature
@@ -104,7 +104,7 @@ Feature: General Settings - Popup View
     Then Side drawer "Show 24-word passphrase" is displayed
     And Password field is empty
 
-  @LW-3061 @Mainnet @Testnet
+  @LW-3061 @LW-12252 @Mainnet @Testnet
   Scenario Outline: Popup view - Settings -  <option_name> option displayed
     When I open settings from header menu
     Then I see <option_name> option with proper description and toggle
@@ -151,6 +151,18 @@ Feature: General Settings - Popup View
     When I close "Custom submit API" drawer
     Then "Custom submit API" is marked as disabled on Settings page
 
+  @LW-12254 @Mainnet @Testnet
+  Scenario Outline: Popup view - Settings - Debugging option enables verbose logging in console
+    Given I enable console logs collection
+    When I open settings from header menu
+    And Debugging toggle <debugging_enabled> enabled
+    And I navigate to NFTs popup page
+    Then I verify that logs <logs_collected> collected
+    Examples:
+      | debugging_enabled | logs_collected |
+      | is not            | are not        |
+      | is                | are            |
+
     # this test should be executed as the last one in this suite
   @LW-2708 @Mainnet @Testnet
   Scenario: Popup View - Remove wallet and confirm

diff --git a/packages/e2e-tests/src/features/analytics/AnalyticsSettingsExtended.feature b/packages/e2e-tests/src/features/analytics/AnalyticsSettingsExtended.feature
@@ -148,11 +148,11 @@ Feature: Analytics - Settings - Extended View
   Scenario: Analytics - Extended View - Settings - Analytics
     When I open settings from header menu
     And I set up request interception for posthog analytics request(s)
-    And Analytics toggle is enabled: true
-    And Analytics toggle is enabled: false
+    And Analytics toggle is enabled
+    And Analytics toggle is not enabled
     Then I validate latest analytics single event "settings | analytics | skip | click"
     Then I validate that 1 analytics event(s) have been sent
-    And Analytics toggle is enabled: true
+    And Analytics toggle is enabled
 
   @LW-8790
   Scenario: Analytics - Extended View - Settings - Theme switch

diff --git a/packages/e2e-tests/src/features/analytics/AnalyticsSettingsPopup.feature b/packages/e2e-tests/src/features/analytics/AnalyticsSettingsPopup.feature
@@ -163,11 +163,11 @@ Feature: Analytics - Settings - Popup View
     Given I am on Tokens popup page
     When I open settings from header menu
     And I set up request interception for posthog analytics request(s)
-    And Analytics toggle is enabled: true
-    And Analytics toggle is enabled: false
+    And Analytics toggle is enabled
+    And Analytics toggle is not enabled
     Then I validate latest analytics single event "settings | analytics | skip | click"
     Then I validate that 1 analytics event(s) have been sent
-    And Analytics toggle is enabled: true
+    And Analytics toggle is enabled
 
   @LW-8786
   Scenario: Analytics - Popup View - Settings - Theme switch

diff --git a/packages/e2e-tests/src/features/analytics/AnalyticsToggleSettingsExtended.feature b/packages/e2e-tests/src/features/analytics/AnalyticsToggleSettingsExtended.feature
@@ -7,11 +7,11 @@ Feature: Analytics - Settings Toggle - Extended View
   @LW-8312
   Scenario Outline: Analytics - Extended view - Settings - Analytics option enabled: <is_enabled> and Posthog events sent
     When I open settings from header menu
-    And Analytics toggle is enabled: <toggle_enabled>
+    And Analytics toggle <toggle_enabled> enabled
     Given I set up request interception for posthog analytics request(s)
     And I am on NFTs extended page
     And I validate that <number_of_events> analytics event(s) have been sent
     Examples:
       | toggle_enabled | number_of_events |
-      | true           | 1                |
-      | false          | 0                |
+      | is             | 1                |
+      | is not         | 0                |
diff --git a/packages/e2e-tests/src/features/analytics/AnalyticsToggleSettingsPopup.feature b/packages/e2e-tests/src/features/analytics/AnalyticsToggleSettingsPopup.feature
@@ -7,11 +7,11 @@ Feature: Analytics - Settings Toggle - Popup View
   @LW-8314
   Scenario Outline: Analytics - Popup view - Settings - Analytics option enabled: <is_enabled> and Posthog events sent
     When I open settings from header menu
-    And Analytics toggle is enabled: <toggle_enabled>
+    And Analytics toggle <toggle_enabled> enabled
     Given I set up request interception for posthog analytics request(s)
     And I am on NFTs popup page
     And I validate that <number_of_events> analytics event(s) have been sent
     Examples:
       | toggle_enabled | number_of_events |
-      | true           | 1                |
-      | false          | 0                |
+      | is             | 1                |
+      | is not         | 0                |
diff --git a/packages/e2e-tests/src/pageobject/settingsExtendedPageObject.ts b/packages/e2e-tests/src/pageobject/settingsExtendedPageObject.ts
@@ -11,6 +11,8 @@ import { expect } from 'chai';
 import MainLoader from '../elements/MainLoader';
 import MenuHeader from '../elements/menuHeader';
 
+const toggleEnabledAttribute = 'aria-checked';
+
 class SettingsExtendedPageObject {
   clickOnAbout = async () => {
     await SettingsPage.aboutLink.element.click();
@@ -75,11 +77,16 @@ class SettingsExtendedPageObject {
     }
   };
 
-  toggleAnalytics = async (isEnabled: 'true' | 'false') => {
-    (await SettingsPage.analyticsSwitch.getAttribute('aria-checked')) !== isEnabled &&
+  toggleAnalytics = async (isEnabled: boolean) => {
+    (await SettingsPage.analyticsSwitch.getAttribute(toggleEnabledAttribute)) !== String(isEnabled) &&
       (await SettingsPage.analyticsSwitch.click());
   };
 
+  toggleDebugging = async (isEnabled: boolean) => {
+    (await SettingsPage.debuggingSwitch.getAttribute(toggleEnabledAttribute)) !== String(isEnabled) &&
+      (await SettingsPage.debuggingSwitch.click());
+  };
+
   // eslint-disable-next-line complexity
   clickSettingsItem = async (elementName: string): Promise<void> => {
     await browser.pause(500);

diff --git a/packages/e2e-tests/src/steps/commonSteps.ts b/packages/e2e-tests/src/steps/commonSteps.ts
@@ -379,6 +379,10 @@ Then(/^I verify there are no errors in console logs$/, async () => {
   await consoleAssert.assertNoErrorsInConsole();
 });
 
+Then(/^I verify that logs (are|are not) collected$/, async (logsCollected: 'are' | 'are not') => {
+  await consoleAssert.assertLogsAreCollected(logsCollected === 'are');
+});
+
 Then(/^I wait (\d*) milliseconds$/, async (delay: 1000) => {
   await browser.pause(delay);
 });

diff --git a/packages/e2e-tests/src/steps/settingsSteps.ts b/packages/e2e-tests/src/steps/settingsSteps.ts
@@ -201,9 +201,14 @@ Then(
   }
 );
 
-When(/Analytics toggle is enabled: (true|false)/, async (isEnabled: 'true' | 'false') => {
-  await settingsExtendedPageObject.toggleAnalytics(isEnabled);
-});
+When(
+  /^(Analytics|Debugging) toggle (is|is not) enabled$/,
+  async (option: 'Analytics' | 'Debugging', isEnabled: 'is' | 'is not') => {
+    option === 'Analytics'
+      ? await settingsExtendedPageObject.toggleAnalytics(isEnabled === 'is')
+      : await settingsExtendedPageObject.toggleDebugging(isEnabled === 'is');
+  }
+);
 
 Then(/^Side drawer "Show 24-word passphrase" is displayed$/, async () => {
   await passphraseDrawerAssert.assertSeeDrawerTitle(

diff --git a/packages/nami/package.json b/packages/nami/package.json
@@ -57,11 +57,11 @@
   },
   "dependencies": {
     "@biglup/is-cid": "^1.0.3",
-    "@cardano-sdk/core": "0.45.2",
+    "@cardano-sdk/core": "0.45.3",
     "@cardano-sdk/crypto": "0.2.2",
-    "@cardano-sdk/tx-construction": "0.26.2",
+    "@cardano-sdk/tx-construction": "0.26.3",
     "@cardano-sdk/util": "0.15.7",
-    "@cardano-sdk/web-extension": "0.38.15",
+    "@cardano-sdk/web-extension": "0.38.16",
     "@chakra-ui/css-reset": "1.0.0",
     "@chakra-ui/icons": "1.0.13",
     "@chakra-ui/react": "1.6.4",

diff --git a/packages/staking/package.json b/packages/staking/package.json
@@ -76,12 +76,12 @@
   },
   "devDependencies": {
     "@babel/core": "^7.21.0",
-    "@cardano-sdk/core": "0.45.2",
-    "@cardano-sdk/input-selection": "0.14.3",
-    "@cardano-sdk/tx-construction": "0.26.2",
+    "@cardano-sdk/core": "0.45.3",
+    "@cardano-sdk/input-selection": "0.14.4",
+    "@cardano-sdk/tx-construction": "0.26.3",
     "@cardano-sdk/util": "0.15.7",
-    "@cardano-sdk/wallet": "0.51.12",
-    "@cardano-sdk/web-extension": "0.38.15",
+    "@cardano-sdk/wallet": "0.51.13",
+    "@cardano-sdk/web-extension": "0.38.16",
     "@storybook/addon-actions": "^7.6.7",
     "@storybook/addon-essentials": "^7.6.7",
     "@storybook/addon-interactions": "^7.6.7",
@@ -127,11 +127,11 @@
     "wait-on": "^7.0.1"
   },
   "peerDependencies": {
-    "@cardano-sdk/input-selection": "0.14.3",
-    "@cardano-sdk/tx-construction": "0.26.2",
+    "@cardano-sdk/input-selection": "0.14.4",
+    "@cardano-sdk/tx-construction": "0.26.3",
     "@cardano-sdk/util": "0.15.7",
-    "@cardano-sdk/wallet": "0.51.12",
-    "@cardano-sdk/web-extension": "0.38.15",
+    "@cardano-sdk/wallet": "0.51.13",
+    "@cardano-sdk/web-extension": "0.38.16",
     "@lace/cardano": "^0.1.0",
     "@lace/common": "^0.1.0",
     "@lace/core": "0.1.0",