Merge branch 'main' into feat/lw-9145-tx-summary-refactor

input-output-hk · Feb 20, 2024 · 202305f · 202305f
2 parents 73ddd68 + 9103658
commit 202305f
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 14 deletions.
diff --git a/apps/browser-extension-wallet/src/lib/translations/en.json b/apps/browser-extension-wallet/src/lib/translations/en.json
@@ -1082,8 +1082,14 @@
     },
     "stakePoolTableBrowser": {
       "tableHeader": {
-        "ticker": "Ticker",
-        "cost": "Cost",
+        "ticker": {
+          "title": "Ticker",
+          "tooltip": "Refers to the unique identifier of a staking pool"
+        },
+        "cost": {
+          "title": "Cost",
+          "tooltip": "The cost is not directly paid by the delegator; they are deducted from a pool's rewards, consisting of a fixed cost and a variable cost, which fund the pool's operational costs"
+        },
         "ros": {
           "title": "ROS",
           "tooltip": "Estimated 'Return On Stake' based on previous pool performance"
@@ -1104,7 +1110,10 @@
           "title": "Pledge",
           "tooltip": "An amount of self‐bonded assets intended to remain staked to the pool for as long as it operates"
         },
-        "liveStake": "Live Stake"
+        "liveStake": {
+          "title": "Live Stake",
+          "tooltip": "Refers to the total amount of a cryptocurrency that is currently being staked in a particular staking pool"
+        }
       }
     },
     "stakingConfirmationInfo": {

diff --git a/...et/src/views/browser-view/features/staking/components/StakePoolsTable/StakePoolsTable.tsx b/...et/src/views/browser-view/features/staking/components/StakePoolsTable/StakePoolsTable.tsx
@@ -62,21 +62,24 @@ export const StakePoolsTable = ({ scrollableTargetId }: stakePoolsTableProps): R
   } = useWalletStore();
 
   const tableHeaderTranslations: TranslationsFor<MetricType> = {
-    ticker: t('cardano.stakePoolTableBrowser.tableHeader.ticker'),
+    ticker: t('cardano.stakePoolTableBrowser.tableHeader.ticker.title'),
     apy: t('cardano.stakePoolTableBrowser.tableHeader.ros.title'),
-    cost: t('cardano.stakePoolTableBrowser.tableHeader.cost'),
+    cost: t('cardano.stakePoolTableBrowser.tableHeader.cost.title'),
     saturation: t('cardano.stakePoolTableBrowser.tableHeader.saturation.title'),
     margin: t('cardano.stakePoolTableBrowser.tableHeader.margin.title'),
     blocks: t('cardano.stakePoolTableBrowser.tableHeader.blocks.title'),
     pledge: t('cardano.stakePoolTableBrowser.tableHeader.pledge.title'),
-    liveStake: t('cardano.stakePoolTableBrowser.tableHeader.liveStake')
+    liveStake: t('cardano.stakePoolTableBrowser.tableHeader.liveStake.title')
   };
