Merge remote-tracking branch 'origin/main' into fix/LW-9583-fix-theme…

…-provider
input-output-hk · May 6, 2024 · 9599b93 · 9599b93
2 parents aea92a2 + 3991002
commit 9599b93
Show file tree

Hide file tree

Showing 78 changed files with 982 additions and 779 deletions.
diff --git a/.github/workflows/e2e-tests-linux.yml b/.github/workflows/e2e-tests-linux.yml
@@ -34,6 +34,7 @@ env:
   NETWORK: ${{ github.event.inputs.network || 'preprod' }}
   RUN: ${{ github.run_number }}
   DISPLAY: ':99.0'
+  NODE_OPTIONS: --max-old-space-size=16384
 
 jobs:
   tests:
@@ -73,7 +74,7 @@ jobs:
           eval "$runCommand";
       - name: Create allure properties
         if: always()
-        working-directory: ./packages/e2e-tests/reports/allure/results
+        working-directory: './packages/e2e-tests/reports/allure/results'
         run: |
           echo "
           env=${NETWORK}
@@ -82,19 +83,20 @@ jobs:
           platform=Linux
           " > environment.properties
       - name: Publish allure report to S3
-        uses: andrcuns/allure-publish-action@v1.0.1
+        uses: andrcuns/allure-publish-action@v2.6.0
         if: always()
         env:
           GITHUB_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           AWS_ACCESS_KEY_ID: ${{ secrets.E2E_AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.E2E_AWS_SECRET_ACCESS_KEY }}
         with:
           storageType: s3
-          resultsGlob: './packages/e2e-tests/reports/allure/results/*'
+          resultsGlob: './packages/e2e-tests/reports/allure/results'
           bucket: lace-e2e-test-results
           prefix: 'all/linux/${BROWSER}/${RUN}'
           copyLatest: true
           ignoreMissingResults: true
+          baseUrl: 'https://${{ secrets.E2E_REPORTS_USER }}:${{ secrets.E2E_REPORTS_PASSWORD }}@${{ secrets.E2E_REPORTS_URL }}'
       - name: Publish artifacts (logs, reports, screenshots)
         uses: actions/upload-artifact@v4
         if: always()

diff --git a/.github/workflows/e2e-tests-win.yml b/.github/workflows/e2e-tests-win.yml
@@ -154,19 +154,20 @@ jobs:
           name: test-artifacts
           path: ./packages/e2e-tests
       - name: Publish allure report to S3
-        uses: andrcuns/allure-publish-action@v1.0.1
+        uses: andrcuns/allure-publish-action@v2.6.0
         if: always()
         env:
           GITHUB_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           AWS_ACCESS_KEY_ID: ${{ secrets.E2E_AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.E2E_AWS_SECRET_ACCESS_KEY }}
         with:
           storageType: s3
-          resultsGlob: './packages/e2e-tests/reports/allure/results/*'
+          resultsGlob: './packages/e2e-tests/reports/allure/results'
           bucket: lace-e2e-test-results
           prefix: 'all/windows/${BROWSER}/${RUN}'
           copyLatest: true
           ignoreMissingResults: true
+          baseUrl: 'https://${{ secrets.E2E_REPORTS_USER }}:${{ secrets.E2E_REPORTS_PASSWORD }}@${{ secrets.E2E_REPORTS_URL }}'
       - name: Add link to summary
         if: always()
         run: |

diff --git a/.github/workflows/smoke-tests.yml b/.github/workflows/smoke-tests.yml
@@ -57,7 +57,7 @@ jobs:
           platform=Linux
           " > environment.properties
       - name: Publish allure report to S3
-        uses: andrcuns/allure-publish-action@v2.4.0
+        uses: andrcuns/allure-publish-action@v2.6.0
         if: always()
         env:
           GITHUB_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

