Merge branch 'master' of github.com:zcashfoundation/zecwallet

ZcashFoundation · Jul 21, 2020 · fdbe05a · fdbe05a
2 parents efffc29 + 7187054
commit fdbe05a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 74 deletions.
diff --git a/.github/ISSUE_TEMPLATE/1-Bug_report.md b/.github/ISSUE_TEMPLATE/1-Bug_report.md
diff --git a/.github/ISSUE_TEMPLATE/issue_template.md → .github/ISSUE_TEMPLATE/1-issue_template.md b/.github/ISSUE_TEMPLATE/issue_template.md → .github/ISSUE_TEMPLATE/1-issue_template.md
@@ -4,16 +4,14 @@ about: Create a report to help us improve
 title: ''
 labels: ''
 assignees: ''
-
----
-
-Please make sure you have the latest ZecWallet. 
+---Please make sure you have the latest ZecWallet.
 
 **Describe the bug**
 A clear and concise description of what the bug is.
 
 **To Reproduce**
 Steps to reproduce the behavior:
+
 1. Go to '...'
 2. Click on '....'
 3. Scroll down to '....'
@@ -23,9 +21,10 @@ Steps to reproduce the behavior:
 A clear and concise description of what you expected to happen.
 
 **Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
+
+- OS: [e.g. iOS]
+- Browser [e.g. chrome, safari]
+- Version [e.g. 22]
 
 **Additional context**
 Add any other context about the problem here.
diff --git a/app/components/Sidebar.js b/app/components/Sidebar.js
@@ -66,7 +66,7 @@ const ImportPrivKeyModal = ({ modalIsOpen, modalInput, setModalInput, closeModal
         </div>
 
         <div className={cstyles.marginbottomlarge}>
-          Please paste your private keys here (transparent address or shielded address), one line per key.
+          Please paste your private or viewing keys here (transparent address or shielded address), one line per key.
         </div>
 
         <div className={cstyles.well} style={{ textAlign: 'center' }}>
@@ -91,7 +91,7 @@ const ImportPrivKeyModal = ({ modalIsOpen, modalInput, setModalInput, closeModal
           Import
         </button>
         <button type="button" className={cstyles.primarybutton} onClick={closeModal}>
-          Close
+          Cancel
         </button>
       </div>
     </Modal>
@@ -488,7 +488,7 @@ class Sidebar extends PureComponent<Props, State> {
           actionCallback={this.payURI}
         />
 
-        {/* Payment URI Modal */}
+        {/* Import Private Key Modal */}
         <ImportPrivKeyModal
           modalIsOpen={privKeyModalIsOpen}
           setModalInput={this.setImprovPrivKeyInputValue}

diff --git a/app/rpc.js b/app/rpc.js
@@ -192,6 +192,14 @@ export default class RPC {
       } catch (err) {
         return err;
       }
+    } else if (key.startsWith('zxview')) {
+      try {
+        const r = await RPC.doRPC('z_importviewingkey', [key, rescan ? 'yes' : 'no'], this.rpcConfig);
+        console.log(r.result);
+        return '';
+      } catch (err) {
+        return err;
+      }
     } else {
       try {
         const r = await RPC.doRPC('importprivkey', [key, 'imported', rescan], this.rpcConfig);