v1.0.2-RC4 (#28)

MButcho · Jan 20, 2021 · eea7883 · eea7883
1 parent dc59c3c
commit eea7883
Show file tree

Hide file tree

Showing 7 changed files with 95 additions and 40 deletions.
diff --git a/docs/build-notes.md b/docs/build-notes.md
@@ -43,23 +43,23 @@ npm run dist-linux;
 
 
 ## Checksum:
-  1.0.2-RC3
+  1.0.2-RC4
 
   windows:
 
-  openssl dgst -sha512 -binary Elastos-Light-Wallet-Setup-1.0.2-RC3.exe | openssl base64 -A
+  openssl dgst -sha512 -binary Elastos-Light-Wallet-Setup-1.0.2-RC4.exe | openssl base64 -A
 
   xxxx
 
   Ubuntu 18:
 
-  openssl sha -sha512 Elastos-Light-Wallet-1.0.2-RC3.AppImage
+  openssl sha -sha512 Elastos-Light-Wallet-1.0.2-RC4.AppImage
 
   xxxx
 
   Mac:
 
-  openssl dgst -sha512 Elastos-Light-Wallet-1.0.2-RC3.dmg
+  openssl dgst -sha512 Elastos-Light-Wallet-1.0.2-RC4.dmg
 
   xxxx
 
@@ -77,13 +77,13 @@ npm ls node-gyp
 
 
 # to auto build a releases
-  git commit -am v1.0.2-RC3;
-  git tag v1.0.2-RC3;
+  git commit -am v1.0.2-RC4;
+  git tag v1.0.2-RC4;
   git push;
   git push --tags;
 
 ## to delete release tags
-  git push --delete origin v1.0.2-RC3;
-  git tag -d v1.0.2-RC3;
+  git push --delete origin v1.0.2-RC4;
+  git tag -d v1.0.2-RC4;
   git pull;
   git push;
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "elastos-light-wallet",
-  "version": "v1.0.2-RC3",
+  "version": "v1.0.2-RC4",
   "description": "elastos light wallet",
   "productName": "Elastos Light Wallet",
   "main": "index.js",

diff --git a/scripts/App.js b/scripts/App.js
@@ -2423,6 +2423,12 @@ const getTotalSpendingELA = () => {
   return totalSpendingELA;
 }
 
+const getTotalFees = () => {  
+  var totalFees = BigNumber(Number(BigNumber(Number(feeAmountSats) + minerFee, 10).dividedBy(Asset.satoshis).toString())).decimalPlaces(roundDecimalELA).toString();
+  //mainConsole.log(totalSpendingELA,roundDecimalELA);
+  return totalFees;
+}
+
 const encryptWallet = (text, password) => {
   const keyBytes = crypto.createHash('sha256').update(password).digest();
   const ivBytes = crypto.randomBytes(16);
@@ -3075,6 +3081,7 @@ exports.validateInputs = validateInputs;
 exports.validateFee = validateFee;
 exports.insertELA = insertELA;
 exports.getTotalSpendingELA = getTotalSpendingELA;
+exports.getTotalFees = getTotalFees;
 exports.isValidAddress = isValidAddress;
 exports.isValidDecimal = isValidDecimal;
 exports.showBanner = showBanner;

diff --git a/style.css b/style.css
@@ -639,36 +639,50 @@ button {
   padding: 15px;
 }
 
-.confirm-send-address-label {
-  top: 112px;
-  left: 422px;
-  font-size: 16px;
-  color: #FFFFFF;
-  letter-spacing: 0;
+.confirm-memo-long::after {
+  content: "\00BB";
+  font-size: 18px;
+  left: 5px;
+  top: 1px;
+  position: relative;
+}
+
+.confirm-table-div {
   position: absolute;
+  width: 335px;
+  height: 240px;
+  overflow: auto;  
+  -webkit-app-region: none;
+  top: 120px;
+  padding: 10px 20px 0 20px;
 }
 
-.confirm-send.address {
-  top: 143px;
-  max-width: 260px;
-  overflow-wrap: break-word;
-  word-wrap: break-word;
+.confirm-table {
+  overflow: auto;
+  width: 100%;
+  -webkit-app-region: none;
+  border-spacing: 7px;
+  border: 0;
+  font-size: 13px;
+  color: #B2B4C3;
 }
 
-.confirm-send.total {
-  top: 220px;
-  max-width: 260px;
-  overflow-wrap: break-word;
-  word-wrap: break-word;
-  overflow: hidden;
+.confirm-col1 {
+  font-family: "BioSans-Regular";
+  width: 75px;
+  text-align: right;
+  vertical-align: top;
 }
 
-.confirm-send.total.maxheight {
-  max-height: 86px;
+.confirm-col2 {
+  font-family: "BioSans-Light";
+  max-width: 220px;
+  text-align: left;
+  word-wrap: break-word;
+  vertical-align: top;
 }
 
-.confirm-send span {
-  font-weight: 600;
+.font-color-orange {
   color: #E5A776;
 }
 

diff --git a/views/app.jsx b/views/app.jsx
@@ -109,7 +109,11 @@ class AppView extends React.Component {
               if (App.getSendStep() === 2) {
                 Home.cancelSend();
               } else {
-                Home.resetPage();
+                if (Home.memoFocused) {
+                  Home.memoFocusOff();
+                } else {
+                  Home.resetPage();
+                }
               }
             }
           }

diff --git a/views/home.jsx b/views/home.jsx
@@ -217,6 +217,8 @@ module.exports = (props) => {
   module.exports.resetPage = resetPage;
   module.exports.cancelSend = cancelSend;
   module.exports.UTXOControl = UTXOControl;
+  module.exports.memoFocused = memoFocused;
+  module.exports.memoFocusOff = memoFocusOff;
 
   const SendScreenOne = (props) => {
     const visibility = props.visibility;
@@ -244,15 +246,43 @@ module.exports = (props) => {
   const SendScreenTwo = (props) => {
     const visibility = props.visibility;
     return (
-      <div id="sendTwo" className={`send-area ${visibility}`}>
-        <img src="artwork/sendicon.svg" className="send-icon" title="Refresh Blockchain Data" onClick={(e) => App.requestBlockchainData(true)}/>
-        <p className="send-text">Send</p>
-        <p className="confirm-send-address-label">Receiving Address</p>
-        <p className="confirm-send address"><span>{App.getSendToAddress()}</span></p>
-        <p className="confirm-send total maxheight">Total spending amount with fees is <span>{App.getTotalSpendingELA()} ELA</span>{App.getTxMemo() !== '' ? " and memo " : ""}<span className={App.getTxMemo().length > 55 ? "confirm-memo-long" : ""} title={App.getTxMemo()}>{App.getTxMemo() !== '' ? App.getTxMemo(true) : ""}</span></p>
-        <button className="send-back dark-hover cursor_def" onClick={(e) => cancelSend()}><img src="artwork/arrow.svg" alt="" className="rotate_180 arrow-back" /><span className="send-back-text">Back</span></button>        
-        <button className="sendela-button scale-hover" onClick={(App.getPasswordFlag()) ? (e) => showSendModal() : (e) => sendAmountToAddress()}><p>Send ELA</p></button>        
+    <div id="sendTwo" className={`send-area ${visibility}`}>
+      <img src="artwork/sendicon.svg" className="send-icon" alt="Send"/>
+      <p className="send-text">Send Review</p>
+      <div className="confirm-table-div">
+        <table className="confirm-table">
+          <tbody>
+          <tr>
+            <td className="confirm-col1">Network:</td>
+            <td className="confirm-col2">Elastos Mainnet</td>
+          </tr>
+          <tr>
+            <td className="confirm-col1">To address:</td>
+            <td className="confirm-col2"><span className="font-color-orange">{App.getSendToAddress()}</span></td>
+          </tr>
+          <tr>
+            <td className="confirm-col1">Amount:</td>
+            <td className="confirm-col2">{App.getSendAmount()} ELA</td>
+          </tr>
+          <tr>
+            <td className="confirm-col1">Fees:</td>
+            <td className="confirm-col2">{App.getTotalFees()} ELA</td>
+          </tr>
+          <tr>
+            <td className="confirm-col1">Total:</td>
+            <td className="confirm-col2"><span className="font-color-orange">{App.getTotalSpendingELA()} ELA</span></td>
+          </tr>
+          <tr>
+            <td className="confirm-col1">Memo:</td>
+            <td className="confirm-col2">{App.getTxMemo()}</td>
+          </tr>
+          </tbody>
+        </table>
       </div>
+      <button className="send-back dark-hover cursor_def" onClick={(e) => cancelSend()}><img src="artwork/arrow.svg" alt="" className="rotate_180 arrow-back" /><span className="send-back-text">Back</span></button>
+      <button className="sendela-button scale-hover" onClick={(App.getPasswordFlag()) ? (e) => showSendModal() : (e) => sendAmountToAddress()}><p>Send ELA</p></button>
+    </div>
+
     )
   }