From b49282d4b7674300102db193a82340f281d926b6 Mon Sep 17 00:00:00 2001
From: Simon Warta <simon@warta.it>
Date: Thu, 17 Mar 2022 13:57:53 +0100
Subject: [PATCH] Remove trailing zeros for decimals

---
 packages/proto-signing/src/testdata/coins.json   | 16 ++++++++--------
 .../proto-signing/src/testdata/decimals.json     | 10 +++++-----
 .../proto-signing/src/textual/valuerenderers.ts  |  6 ++----
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/packages/proto-signing/src/testdata/coins.json b/packages/proto-signing/src/testdata/coins.json
index 84e3358d12..46c905d45a 100644
--- a/packages/proto-signing/src/testdata/coins.json
+++ b/packages/proto-signing/src/testdata/coins.json
@@ -5,16 +5,16 @@
   [{"amount": "1000", "denom": "ucosm"}, { "denom": "COSM", "exponent": 6 }, "0.001 COSM"],
   [{"amount": "10000", "denom": "ucosm"}, { "denom": "COSM", "exponent": 6 }, "0.01 COSM"],
   [{"amount": "100000", "denom": "ucosm"}, { "denom": "COSM", "exponent": 6 }, "0.1 COSM"],
-  [{"amount": "1000000", "denom": "ucosm"}, { "denom": "COSM", "exponent": 6 }, "1.0 COSM"],
-  [{"amount": "10000000", "denom": "ucosm"}, { "denom": "COSM", "exponent": 6 }, "10.0 COSM"],
+  [{"amount": "1000000", "denom": "ucosm"}, { "denom": "COSM", "exponent": 6 }, "1 COSM"],
+  [{"amount": "10000000", "denom": "ucosm"}, { "denom": "COSM", "exponent": 6 }, "10 COSM"],
   [{"amount": "1", "denom": "ucosm"}, { "denom": "COSM", "exponent": 2 }, "0.01 COSM"],
   [{"amount": "10", "denom": "ucosm"}, { "denom": "COSM", "exponent": 2 }, "0.1 COSM"],
-  [{"amount": "100", "denom": "ucosm"}, { "denom": "COSM", "exponent": 2 }, "1.0 COSM"],
-  [{"amount": "1000", "denom": "ucosm"}, { "denom": "COSM", "exponent": 2 }, "10.0 COSM"],
-  [{"amount": "10000", "denom": "ucosm"}, { "denom": "COSM", "exponent": 2 }, "100.0 COSM"],
-  [{"amount": "100000", "denom": "ucosm"}, { "denom": "COSM", "exponent": 2 }, "1'000.0 COSM"],
-  [{"amount": "1000000", "denom": "ucosm"}, { "denom": "COSM", "exponent": 2 }, "10'000.0 COSM"],
-  [{"amount": "10000000", "denom": "ucosm"}, { "denom": "COSM", "exponent": 2 }, "100'000.0 COSM"],
+  [{"amount": "100", "denom": "ucosm"}, { "denom": "COSM", "exponent": 2 }, "1 COSM"],
+  [{"amount": "1000", "denom": "ucosm"}, { "denom": "COSM", "exponent": 2 }, "10 COSM"],
+  [{"amount": "10000", "denom": "ucosm"}, { "denom": "COSM", "exponent": 2 }, "100 COSM"],
+  [{"amount": "100000", "denom": "ucosm"}, { "denom": "COSM", "exponent": 2 }, "1'000 COSM"],
+  [{"amount": "1000000", "denom": "ucosm"}, { "denom": "COSM", "exponent": 2 }, "10'000 COSM"],
+  [{"amount": "10000000", "denom": "ucosm"}, { "denom": "COSM", "exponent": 2 }, "100'000 COSM"],
   [{"amount": "1", "denom": "point"}, { "denom": "POINT", "exponent": 0 }, "1 POINT"],
   [{"amount": "10", "denom": "point"}, { "denom": "POINT", "exponent": 0 }, "10 POINT"],
   [{"amount": "100", "denom": "point"}, { "denom": "POINT", "exponent": 0 }, "100 POINT"],
diff --git a/packages/proto-signing/src/testdata/decimals.json b/packages/proto-signing/src/testdata/decimals.json
index 00c44b5ce9..8893fef9e2 100644
--- a/packages/proto-signing/src/testdata/decimals.json
+++ b/packages/proto-signing/src/testdata/decimals.json
@@ -1,9 +1,9 @@
 [
-  ["0", "0.0"],
-  ["1", "1.0"],
-  ["12", "12.0"],
-  ["123", "123.0"],
-  ["1234", "1'234.0"],
+  ["0", "0"],
+  ["1", "1"],
+  ["12", "12"],
+  ["123", "123"],
+  ["1234", "1'234"],
   ["0.1", "0.1"],
   ["0.01", "0.01"],
   ["0.001", "0.001"],
diff --git a/packages/proto-signing/src/textual/valuerenderers.ts b/packages/proto-signing/src/textual/valuerenderers.ts
index 81023cff68..8533341113 100644
--- a/packages/proto-signing/src/textual/valuerenderers.ts
+++ b/packages/proto-signing/src/textual/valuerenderers.ts
@@ -7,13 +7,11 @@ export function formatInteger(input: string): string {
 }
 
 export function formatDecimal(input: string): string {
-  let out = Decimal.fromUserInput(input, 18).toString(".", "'");
-  if (out.indexOf(".") === -1) out += ".0";
+  const out = Decimal.fromUserInput(input, 18).toString(".", "'");
   return out;
 }
 
 export function formatCoin(input: Coin, unit: Pick<DenomUnit, "denom" | "exponent">): string {
-  let out = Decimal.fromAtomics(input.amount, unit.exponent).toString(".", "'");
-  if (unit.exponent !== 0 && out.indexOf(".") === -1) out += ".0";
+  const out = Decimal.fromAtomics(input.amount, unit.exponent).toString(".", "'");
   return out + " " + unit.denom;
 }