diff --git a/apps/browser-extension-wallet/package.json b/apps/browser-extension-wallet/package.json
@@ -39,14 +39,14 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@cardano-sdk/cardano-services-client": "0.19.1",
-    "@cardano-sdk/core": "0.30.1",
-    "@cardano-sdk/dapp-connector": "0.12.15",
-    "@cardano-sdk/input-selection": "0.12.28",
-    "@cardano-sdk/tx-construction": "0.18.4",
+    "@cardano-sdk/cardano-services-client": "0.19.2",
+    "@cardano-sdk/core": "0.30.2",
+    "@cardano-sdk/dapp-connector": "0.12.16",
+    "@cardano-sdk/input-selection": "0.12.29",
+    "@cardano-sdk/tx-construction": "0.18.5",
     "@cardano-sdk/util": "0.15.1",
-    "@cardano-sdk/wallet": "0.37.2",
-    "@cardano-sdk/web-extension": "0.27.2",
+    "@cardano-sdk/wallet": "0.37.3",
+    "@cardano-sdk/web-extension": "0.27.3",
     "@emurgo/cip14-js": "~3.0.1",
     "@koralabs/handles-public-api-interfaces": "^1.6.6",
     "@lace/cardano": "0.1.0",

diff --git a/apps/browser-extension-wallet/src/assets/icons/paste.component.svg b/apps/browser-extension-wallet/src/assets/icons/paste.component.svg
diff --git a/apps/browser-extension-wallet/src/hooks/useEnterKeyPress.ts b/apps/browser-extension-wallet/src/hooks/useEnterKeyPress.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-lonely-if */
 /* eslint-disable sonarjs/no-duplicate-string */
 import { walletRoutePaths } from '@routes/wallet-paths';
 import { useEffect } from 'react';

