From e8c6e35a2b05f99ad499391ae9c7b9c4b8749d4f Mon Sep 17 00:00:00 2001
From: James Sangalli <j.l.sangalli@gmail.com>
Date: Tue, 14 Jul 2020 10:44:55 +1000
Subject: [PATCH] add withdrawable/depositable, change supply to deposit &
 round down

---
 examples/erc20/Compound/cBAT.xml         | 2 +-
 examples/erc20/Compound/cDAI.xml         | 2 +-
 examples/erc20/Compound/cETH.xml         | 2 +-
 examples/erc20/Compound/cREP.xml         | 2 +-
 examples/erc20/Compound/cSAI.xml         | 2 +-
 examples/erc20/Compound/cUSDC.xml        | 2 +-
 examples/erc20/Compound/cWBTC.xml        | 2 +-
 examples/erc20/Compound/cZRX.xml         | 2 +-
 examples/erc20/Compound/supply.en.js     | 8 ++++----
 examples/erc20/Compound/withdraw.en.js   | 9 +++++----
 examples/erc20/DeFiMoneyMarket/mDAI.xml  | 2 +-
 examples/erc20/DeFiMoneyMarket/mETH.xml  | 2 +-
 examples/erc20/DeFiMoneyMarket/mUSDC.xml | 2 +-
 13 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/examples/erc20/Compound/cBAT.xml b/examples/erc20/Compound/cBAT.xml
index adadd037..68a0b56e 100644
--- a/examples/erc20/Compound/cBAT.xml
+++ b/examples/erc20/Compound/cBAT.xml
@@ -57,7 +57,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 
     <ts:card type="action" exclude="notEnabled">
         <ts:label>
-            <ts:string xml:lang="en">Supply</ts:string>
+            <ts:string xml:lang="en">Deposit</ts:string>
         </ts:label>
         <ts:attribute name="mintAmount">
             <ts:type><ts:syntax>1.3.6.1.4.1.1466.115.121.1.36</ts:syntax></ts:type>
diff --git a/examples/erc20/Compound/cDAI.xml b/examples/erc20/Compound/cDAI.xml
index b3d4c748..34ddb09c 100644
--- a/examples/erc20/Compound/cDAI.xml
+++ b/examples/erc20/Compound/cDAI.xml
@@ -57,7 +57,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 
         <ts:card type="action" exclude="notEnabled">
             <ts:label>
-                <ts:string xml:lang="en">Supply</ts:string>
+                <ts:string xml:lang="en">Deposit</ts:string>
             </ts:label>
             <ts:attribute name="mintAmount">
                 <ts:type><ts:syntax>1.3.6.1.4.1.1466.115.121.1.36</ts:syntax></ts:type>
diff --git a/examples/erc20/Compound/cETH.xml b/examples/erc20/Compound/cETH.xml
index 28273077..c1781f92 100644
--- a/examples/erc20/Compound/cETH.xml
+++ b/examples/erc20/Compound/cETH.xml
@@ -25,7 +25,7 @@
 <ts:cards>
     <ts:card type="action">
         <ts:label>
-            <ts:string xml:lang="en">Supply</ts:string>
+            <ts:string xml:lang="en">Deposit</ts:string>
         </ts:label>
         <ts:attribute name="mintAmount">
             <ts:type><ts:syntax>1.3.6.1.4.1.1466.115.121.1.36</ts:syntax></ts:type>
diff --git a/examples/erc20/Compound/cREP.xml b/examples/erc20/Compound/cREP.xml
index 6dc8f77b..91762911 100644
--- a/examples/erc20/Compound/cREP.xml
+++ b/examples/erc20/Compound/cREP.xml
@@ -57,7 +57,7 @@
 
     <ts:card type="action" exclude="notEnabled">
         <ts:label>
-            <ts:string xml:lang="en">Supply</ts:string>
+            <ts:string xml:lang="en">Deposit</ts:string>
         </ts:label>
         <ts:attribute name="mintAmount">
             <ts:type><ts:syntax>1.3.6.1.4.1.1466.115.121.1.36</ts:syntax></ts:type>
diff --git a/examples/erc20/Compound/cSAI.xml b/examples/erc20/Compound/cSAI.xml
index 0fb7ea84..f3e84e62 100644
--- a/examples/erc20/Compound/cSAI.xml
+++ b/examples/erc20/Compound/cSAI.xml
@@ -57,7 +57,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 
         <ts:card type="action" exclude="notEnabled">
             <ts:label>
