Merge pull request #9583 from LedgerHQ/feat/17703

Bugfixe: Standardize Timeframe Display on Portfolio & Market Page Charts

Author: RobinVncnt

.changeset/gold-games-tease.md

@@ -0,0 +1,6 @@
+---
+"ledger-live-desktop": minor
+"@ledgerhq/live-common": minor
+---
+
+bugfix: Standardize Timeframe Display on Portfolio & Market Page Charts

apps/ledger-live-desktop/src/renderer/screens/market/MarketCoin/components/MarketCoinChart.tsx

@@ -44,7 +44,9 @@ const FadeIn = styled.div.attrs<{ state: string }>(p => ({
   transition: opacity 1s ease-out;
 `;
 
-const ranges = Object.keys(rangeDataTable);
+const ranges = Object.keys(rangeDataTable)
+  .filter(k => k !== "1h")
+  .reverse();
 
 type TooltipProps = {
   data: { date: Date; value: number };
@@ -181,13 +183,11 @@ function MarkeCoinChartComponent({
             onTabChange={setRange}
             initialActiveIndex={activeRangeIndex}
           >
-            {ranges
-              .filter(k => k !== "1h")
-              .map(key => (
-                <Text color="inherit" variant="small" key={key}>
-                  {t(`market.range.${key}`)}
-                </Text>
-              ))}
+            {ranges.map(key => (
+              <Text color="inherit" variant="small" key={key}>
+                {t(`market.range.${rangeDataTable[key].label}`)}
+              </Text>
+            ))}
           </Bar>
         </Flex>
       </Flex>

apps/ledger-live-desktop/src/renderer/screens/market/hooks/useMarket.ts

@@ -52,7 +52,8 @@ export function useMarket() {
     () =>
       Object.keys(rangeDataTable)
         .filter(k => k !== "1h")
-        .map(value => ({ value, label: t(`market.range.${value}`) })),
+        .map(key => ({ value: key, label: t(`market.range.${rangeDataTable[key].label}`) }))
+        .reverse(),
     [t],
   );
 

apps/ledger-live-desktop/tests/specs/market/market.spec.ts

@@ -147,7 +147,7 @@ test("Market", async ({ page }) => {
   });
 
   await test.step("change market range", async () => {
-    await marketPage.switchMarketRange("7d");
+    await marketPage.switchMarketRange("1W");
     await marketPage.waitForLoadingWithSwapbtn();
     await expect
       .soft(page)