diff --git a/apps/browser-extension-wallet/src/providers/AnalyticsProvider/analyticsTracker/events.ts b/apps/browser-extension-wallet/src/providers/AnalyticsProvider/analyticsTracker/events.ts
@@ -16,14 +16,18 @@ export const postHogOnboardingActions: PostHogOnboardingActionsType = {
     RECOVERY_PHRASE_INTRO_WATCH_VIDEO_CLICK: PostHogAction.OnboardingCreateSaveRecoveryPhraseIntroPlayVideoClick,
     RECOVERY_PHRASE_INTRO_VIDEO_GOTIT_CLICK: PostHogAction.OnboardingCreateKeepWalletSecureGotItClick,
     RECOVERY_PHRASE_COPY_TO_CLIPBOARD_CLICK: PostHogAction.OnboardingCreateSaveRecoveryPhraseCopyToClipboardClick,
-    RECOVERY_PHRASE_PASTE_FROM_CLIPBOARD_CLICK: PostHogAction.OnboardingCreateEnterRecoveryPhrasePasteFromClipboardClick
+    RECOVERY_PHRASE_PASTE_FROM_CLIPBOARD_CLICK:
+      PostHogAction.OnboardingCreateEnterRecoveryPhrasePasteFromClipboardClick,
+    RECOVERY_PHRASE_COPY_READ_MORE_CLICK: PostHogAction.OnboardingCreateSaveRecoveryPhraseCopyReadMoreClick,
+    RECOVERY_PHRASE_PASTE_READ_MORE_CLICK: PostHogAction.OnboardingCreateEnterRecoveryPhrasePasteReadMoreClick
   },
   restore: {
     SETUP_OPTION_CLICK: PostHogAction.OnboardingRestoreClick,
     ENTER_WALLET: PostHogAction.OnboardingRestoreEnterWalletClick,
     ENTER_RECOVERY_PHRASE_NEXT_CLICK: PostHogAction.OnboardingRestoreEnterRecoveryPhraseNextClick,
     RECOVERY_PHRASE_PASTE_FROM_CLIPBOARD_CLICK:
-      PostHogAction.OnboardingRestoreEnterRecoveryPhrasePasteFromClipboardClick
+      PostHogAction.OnboardingRestoreEnterRecoveryPhrasePasteFromClipboardClick,
+    RECOVERY_PHRASE_PASTE_READ_MORE_CLICK: PostHogAction.OnboardingRestoreEnterRecoveryPhrasePasteReadMoreClick
   },
   hw: {
     SETUP_OPTION_CLICK: PostHogAction.OnboardingHWClick,

diff --git a/apps/browser-extension-wallet/src/providers/AnalyticsProvider/analyticsTracker/types.ts b/apps/browser-extension-wallet/src/providers/AnalyticsProvider/analyticsTracker/types.ts
@@ -58,7 +58,9 @@ export type PostHogActionsKeys =
   | 'RECOVERY_PHRASE_INTRO_VIDEO_GOTIT_CLICK'
   | 'RECOVERY_PHRASE_COPY_TO_CLIPBOARD_CLICK'
   | 'RECOVERY_PHRASE_PASTE_FROM_CLIPBOARD_CLICK'
-  | 'RECOVERY_PASSPHRASE_VERIFICATION_NEXT_CLICK';
+  | 'RECOVERY_PASSPHRASE_VERIFICATION_NEXT_CLICK'
+  | 'RECOVERY_PHRASE_COPY_READ_MORE_CLICK'
+  | 'RECOVERY_PHRASE_PASTE_READ_MORE_CLICK';
 export type PostHogOnboardingActionsValueType = Partial<Record<PostHogActionsKeys, PostHogAction>>;
 export type PostHogOnboardingActionsType = Partial<Record<OnboardingFlows, PostHogOnboardingActionsValueType>>;
 export type PostHogPersonProperties = {

diff --git a/.../browser-extension-wallet/src/views/browser-view/components/WarningModal/WarningModal.tsx b/.../browser-extension-wallet/src/views/browser-view/components/WarningModal/WarningModal.tsx
@@ -15,6 +15,7 @@ interface WarningModalProps {
   confirmLabel?: React.ReactNode;
   confirmCustomClassName?: string;
   dataTestId?: string;
+  destroyOnClose?: boolean;
 }
 
 const modalWidth = 480;
@@ -30,7 +31,8 @@ export const WarningModal = ({
   confirmLabel,
   confirmCustomClassName,
   isPopupView,
-  dataTestId
+  dataTestId,
+  destroyOnClose = false
 }: WarningModalProps): React.ReactElement => {
   const { t: translate } = useTranslation();
 
@@ -48,6 +50,7 @@ export const WarningModal = ({
       open={visible}
       width={isPopupView ? '100%' : modalWidth}
       data-testid={dataTestId}
+      destroyOnClose={destroyOnClose}
     >
       <div data-testid="delete-address-modal-title" className={styles.header}>
         {header}

diff --git a/...r-extension-wallet/src/views/browser-view/features/activity/components/ActivityDetail.tsx b/...r-extension-wallet/src/views/browser-view/features/activity/components/ActivityDetail.tsx
@@ -3,16 +3,16 @@ import uniq from 'lodash/uniq';
 import flatMap from 'lodash/flatMap';
 import { Skeleton } from 'antd';
 import { Wallet } from '@lace/cardano';
+import type { ActivityType } from '@lace/core';
 import {
-  AssetActivityListProps,
   ActivityStatus,
-  TxOutputInput,
-  TxSummary,
+  AssetActivityListProps,
+  DelegationActivityType,
   RewardsDetails,
   TransactionActivityType,
-  DelegationActivityType
+  TxOutputInput,
+  TxSummary
 } from '@lace/core';
-import type { ActivityType } from '@lace/core';
 import { PriceResult } from '@hooks';
 import { useWalletStore } from '@stores';
 import { ActivityDetail as ActivityDetailType } from '@src/types';
@@ -54,7 +54,8 @@ export const getTransactionData = ({
     return outputData.map((output) => ({
       ...output,
       // Show up to 5 addresses below multiple addresses (see LW-4040)
-      addr: addrs.slice(0, MAX_SUMMARY_ADDRESSES)
+      addr: addrs.slice(0, MAX_SUMMARY_ADDRESSES),
+      type: TransactionActivityType.incoming
     }));
   }
 
@@ -63,7 +64,8 @@ export const getTransactionData = ({
     .filter((output) => !walletAddresses.includes(output.addr))
     .map((output) => ({
       ...output,
-      ...(!Array.isArray(output.addr) && { addr: [output.addr] })
+      ...(!Array.isArray(output.addr) && { addr: [output.addr] }),
+      type: TransactionActivityType.outgoing
     }));
 };
 

diff --git a/...-wallet/src/views/browser-view/features/multi-address/MultiAddressBalanceVisibleModal.tsx b/...-wallet/src/views/browser-view/features/multi-address/MultiAddressBalanceVisibleModal.tsx
@@ -27,6 +27,7 @@ export const MultiAddressBalanceVisibleModal = (): ReactElement => {
       visible={showMultiAddressModal}
       confirmLabel={t('browserView.multiAddressWallet.modal.confirm')}
       onConfirm={handleCloseModal}
+      destroyOnClose
     />
   );
 };
diff --git a/...et/src/views/browser-view/features/send-transaction/components/SendTransactionSummary.tsx b/...et/src/views/browser-view/features/send-transaction/components/SendTransactionSummary.tsx
@@ -17,6 +17,8 @@ import { getTokenAmountInFiat, parseFiat } from '@src/utils/assets-transformers'
 import { useObservable, Banner } from '@lace/common';
 import ExclamationIcon from '../../../../../assets/icons/exclamation-triangle-red.component.svg';
 import { WalletType } from '@cardano-sdk/web-extension';
+import { getAllWalletsAddresses } from '@src/utils/get-all-wallets-addresses';
+import { walletRepository } from '@lib/wallet-api-ui';
 
 const { Text } = Typography;
 
@@ -98,7 +100,7 @@ interface SendTransactionSummaryProps {
 export const SendTransactionSummary = withAddressBookContext(
   ({ isPopupView = false }: SendTransactionSummaryProps): React.ReactElement => {
     const { t } = useTranslation();
-    const { builtTxData: { uiTx: { fee, outputs } = {} } = {} } = useBuiltTxState();
+    const { builtTxData: { uiTx: { fee, outputs, handleResolutions } = {} } = {} } = useBuiltTxState();
     const [metadata] = useMetadata();
     const {
       inMemoryWallet,
@@ -128,24 +130,32 @@ export const SendTransactionSummary = withAddressBookContext(
       [addressList]
     );
 
-    const rows = [...(outputs?.values() ?? [])].map((item) => ({
-      list: formatRow({ output: item, assetInfo: assetsInfo, cardanoCoin, fiatCurrency, prices: priceResult }),
-      recipientAddress: item.address,
-      recipientName:
-        addressToNameMap?.get(item.handleResolution?.handle || item.address) || item.handleResolution?.handle
-    }));
+    const rows = [...(outputs?.values() ?? [])].map<OutputSummaryProps>((item) => {
+      const handle =
+        item.handleResolution?.handle ||
+        handleResolutions.find(({ cardanoAddress }) => cardanoAddress === item.address)?.handle;
+      return {
+        list: formatRow({ output: item, assetInfo: assetsInfo, cardanoCoin, fiatCurrency, prices: priceResult }),
+        recipientAddress: item.address,
+        recipientName: addressToNameMap?.get(handle || item.address) || handle
+      };
+    });
+
+    const ownAddresses = useObservable(inMemoryWallet.addresses$)?.map((a) => a.address);
+    const allWalletsAddresses = getAllWalletsAddresses(useObservable(walletRepository.wallets$));
 
     // Where do we get the deposit field? LW-1363
     return (
       <>
         <OutputSummaryList
-          rows={rows as OutputSummaryProps[]}
+          rows={rows}
           txFee={{
             ...getFee(fee?.toString(), priceResult?.cardano?.price, cardanoCoin, fiatCurrency),
             tootipText: t('send.theAmountYoullBeChargedToProcessYourTransaction')
           }}
           metadata={metadata}
           translations={outputSummaryListTranslation}
+          ownAddresses={allWalletsAddresses.length > 0 ? allWalletsAddresses : ownAddresses}
         />
         {isHardwareWallet && !isPopupView && (
           <Text className={styles.connectLedgerText}>