-                <ts:string xml:lang="en">Supply</ts:string>
+                <ts:string xml:lang="en">Deposit</ts:string>
             </ts:label>
             <ts:attribute name="mintAmount">
                 <ts:type><ts:syntax>1.3.6.1.4.1.1466.115.121.1.36</ts:syntax></ts:type>
diff --git a/examples/erc20/Compound/cUSDC.xml b/examples/erc20/Compound/cUSDC.xml
index 4c3452b2..674159db 100644
--- a/examples/erc20/Compound/cUSDC.xml
+++ b/examples/erc20/Compound/cUSDC.xml
@@ -57,7 +57,7 @@
 
         <ts:card type="action" exclude="notEnabled">
             <ts:label>
-                <ts:string xml:lang="en">Supply</ts:string>
+                <ts:string xml:lang="en">Deposit</ts:string>
             </ts:label>
             <ts:attribute name="mintAmount">
                 <ts:type><ts:syntax>1.3.6.1.4.1.1466.115.121.1.36</ts:syntax></ts:type>
diff --git a/examples/erc20/Compound/cWBTC.xml b/examples/erc20/Compound/cWBTC.xml
index f8ff7250..47d7d38a 100644
--- a/examples/erc20/Compound/cWBTC.xml
+++ b/examples/erc20/Compound/cWBTC.xml
@@ -57,7 +57,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 
     <ts:card type="action" exclude="notEnabled">
         <ts:label>
-            <ts:string xml:lang="en">Supply</ts:string>
+            <ts:string xml:lang="en">Deposit</ts:string>
         </ts:label>
         <ts:attribute name="mintAmount">
             <ts:type><ts:syntax>1.3.6.1.4.1.1466.115.121.1.36</ts:syntax></ts:type>
diff --git a/examples/erc20/Compound/cZRX.xml b/examples/erc20/Compound/cZRX.xml
index 4a5d1418..8b13d639 100644
--- a/examples/erc20/Compound/cZRX.xml
+++ b/examples/erc20/Compound/cZRX.xml
@@ -57,7 +57,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 
     <ts:card type="action" exclude="notEnabled">
         <ts:label>
-            <ts:string xml:lang="en">Supply</ts:string>
+            <ts:string xml:lang="en">Deposit</ts:string>
         </ts:label>
         <ts:attribute name="mintAmount">
             <ts:type><ts:syntax>1.3.6.1.4.1.1466.115.121.1.36</ts:syntax></ts:type>
