Merge pull request #456 from jplomas/reskin

Reskin

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 jobs:
   build_wallet:
     macos:
-      xcode: "9.0"
+      xcode: "12.2.0"
 
     steps:
       # Checkout repo
@@ -40,6 +40,10 @@ jobs:
       #     name: update npm to latest
       #     command: |
       #       npm i npm@latest -g
+      - run:
+          name: install snyk globally
+          command: |
+            npm i snyk -g && sudo chown -R $USER:$(id -gn $USER) /Users/distiller/.config
       - run:
           name: install dependencies
           command: |

.electrify/index.js

@@ -32,7 +32,7 @@ app.on('ready', function() {
     if (process.platform === 'darwin') {
       app.setAboutPanelOptions({
         applicationName: "QRL Wallet",
-        applicationVersion: "1.5.0",
+        applicationVersion: "1.6.0",
         version: "Electron 1.8.8",
         copyright: "Die QRL Stiftung, Zug Switzerland",
         credits: "The QRL Developers"

.gitignore

@@ -13,3 +13,4 @@ local.json
 /.deploy
 .DS_Store
 .snap
+/mainnet.json

.snyk

@@ -1,5 +1,5 @@
 # Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
-version: v1.14.1
+version: v1.13.5
 # ignores vulnerabilities until expiry date; change duration by modifying expiry date
 ignore:
   'npm:shelljs:20140723':
@@ -22,21 +22,21 @@ ignore:
     - meteor-node-stubs > crypto-browserify > create-ecdh > elliptic:
         reason: None given
         expires: '2020-03-30T09:35:41.982Z'
-      meteor-node-stubs > crypto-browserify > browserify-sign > elliptic:
-        reason: None given
-        expires: '2020-09-28T14:57:26.056Z'
     - meteor-node-stubs > crypto-browserify > browserify-sign > elliptic:
         reason: None given
         expires: '2020-03-30T09:35:41.982Z'
-      meteor-node-stubs > crypto-browserify > create-ecdh > elliptic:
-        reason: None given
-        expires: '2020-09-28T14:57:26.056Z'
     - meteor-node-stubs > crypto-browserify > browserify-sign > elliptic:
         reason: None given
         expires: '2020-05-05T09:42:09.703Z'
     - meteor-node-stubs > crypto-browserify > create-ecdh > elliptic:
         reason: None given
         expires: '2020-05-05T09:42:09.703Z'
+    - meteor-node-stubs > crypto-browserify > browserify-sign > elliptic:
+        reason: None given
+        expires: '2020-09-28T14:57:26.056Z'
+    - meteor-node-stubs > crypto-browserify > create-ecdh > elliptic:
+        reason: None given
+        expires: '2020-09-28T14:57:26.056Z'
   'npm:plist:20180219':
     - electrify-qrl > electron-packager > plist:
         reason: None given
@@ -45,9 +45,6 @@ ignore:
     - grpc > node-pre-gyp > mkdirp > minimist:
         reason: None given
         expires: '2020-05-05T09:42:09.702Z'
-      ledger-qrl-js > mocha > mkdirp > minimist:
-        reason: None given
-        expires: '2020-09-28T14:57:26.056Z'
     - grpc > node-pre-gyp > tar > mkdirp > minimist:
         reason: None given
         expires: '2020-05-05T09:42:09.702Z'
@@ -60,6 +57,9 @@ ignore:
     - xolvio-sync-webdriverio > webdriverio > optimist > minimist:
         reason: None given
         expires: '2020-05-05T09:42:09.703Z'
+    - ledger-qrl-js > mocha > mkdirp > minimist:
+        reason: None given
+        expires: '2020-09-28T14:57:26.056Z'
   'npm:hoek:20180212':
     - phantomjs-prebuilt > request > hawk > cryptiles > boom > hoek:
         reason: None given

client/head.html

@@ -2,5 +2,5 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>QRL Wallet</title>
   <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
-  <link rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3/build/web/hack-subset.css">
+  <!-- <l ink rel="stylesheet" href="//cdn.jsdelivr.net/npm/hack-font@3/build/web/hack-subset.css"> -->
 </head>

client/site/globals/site.variables.import.less

@@ -13,13 +13,13 @@
 @pageFont          : @fontName, 'Helvetica Neue', Arial, Helvetica, sans-serif;
 
 @googleFontName    : @fontName;
-@importGoogleFonts : true;
+@importGoogleFonts : false;
 @googleFontSizes   : '400,700,400italic,700italic';
 @googleSubset      : 'latin';
 
-@googleProtocol    : 'https://';
+/* @googleProtocol    : 'https://';
 @googleFontRequest : '@{googleFontName}:@{googleFontSizes}&subset=@{googleSubset}';
-
+*/
 /*-------------------
       Base Sizes
 --------------------*/

client/themes/default/globals/site.variables.import.less

@@ -17,13 +17,13 @@
 @pageFont          : @fontName, 'Helvetica Neue', Arial, Helvetica, sans-serif;
 
 @googleFontName    : @fontName;
-@importGoogleFonts : true;
+@importGoogleFonts : false;
 @googleFontSizes   : '400,700,400italic,700italic';
 @googleSubset      : 'latin';
 
-@googleProtocol    : 'https://';
+/* @googleProtocol    : 'https://';
 @googleFontRequest : '@{googleFontName}:@{googleFontSizes}&subset=@{googleSubset}';
-
+*/
 /*-------------------
       Base Sizes
 --------------------*/

devnet.json

@@ -19,5 +19,5 @@
       }
     ]
   },
-  "allowUnchecksummedNodes": false
+  "allowUnchecksummedNodes": true
 }

imports/startup/both/index.js

@@ -13,7 +13,7 @@ import './nodes.js'
 SHOR_PER_QUANTA = 1000000000
 
 // qrl-wallet Version
-WALLET_VERSION = '1.5.1'
+WALLET_VERSION = '1.6.0'
 
 // qrl.proto sha256 sum for each release of QRL Node
 QRLPROTO_SHA256 = [

imports/startup/client/functions.js

@@ -442,6 +442,7 @@ getBalance = (getAddress, callBack) => {
       Session.set('otsKeysRemaining', 0)
       Session.set('otsBitfield', {})
       Session.set('errorLoadingTransactions', true)
+      Session.set('loadingTransactions', false)
     } else {
       if (res.state.address !== '') {
         Session.set('transferFromBalance', res.state.balance / SHOR_PER_QUANTA)
@@ -520,6 +521,7 @@ getBalance = (getAddress, callBack) => {
         }
       }
     }
+    updateBalanceField()
   })
 }
 
