From 93b3ca76b41cbbda97552d6646fb522ac4e45427 Mon Sep 17 00:00:00 2001
From: Lipa Long <lipa@chia.net>
Date: Thu, 28 May 2020 13:59:05 -0700
Subject: [PATCH] cc units in balance display

---
 electron-react/src/pages/ColouredWallet.js | 19 ++++++++++---------
 electron-react/src/pages/StandardWallet.js | 11 +++++------
 electron-react/src/util/chia.js            | 18 ++++++++++++++++++
 electron-react/src/util/units.js           | 10 ++++++++--
 4 files changed, 41 insertions(+), 17 deletions(-)

diff --git a/electron-react/src/pages/ColouredWallet.js b/electron-react/src/pages/ColouredWallet.js
index 79d3e04c0a..e1cc27eebf 100644
--- a/electron-react/src/pages/ColouredWallet.js
+++ b/electron-react/src/pages/ColouredWallet.js
@@ -21,7 +21,7 @@ import {
   farm_block,
   rename_cc_wallet
 } from "../modules/message";
-import { mojo_to_chia_string, chia_to_mojo } from "../util/chia";
+import { mojo_to_chia_string, chia_to_mojo, mojo_to_colouredcoin_string } from "../util/chia";
 import { unix_to_short_date } from "../util/utils";
 import Accordion from "../components/Accordion";
 import { openDialog } from "../modules/dialogReducer";
@@ -189,8 +189,6 @@ const useStyles = makeStyles(theme => ({
 
 const ColourCard = props => {
   var id = props.wallet_id;
-  // console.log("AAAAAAAAA");
-  // console.log(id);
 
   const dispatch = useDispatch();
   const colour = useSelector(state => state.wallet_state.wallets[id].colour);
@@ -283,7 +281,7 @@ const BalanceCardSubSection = props => {
           </Box>
           <Box>
             <Typography variant="subtitle1">
-              {mojo_to_chia_string(props.balance)} {cc_unit}
+              {mojo_to_colouredcoin_string(props.balance)} {cc_unit}
             </Typography>
           </Box>
         </Box>
@@ -298,16 +296,19 @@ const BalanceCard = props => {
   const balance = useSelector(
     state => state.wallet_state.wallets[id].balance_total
   );
-  const balance_spendable = useSelector(
+  var balance_spendable = useSelector(
     state => state.wallet_state.wallets[id].balance_spendable
   );
+  if (balance_spendable < 0) {
+    balance_spendable = 0;
+  };
   const balance_pending = useSelector(
     state => state.wallet_state.wallets[id].balance_pending
   );
   const balance_change = useSelector(
     state => state.wallet_state.wallets[id].balance_change
   );
-  const balance_ptotal = balance + balance_pending;
+  const balance_ptotal = balance + balance_pending + balance_change;
 
   var cc_unit = name;
   if (cc_unit.length > 10) {
@@ -326,9 +327,9 @@ const BalanceCard = props => {
   const balancebox_unit = " " + cc_unit;
   const balancebox_hline =
     "<tr><td colspan='2' style='text-align:center'><hr width='50%'></td></tr>";
-  const balance_ptotal_chia = mojo_to_chia_string(balance_ptotal, "mojo");
-  const balance_pending_chia = mojo_to_chia_string(balance_pending, "mojo");
-  const balance_change_chia = mojo_to_chia_string(balance_change, "mojo");
+  const balance_ptotal_chia = mojo_to_colouredcoin_string(balance_ptotal, "mojo");
+  const balance_pending_chia = mojo_to_colouredcoin_string(balance_pending, "mojo");
+  const balance_change_chia = mojo_to_colouredcoin_string(balance_change, "mojo");
   const acc_content =
     balancebox_1 +
     balancebox_2 +
diff --git a/electron-react/src/pages/StandardWallet.js b/electron-react/src/pages/StandardWallet.js
index 60f978ce21..4d2eed734b 100644
--- a/electron-react/src/pages/StandardWallet.js
+++ b/electron-react/src/pages/StandardWallet.js
@@ -208,13 +208,12 @@ const BalanceCard = props => {
   const balance = useSelector(
     state => state.wallet_state.wallets[id].balance_total
   );
-  const balance_spendable = useSelector(
+  var balance_spendable = useSelector(
     state => state.wallet_state.wallets[id].balance_spendable
   );
-  var balance_spendable_chia = mojo_to_chia_string(balance_spendable, "mojo");
-  if (balance_spendable_chia < 0) {
-    balance_spendable_chia = 0;
-  }
+  if (balance_spendable < 0) {
+    balance_spendable = 0;
+  };
   const balance_pending = useSelector(
     state => state.wallet_state.wallets[id].balance_pending
   );
@@ -224,7 +223,7 @@ const BalanceCard = props => {
   const balance_change = useSelector(
     state => state.wallet_state.wallets[id].balance_change
   );
-  const balance_ptotal = balance + balance_pending;
+  const balance_ptotal = balance + balance_pending + balance_change;
 
   const classes = useStyles();
 
diff --git a/electron-react/src/util/chia.js b/electron-react/src/util/chia.js
index 8f4fbebc37..e482ce56ff 100644
--- a/electron-react/src/util/chia.js
+++ b/electron-react/src/util/chia.js
@@ -100,3 +100,21 @@ export const mojo_to_chia_string = mojo => {
     .to("chia")
     .toString();
 };
+
+export const mojo_to_colouredcoin = mojo => {
+  return chia_formatter(parseInt(mojo), "mojo")
+    .to("colouredcoin")
+    .value();
+};
+
+export const colouredcoin_to_mojo = colouredcoin => {
+  return chia_formatter(parseFloat(Number(colouredcoin)), "colouredcoin")
+    .to("mojo")
+    .value();
+};
+
+export const mojo_to_colouredcoin_string = mojo => {
+  return chia_formatter(Number(mojo), "mojo")
+    .to("colouredcoin")
+    .toString();
+};
\ No newline at end of file
diff --git a/electron-react/src/util/units.js b/electron-react/src/util/units.js
index a19aba791d..725b0a68aa 100644
--- a/electron-react/src/util/units.js
+++ b/electron-react/src/util/units.js
@@ -1,11 +1,13 @@
 const units = {
   chia: 1,
-  mojo: 1 / 1e12
+  mojo: 1 / 1e12,
+  colouredcoin: 1 / 1e9
 };
 
 const aliases = {
   chia: ["ch", "chia", "Chia"],
-  mojo: ["mj", "mojo"]
+  mojo: ["mj", "mojo"],
+  colouredcoin: ["cc", "colouredcoin"]
 };
 
 const display = {
@@ -16,6 +18,10 @@ const display = {
   mojo: {
     format: "{amount} MJ",
     fractionDigits: 0
+  },
+  colouredcoin: {
+    format: "{amount} CC",
+    fractionDigits: 3
   }
 };