TW-830: Collectibles Manage dropdown. Fix QA. 2 decimals for unletter…

…ed numbers
madfish-solutions · Jul 10, 2023 · 9c7b2f7 · 9c7b2f7
1 parent 4b72ec6
commit 9c7b2f7
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 13 deletions.
diff --git a/public/_locales/de/messages.json b/public/_locales/de/messages.json
@@ -1856,7 +1856,7 @@
     "message": "Es wurden keine passenden dApps gefunden"
   },
   "thousandFormat": {
-    "message": "$thousand$k",
+    "message": "$thousand$K",
     "placeholders": {
       "thousand": {
         "content": "$1"

diff --git a/public/_locales/en/messages.json b/public/_locales/en/messages.json
@@ -2149,7 +2149,7 @@
     "message": "No matching dApps were found"
   },
   "thousandFormat": {
-    "message": "$thousand$k",
+    "message": "$thousand$K",
     "placeholders": {
       "thousand": {
         "content": "$1"

diff --git a/public/_locales/pt/messages.json b/public/_locales/pt/messages.json
@@ -1856,7 +1856,7 @@
     "message": "Não foram encontrados dApps correspondentes"
   },
   "thousandFormat": {
-    "message": "$thousand$k",
+    "message": "$thousand$K",
     "placeholders": {
       "thousand": {
         "content": "$1"

diff --git a/public/_locales/tr/messages.json b/public/_locales/tr/messages.json
@@ -1856,7 +1856,7 @@
     "message": "Eşleşen dApps bulunamadı"
   },
   "thousandFormat": {
-    "message": "$thousand$k",
+    "message": "$thousand$K",
     "placeholders": {
       "thousand": {
         "content": "$1"

diff --git a/src/app/atoms/Money.tsx b/src/app/atoms/Money.tsx
@@ -68,7 +68,7 @@ const Money = memo<MoneyProps>(
       );
     }
 
-    if (!fiat && decimalsLength > cryptoDecimals && !shortened) {
+    if (!fiat && !shortened && decimalsLength > cryptoDecimals) {
       return (
         <MoneyWithoutFormat
           tooltip={tooltip}

diff --git a/src/lib/i18n/numbers.ts b/src/lib/i18n/numbers.ts
@@ -76,19 +76,23 @@ export function toLocalFixed(value: BigNumber.Value, decimalPlaces?: number, rou
 
 export function toShortened(value: BigNumber.Value) {
   let bn = new BigNumber(value);
-  if (bn.abs().lt(1)) {
-    return toLocalFixed(bn.toPrecision(1));
-  }
+  const target = bn.abs().decimalPlaces(2);
+
+  if (target.lt(0.01)) return toLocalFixed(bn.toPrecision(2));
+
+  if (target.lt(10_000)) return toLocalFixed(bn, 2);
+
   bn = bn.integerValue();
+
   const formats: TID[] = ['thousandFormat', 'millionFormat', 'billionFormat'];
+
   let formatIndex = -1;
   while (bn.abs().gte(1000) && formatIndex < formats.length - 1) {
     formatIndex++;
     bn = bn.div(1000);
   }
-  bn = bn.decimalPlaces(1, BigNumber.ROUND_FLOOR);
-  if (formatIndex === -1) {
-    return toLocalFixed(bn);
-  }
-  return t(formats[formatIndex], toLocalFixed(bn));
+
+  if (formatIndex === -1) return toLocalFixed(bn, 2);
+
+  return t(formats[formatIndex], toLocalFixed(bn, 0));
 }