@@ -670,6 +672,7 @@ updateBalanceField = () => {
       })
     }
   } catch (error) {
+    console.log('error caught:', error)
     // not in main transfer page, so use transferFromBalance session
     Session.set('balanceAmount', Session.get('transferFromBalance'))
     Session.set('balanceSymbol', 'Quanta')

imports/startup/server/index.js

@@ -20,6 +20,8 @@ BrowserPolicy.content.allowStyleOrigin('fonts.googleapis.com')
 BrowserPolicy.content.allowFontOrigin('cdn.jsdelivr.net')
 BrowserPolicy.content.allowStyleOrigin('cdn.jsdelivr.net')
 BrowserPolicy.content.allowFontOrigin('fonts.gstatic.com')
+BrowserPolicy.content.allowFontOrigin('fonts.cdnfonts.com')
+BrowserPolicy.content.allowStyleOrigin('fonts.cdnfonts.com')
 BrowserPolicy.content.allowFontDataUrl()
 BrowserPolicy.content.allowDataUrlForAll()
 
@@ -1829,7 +1831,6 @@ Meteor.methods({
     let output
     // asynchronous call to API
     const response = Meteor.wrapAsync(getTxnHash)(request)
-
     if (response.transaction.tx.transactionType === 'transfer_token') {
       // Request Token Decimals / Symbol
       const symbolRequest = {

imports/ui/layouts/body/body.html

@@ -5,8 +5,7 @@
     <!-- Main Menu -->
     <div class="ui visible left vertical inverted sidebar labeled icon menu">
         <a href="/" class="item logoArea">
-        <img class="main-menu-logo" src="/img/qrl-logo-white.png" />
-        QRL
+        <img class="main-menu-logo" src="/img/qrl-full-logo.svg" />
       </a>
         <a id="newWalletButton" href="/create" class="item main-menu-btn {{menuNewWalletActive}}">
         <img class="icon svg" src="/img/icons/new-wallet.svg" />
@@ -50,7 +49,7 @@
     <!-- Content Wrapper -->
     <div class="main-content-wrapper">
         <!-- Top Message Bar -->
-        <div class="main-content-warning ui fixed secondary menu">
+        <div class="main-content-warning ui fixed secondary menu" style="display: none;">
             <div class="center menu">
                 <div class="ui item">
                     <a href="https://medium.com/the-quantum-resistant-ledger/last-week-in-qrl-may-21st-27th-fa8fb1017e02#1150"><div class="ui icon tiny message">
@@ -135,11 +134,11 @@ <h3 class="ui header pageHeader">
                   {{walletStatus.address}}
                 </div>
                 <div class="ui two column grid">
-                  <div class="column">
+                  <div class="column" style="z-index: -99;">
                     {{#if inProgress}}<div class="ui active inline mini loader"></div>{{/if}}
                     <small>{{balanceAmount}} {{balanceSymbol}}</small>
                   </div>
-                  <div class="column">
+                  <div class="column" style="z-index: -99;">
                     {{#if inProgress}}<div class="ui active inline mini loader"></div>{{/if}}
                     <small>{{otsKeysRemaining}} OTS keys remaining</small>
                   </div>
@@ -154,7 +153,7 @@ <h3 class="ui header pageHeader">
                     <div class="footer">
                         <div class="ui center aligned container">
                             <a href="/">
-                  <img class="footerLogo" src="/img/Q@2x.png">
+                  <img class="footerLogo" src="/img/qrl-logo-dark.png">
                 </a>
                             <br />
                             <div class="ui horizontal small divided link list">

imports/ui/layouts/body/body.js

@@ -304,7 +304,11 @@ Template.appBody.helpers({
     return Session.get('transferFromBalance')
   },
   otsKeysRemaining() {
+    if (Session.get('errorLoadingTransactions')) {
+      return 'unknown'
+    }
     return Session.get('otsKeysRemaining')
+
   },
   balanceSymbol() {
     return Session.get('balanceSymbol')

imports/ui/mobile/mobile.html

@@ -4,23 +4,23 @@
     <div class="ui labeled icon bottom fixed {{menuItemsCount
   }} item menu">
 
-        <a id="newWalletButton" href="/create" class="item">
+        <a id="newWalletButton" href="/create" class="item {{menuNewWalletActive}}">
           <img class="svg" src="/img/icons/new-wallet.svg" />
           New
         </a>
 
 
-        <a id="openWalletButton" href="/open" class="item">
+        <a id="openWalletButton" href="/open" class="item {{menuOpenWalletActive}}">
           <img class="svg" src="/img/icons/open-wallet.svg" />
           Open
         </a>
 
-        <a id="closeWalletButton" href="/close" class="item">
+        <a id="closeWalletButton" href="/close" class="item {{menuCloseWalletActive}}">
           <img class="svg" src="/img/icons/lock.svg" />
           Close
         </a>
 
-        <a id="sendAndReceiveButton" href="/transfer" class="item">
+        <a id="sendAndReceiveButton" href="/transfer" class="item {{menuTransferActive}}">
           <img class="svg" src="/img/icons/transfer.svg" />
           Send &amp;<br />Receive
         </a>
@@ -36,7 +36,7 @@
         Tools
       </a>
 
-        <a id="verifyButton" href="/verify" class="item">
+        <a id="verifyButton" href="/verify" class="item {{menuVerifyActive}}">
           <img class="svg" src="/img/icons/tick.svg" />
           Verify<br />Transaction
         </a>
@@ -61,7 +61,7 @@
     <div class="footer">
       <div class="ui center aligned container">
         <a href="/">
-                  <img class="footerLogo" src="/img/Q@2x.png">
+                  <img class="footerLogo" src="/img/qrl-logo-dark.png">
                 </a>
         <br />
         <div class="ui horizontal small divided link list">

imports/ui/mobile/mobile.js

@@ -6,6 +6,9 @@
 /* global POLL_TXN_RATE, POLL_MAX_CHECKS, DEFAULT_NETWORKS, findNetworkData, SHOR_PER_QUANTA, WALLET_VERSION, QRLPROTO_SHA256,  */
 
 import './mobile.html'
+import {
+  isElectrified,
+} from '../../startup/client/functions'
 
 BlazeLayout.setRoot('body')
 
@@ -288,4 +291,60 @@ Template.mobile.helpers({
   customNodeName() {
     return LocalStore.get('customNodeName')
   },
+  /* Active Menu Item Helpers */
+  menuNewWalletActive() {
+    if (
+      (FlowRouter.getRouteName() === 'App.home')
+      || (FlowRouter.getRouteName() === 'App.create')
+      || (FlowRouter.getRouteName() === 'App.createAddress')) {
+      return 'active'
+    }
+    return ''
+  },
+  menuOpenWalletActive() {
+    if (
+      (FlowRouter.getRouteName() === 'App.open')
+      || (FlowRouter.getRouteName() === 'App.opened')) {
+      return 'active'
+    }
+    return ''
+  },
+  menuCloseWalletActive() {
+    if (
+      (FlowRouter.getRouteName() === 'App.close')
+      || (FlowRouter.getRouteName() === 'App.closed')) {
+      return 'active'
+    }
+    return ''
+  },
+  menuTransferActive() {
+    if (
+      (FlowRouter.getRouteName() === 'App.transfer')) {
+      return 'active'
+    }
+    return ''
+  },
+  menuTokensActive() {
+    if (
+      (FlowRouter.getRouteName() === 'App.tokens')
+      || (FlowRouter.getRouteName() === 'App.tokensView')
+      || (FlowRouter.getRouteName() === 'App.tokensCreate')
+      || (FlowRouter.getRouteName() === 'App.tokenCreationConfirm')
+      || (FlowRouter.getRouteName() === 'App.tokenCreationResult')
+      || (FlowRouter.getRouteName() === 'App.tokensTransfer')
+      || (FlowRouter.getRouteName() === 'App.tokensTransferLoad')
+      || (FlowRouter.getRouteName() === 'App.tokensTransferConfirm')
+      || (FlowRouter.getRouteName() === 'App.tokensTransferResult')) {
+      return 'active'
+    }
+    return ''
+  },
+  menuVerifyActive() {
+    if (
+      (FlowRouter.getRouteName() === 'App.verify')
+      || (FlowRouter.getRouteName() === 'App.verifytxid')) {
+      return 'active'
+    }
+    return ''
+  },
 })

imports/ui/pages/close/close.html

@@ -20,7 +20,7 @@ <h2 id="closeWallet" class="ui center aligned icon header">
       <i class="warning icon"></i>
       <div class="content">
         <div class="header">
-          
+
         </div>
         <p>The XMSS tree on the Ledger device has changed.  Please re-open the wallet to use functions for this XMSS tree.</p>
       </div>

imports/ui/pages/create/address.html

@@ -107,4 +107,4 @@ <h4 class="ui header">Hexseed</h4>
   </div>
 </div>
 
-</template>
+</template>

imports/ui/pages/tools/keybase/keybaseConfirm.html

@@ -66,7 +66,7 @@ <h3>Error communicating with Ledger Nano. To save an OTS Key, you should reject
 </div>
 
 <h2 class="ui header pageHeader">
-  <i class="icon"><img src="/img/keybase.svg"></i>
+  <i class="icon"><img src="/img/keybase-w.svg"></i>
   <div class="content">
     Keybase Confirmation
   </div>

imports/ui/pages/tools/keybase/keybaseCreate.html

@@ -96,10 +96,10 @@ <h2 class="ui header pageHeader">
     <h4 class="ui dividing header">Add or remove Keybase identity</h4>
 
     <h4 id="transferFormFromAddress" class="breakable"><a class="ui purple label">From Address</a> {{transferFrom.address}}</h4>
-    <h4 class="breakable"><a class="ui yellow label">Quanta Balance</a> {{transferFrom.balance}}</h4>
+    <h4 class="breakable"><a class="ui yellow label">Quanta Balance</a> <span class="med">{{transferFrom.balance}}</span></h4>
 
     <h4 class="ui horizontal divider header">
-      <img src="/img/keybase.svg">
+      <img src="/img/keybase-w.svg">
       Keybase ID
     </h4>