Merge remote-tracking branch 'origin/main' into feat/LW-10194-unify-m…

…ultiwallet-and-onboarding-codebases
input-output-hk · May 14, 2024 · 786b901 · 786b901
2 parents 0e565eb + d2438f8
commit 786b901
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 13 deletions.
diff --git a/packages/common/src/ui/lib/add-ellipsis.ts b/packages/common/src/ui/lib/add-ellipsis.ts
@@ -8,11 +8,11 @@ export const truncate = (text: string, partOneLength: number, partTwoLength: num
   return `${text.slice(0, partOneLength)}${text.slice(text.length - partTwoLength)}`;
 };
 
-export const addEllipsis = (text: string, partOnelength: number, partTwoLength: number): string => {
-  const textMinLenght = partOnelength + partTwoLength + addedLength;
-  if (text.length <= textMinLenght) return text;
+export const addEllipsis = (text: string, partOneLength: number, partTwoLength: number): string => {
+  const textMinLength = partOneLength + partTwoLength + addedLength;
+  if (text.length <= textMinLength) return text;
 
-  return `${text.slice(0, partOnelength)}...${text.slice(text.length - partTwoLength)}`;
+  return `${text.slice(0, partOneLength)}...${text.slice(text.length - partTwoLength)}`;
 };
 
 const getCssStyle = (element: HTMLElement, prop: string) => window.getComputedStyle(element).getPropertyValue(prop);

diff --git a/packages/core/src/ui/components/Nft/NftDetail.tsx b/packages/core/src/ui/components/Nft/NftDetail.tsx
@@ -1,4 +1,4 @@
-import { InlineInfoList, LabeledInfo } from '@lace/common';
+import { Ellipsis, InlineInfoList, LabeledInfo } from '@lace/common';
 import React, { ReactNode } from 'react';
 import styles from './NftDetail.module.scss';
 import { NftImage } from './NftImage';
@@ -74,13 +74,17 @@ export const NftDetail = ({
                     <FolderOutlined />
                     <span>Root</span>
                   </Breadcrumb.Item>
-                  {folder && <Breadcrumb.Item>{folder}</Breadcrumb.Item>}
+                  {folder && (
+                    <Breadcrumb.Item>
+                      <Ellipsis text={folder} beforeEllipsis={5} afterEllipsis={5} />
+                    </Breadcrumb.Item>
+                  )}
                 </Breadcrumb>
               ) : (
                 <Flex justifyContent="space-between" gap="$1">
                   <Box>Root</Box>
                   {folder && <Box px="$8">{'>'}</Box>}
-                  {folder && <Box>{folder}</Box>}
+                  {folder && <Ellipsis text={folder} beforeEllipsis={5} afterEllipsis={5} />}
                 </Flex>
               )
             }

diff --git a/packages/core/src/ui/lib/translations/en.json b/packages/core/src/ui/lib/translations/en.json
@@ -577,7 +577,7 @@
   "core.walletSetupSelectAccountsStep.walletName": "Wallet name",
   "core.walletSetupStep.allDone": "All done",
   "core.walletSetupStep.back": "Back",
-  "core.walletSetupStep.connectWallet": "Connect wallet",
+  "core.walletSetupStep.connectWallet": "Connect device",
   "core.walletSetupStep.enterWallet": "Enter wallet",
   "core.walletSetupStep.legalAndAnalytics": "Legal & analytics",
   "core.walletSetupStep.nameWallet": "Name wallet",

diff --git a/packages/e2e-tests/src/assert/transactionDetailsAssert.ts b/packages/e2e-tests/src/assert/transactionDetailsAssert.ts
@@ -102,6 +102,7 @@ class TransactionsDetailsAssert {
     const actualIds: string[] = await TransactionDetailsPage.getTransactionDetailsStakepoolIds();
     const actualNames: string[] = await TransactionDetailsPage.getTransactionDetailsStakepoolNames();
     const actualTickers: string[] = await TransactionDetailsPage.getTransactionDetailsStakepoolTickers();
+    if (actualIds[0].endsWith(expectedTickers[0].split('...')[1])) expectedTickers[0] = '-';
 
     expect(actualIds).to.have.all.members(expectedIds);
     expect(actualNames).to.have.all.members(expectedNames);

diff --git a/packages/e2e-tests/src/elements/multidelegation/MultidelegationPage.ts b/packages/e2e-tests/src/elements/multidelegation/MultidelegationPage.ts
@@ -73,8 +73,8 @@ class MultidelegationPage {
   private STAKE_POOLS_LIST_CONTAINER = '[data-testid="stake-pools-list-container"]';
   private STAKE_POOL_LIST_ROW_SKELETON = '[data-testid="stake-pool-list-row-skeleton"]';
   private STAKE_POOL_CARD_SKELETON = '[data-testid="stake-pool-card-skeleton"]';
-  private SELCECTED_STAKE_POOLS_IN_GRID_VIEW = '[data-testid="selected-pools-list"] [data-testid="stake-pool-card"]';
-  private SELCECTED_STAKE_POOLS_IN_LIST_VIEW = '[data-testid="selected-pools-list"] [data-testid="stake-pool-item"]';
+  private SELECTED_STAKE_POOLS_IN_GRID_VIEW = '[data-testid="selected-pools-list"] [data-testid="stake-pool-card"]';
+  private SELECTED_STAKE_POOLS_IN_LIST_VIEW = '[data-testid="selected-pools-list"] [data-testid="stake-pool-item"]';
   private POOLS_COUNTER = '[data-testid="pools-counter"]';
 
   get title() {
@@ -294,11 +294,11 @@ class MultidelegationPage {
   }
 
   get selectedPoolsInGridView() {
-    return $$(this.SELCECTED_STAKE_POOLS_IN_GRID_VIEW);
+    return $$(this.SELECTED_STAKE_POOLS_IN_GRID_VIEW);
   }
 
   get selectedPoolsInListView() {
-    return $$(this.SELCECTED_STAKE_POOLS_IN_LIST_VIEW);
+    return $$(this.SELECTED_STAKE_POOLS_IN_LIST_VIEW);
   }
 
   get moreOptionsComponent(): typeof MoreOptionsComponent {

diff --git a/packages/e2e-tests/src/features/e2e/MultidelegationSwitchingPoolsExtendedE2E.feature b/packages/e2e-tests/src/features/e2e/MultidelegationSwitchingPoolsExtendedE2E.feature
@@ -71,11 +71,13 @@ Feature: Staking Page - Switching pools - Extended Browser View - E2E
     And I enter correct wallet password and confirm staking
     Then Switching staking success drawer is displayed
     When I click "Close" button on staking success drawer
+    And I navigate to Transactions extended page
+    Then I can see transaction 1 with type "Delegation"
+    And I navigate to Staking extended page
     And I open Overview tab
     And I wait until "-" pool is on "Your pools" list
     And I save identifiers of stake pools currently in use
     And I navigate to Transactions extended page
-    Then I can see transaction 1 with type "Delegation"
     When I click on a transaction: 1
     Then The Tx details are displayed for Staking without metadata