diff --git a/examples/erc20/Compound/supply.en.js b/examples/erc20/Compound/supply.en.js
index c45f7d5e..9c346213 100644
--- a/examples/erc20/Compound/supply.en.js
+++ b/examples/erc20/Compound/supply.en.js
@@ -16,8 +16,8 @@ class Token {
     render() {
         const decimals18 = 1e+18;
         const decimals8 = 1e+8; //cToken decimals
-        let cTokenBalance = (this.props.cTokenBalance / decimals8).toFixed(2);
-        let tokenBalance = (this.props.tokenBalance / decimals18).toFixed(2);
+        let cTokenBalance = Math.floor((this.props.cTokenBalance / decimals8) * 100) / 100;
+        let tokenBalance = Math.floor((this.props.tokenBalance / decimals18) * 100) / 100;
         let interestRatePerBlock = this.props.supplyInterestRate;
         const averageBlocksPerYear = 2102400;
         let APR = (((interestRatePerBlock * averageBlocksPerYear) / decimals18) * 100).toFixed(2);
@@ -31,8 +31,8 @@ class Token {
             <span><bold><h3>1 ${this.props.underlyingToken} = ${this.props.rate} ${this.props.label}</h3></bold></span>
           </div>
           <div id="inputBox">
-              <bold><h3>Supply ${this.props.underlyingToken} to Compound</h3></bold>
-              <span><input id="mintAmount" type="number"></span>
+              <bold><h3>Deposit ${this.props.underlyingToken} to Compound</h3></bold>
+              <span><input id="mintAmount" type="number" placeholder="deposit up to ${tokenBalance} ${this.props.underlyingToken}"></span>
           </div>
         </div>
 `;
diff --git a/examples/erc20/Compound/withdraw.en.js b/examples/erc20/Compound/withdraw.en.js
index 16be65c4..d4bcd1cc 100644
--- a/examples/erc20/Compound/withdraw.en.js
+++ b/examples/erc20/Compound/withdraw.en.js
@@ -16,10 +16,11 @@ class Token {
     render() {
         const decimals18 = 1e+18;
         const decimals8 = 1e+8; //cToken decimals
-        let cTokenBalance = (this.props.cTokenBalance / decimals8).toFixed(2);
-        let tokenBalance = (this.props.tokenBalance / decimals18).toFixed(2);
+        let cTokenBalance = Math.floor((this.props.cTokenBalance / decimals8) * 100) / 100;
+        let tokenBalance = Math.floor((this.props.tokenBalance / decimals18 * 100)) / 100;
         let interestRatePerBlock = this.props.supplyInterestRate;
         const averageBlocksPerYear = 2102400;
+        const withdrawable = Math.floor((cTokenBalance / this.props.rate) * 100) / 100;
         let APR = (((interestRatePerBlock * averageBlocksPerYear) / decimals18) * 100).toFixed(2);
         return`
         <div class="ui container">
@@ -31,8 +32,8 @@ class Token {
             <span><bold><h3>1 ${this.props.underlyingToken} = ${this.props.rate} ${this.props.label}</h3></bold></span>
           </div>
           <div id="inputBox">
-              <bold><h3>Withdraw ${this.props.label} for ${this.props.underlyingToken} from Compound</h3></bold>
-              <span><input id="redeemAmount" type="number"></span>
+              <bold><h3>Withdraw ${this.props.underlyingToken} from Compound</h3></bold>
+              <span><input id="redeemAmount" type="number" placeholder="withdraw up to ${withdrawable} ${this.props.underlyingToken}"></span>
           </div>
         </div>`;
     }
diff --git a/examples/erc20/DeFiMoneyMarket/mDAI.xml b/examples/erc20/DeFiMoneyMarket/mDAI.xml
index deb7d961..c2632883 100644
--- a/examples/erc20/DeFiMoneyMarket/mDAI.xml
+++ b/examples/erc20/DeFiMoneyMarket/mDAI.xml
@@ -62,7 +62,7 @@
 
         <ts:card type="action" exclude="notEnabled">
             <ts:label>
-                <ts:string xml:lang="en">Supply</ts:string>
+                <ts:string xml:lang="en">Deposit</ts:string>
             </ts:label>
             <ts:attribute name="mintAmount">
                 <ts:type><ts:syntax>1.3.6.1.4.1.1466.115.121.1.36</ts:syntax></ts:type>
diff --git a/examples/erc20/DeFiMoneyMarket/mETH.xml b/examples/erc20/DeFiMoneyMarket/mETH.xml
index bd83096e..8c8491a3 100644
--- a/examples/erc20/DeFiMoneyMarket/mETH.xml
+++ b/examples/erc20/DeFiMoneyMarket/mETH.xml
@@ -29,7 +29,7 @@
     <ts:cards>
         <ts:card type="action">
             <ts:label>
-                <ts:string xml:lang="en">Supply</ts:string>
+                <ts:string xml:lang="en">Deposit</ts:string>
             </ts:label>
             <ts:attribute name="mintAmount">
                 <ts:type><ts:syntax>1.3.6.1.4.1.1466.115.121.1.36</ts:syntax></ts:type>
diff --git a/examples/erc20/DeFiMoneyMarket/mUSDC.xml b/examples/erc20/DeFiMoneyMarket/mUSDC.xml
index 65f95476..7b870104 100644
--- a/examples/erc20/DeFiMoneyMarket/mUSDC.xml
+++ b/examples/erc20/DeFiMoneyMarket/mUSDC.xml
@@ -63,7 +63,7 @@
 
         <ts:card type="action" exclude="notEnabled">
             <ts:label>
-                <ts:string xml:lang="en">Supply</ts:string>
+                <ts:string xml:lang="en">Deposit</ts:string>
             </ts:label>
             <ts:attribute name="mintAmount">
                 <ts:type><ts:syntax>1.3.6.1.4.1.1466.115.121.1.36</ts:syntax></ts:type>