-  const tableHeaderTooltipsTranslations: Partial<TranslationsFor<MetricType>> = {
+  const tableHeaderTooltipsTranslations: TranslationsFor<MetricType> = {
+    ticker: t('cardano.stakePoolTableBrowser.tableHeader.ticker.tooltip'),
     apy: t('cardano.stakePoolTableBrowser.tableHeader.ros.tooltip'),
+    cost: t('cardano.stakePoolTableBrowser.tableHeader.cost.tooltip'),
     saturation: t('cardano.stakePoolTableBrowser.tableHeader.saturation.tooltip'),
     margin: t('cardano.stakePoolTableBrowser.tableHeader.margin.tooltip'),
     blocks: t('cardano.stakePoolTableBrowser.tableHeader.blocks.tooltip'),
-    pledge: t('cardano.stakePoolTableBrowser.tableHeader.pledge.tooltip')
+    pledge: t('cardano.stakePoolTableBrowser.tableHeader.pledge.tooltip'),
+    liveStake: t('cardano.stakePoolTableBrowser.tableHeader.liveStake.tooltip')
   };
 
   const debouncedSearch = useMemo(() => debounce(fetchStakePools, searchDebounce), [fetchStakePools]);

diff --git a/packages/staking/src/features/BrowsePools/BrowsePools.tsx b/packages/staking/src/features/BrowsePools/BrowsePools.tsx
@@ -47,12 +47,12 @@ export const BrowsePools = () => {
   const tableHeaderTranslations = {
     apy: t('browsePools.stakePoolTableBrowser.tableHeader.ros.title'),
     blocks: t('browsePools.stakePoolTableBrowser.tableHeader.blocks.title'),
-    cost: t('browsePools.stakePoolTableBrowser.tableHeader.cost'),
+    cost: t('browsePools.stakePoolTableBrowser.tableHeader.cost.title'),
     liveStake: t('browsePools.stakePoolTableBrowser.tableHeader.liveStake.title'),
     margin: t('browsePools.stakePoolTableBrowser.tableHeader.margin.title'),
     pledge: t('browsePools.stakePoolTableBrowser.tableHeader.pledge.title'),
     saturation: t('browsePools.stakePoolTableBrowser.tableHeader.saturation.title'),
-    ticker: t('browsePools.stakePoolTableBrowser.tableHeader.ticker'),
+    ticker: t('browsePools.stakePoolTableBrowser.tableHeader.ticker.title'),
   };
 
   const debouncedSearch = useMemo(() => debounce(fetchStakePools, SEARCH_DEBOUNCE), [fetchStakePools]);

diff --git a/packages/staking/src/features/i18n/translations/en.ts b/packages/staking/src/features/i18n/translations/en.ts
@@ -19,8 +19,12 @@ export const en: Translations = {
   'browsePools.stakePoolTableBrowser.stake': 'Stake',
   'browsePools.stakePoolTableBrowser.tableHeader.blocks.title': 'Blocks',
   'browsePools.stakePoolTableBrowser.tableHeader.blocks.tooltip': 'Total blocks created by the pool.',
-  'browsePools.stakePoolTableBrowser.tableHeader.cost': 'Cost',
+  'browsePools.stakePoolTableBrowser.tableHeader.cost.title': 'Cost',
+  'browsePools.stakePoolTableBrowser.tableHeader.cost.tooltip':
+    "The cost is not directly paid by the delegator; they are deducted from a pool's rewards, consisting of a fixed cost and a variable cost, which fund the pool's operational costs",
   'browsePools.stakePoolTableBrowser.tableHeader.liveStake.title': 'Live Stake',
+  'browsePools.stakePoolTableBrowser.tableHeader.liveStake.tooltip':
+    'Refers to the total amount of a cryptocurrency that is currently being staked in a particular staking pool',
   'browsePools.stakePoolTableBrowser.tableHeader.margin.title': 'Margin',
   'browsePools.stakePoolTableBrowser.tableHeader.margin.tooltip':
     'The percentage of rewards taken by the stake pool operator after the fixed cost but before rewards are distributed',
@@ -33,7 +37,8 @@ export const en: Translations = {
   'browsePools.stakePoolTableBrowser.tableHeader.saturation.title': 'Saturation',
   'browsePools.stakePoolTableBrowser.tableHeader.saturation.tooltip':
     'Once a pool reaches the point of saturation, it will offer diminishing rewards',
-  'browsePools.stakePoolTableBrowser.tableHeader.ticker': 'Ticker',
+  'browsePools.stakePoolTableBrowser.tableHeader.ticker.title': 'Ticker',
+  'browsePools.stakePoolTableBrowser.tableHeader.ticker.tooltip': 'Refers to the unique identifier of a staking pool',
   'browsePools.stakePoolTableBrowser.unselect': 'Unselect',
   'drawer.confirmation.button.confirm': 'Next',
   'drawer.confirmation.button.confirmWithDevice': 'Confirm with {{hardwareWallet}}',

diff --git a/packages/staking/src/features/i18n/types.ts b/packages/staking/src/features/i18n/types.ts
@@ -40,12 +40,18 @@ type KeysStructure = {
     stakePoolTableBrowser: {
       searchInputPlaceholder: '';
       tableHeader: {
-        ticker: '';
+        ticker: {
+          title: '';
+          tooltip: '';
+        };
         ros: {
           title: '';
           tooltip: '';
         };
-        cost: '';
+        cost: {
+          title: '';
+          tooltip: '';
+        };
         saturation: {
           title: '';
           tooltip: '';
@@ -64,6 +70,7 @@ type KeysStructure = {
         };
         liveStake: {
           title: '';
+          tooltip: '';
         };
       };
       emptyMessage: '';