From fbd50d25e4645cbc65b785407ce638ff62213fdc Mon Sep 17 00:00:00 2001
From: adityapk <adityapk@gmail.com>
Date: Thu, 16 Jul 2020 21:04:28 -0700
Subject: [PATCH 1/4] Viewing key import

---
 app/components/Sidebar.js | 2 +-
 app/rpc.js                | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/components/Sidebar.js b/app/components/Sidebar.js
index d746ea64..ed233082 100644
--- 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' }}>
diff --git a/app/rpc.js b/app/rpc.js
index 27907841..76cfbee6 100644
--- 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);

From e6a7d5210644fff09f689c4ab43c79e60ff39a95 Mon Sep 17 00:00:00 2001
From: adityapk <adityapk@gmail.com>
Date: Thu, 16 Jul 2020 21:19:18 -0700
Subject: [PATCH 2/4] remove bad template

---
 .github/ISSUE_TEMPLATE/1-Bug_report.md | 64 --------------------------
 1 file changed, 64 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE/1-Bug_report.md

diff --git a/.github/ISSUE_TEMPLATE/1-Bug_report.md b/.github/ISSUE_TEMPLATE/1-Bug_report.md
deleted file mode 100644
index c6d5d687..00000000
--- a/.github/ISSUE_TEMPLATE/1-Bug_report.md
+++ /dev/null
@@ -1,64 +0,0 @@
----
-name: Bug report
-about: You're having technical issues.
-labels: 'bug'
----
-
-<!-- Please use the following issue template or your issue will be closed. -->
-
-<!--- Provide a general summary of the issue in the Title above -->
-
-## Prerequisites
-
-<!-- If the following boxes are not ALL checked, your issue is likely to be closed. -->
-
-- [ ] Using yarn
-- [ ] Using node 10.x
-- [ ] Using an up-to-date [`master` branch](https://github.com/electron-react-boilerplate/electron-react-boilerplate/tree/master)
-- [ ] Using latest version of devtools. See [documentation for how to update](https://electron-react-boilerplate.js.org/docs/dev-tools)
-- [ ] Link to stacktrace in a Gist (for bugs)
-- [ ] For issue in production release, devtools output of `DEBUG_PROD=true yarn build && yarn start`
-- [ ] Tried solutions mentioned in [#400](https://github.com/electron-react-boilerplate/electron-react-boilerplate/issues/400)
-
-## Expected Behavior
-
-<!--- If you're describing a bug, tell us what should happen -->
-<!--- If you're suggesting a change/improvement, tell us how it should work -->
-
-## Current Behavior
-
-<!--- If describing a bug, tell us what happens instead of the expected behavior -->
-<!--- If suggesting a change/improvement, explain the difference from current behavior -->
-
-## Possible Solution
-
-<!--- Not obligatory, but suggest a fix/reason for the bug, -->
-<!--- or ideas how to implement the addition or change -->
-
-## Steps to Reproduce (for bugs)
-
-<!--- Provide a link to a live example, or an unambiguous set of steps to -->
-<!--- reproduce this bug. Include code to reproduce, if relevant -->
-
-1.
-
-2.
-
-3.
-
-4.
-
-## Context
-
-<!--- How has this issue affected you? What are you trying to accomplish? -->
-<!--- Did you make any changes to the boilerplate after cloning it? -->
-<!--- Providing context helps us come up with a solution that is most useful in the real world -->
-
-## Your Environment
-
-<!--- Include as many relevant details about the environment you experienced the bug in -->
-
-- Node version :
-- Version or Branch used :
-- Operating System and version :
-- Link to your project :

From f86c3adb73b90aaa5468e9fa4eadb8bfd7309451 Mon Sep 17 00:00:00 2001
From: adityapk <adityapk@gmail.com>
Date: Thu, 16 Jul 2020 21:20:22 -0700
Subject: [PATCH 3/4] bug template. Fixes #272

---
 .../{issue_template.md => 1-issue_template.md}      | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)
 rename .github/ISSUE_TEMPLATE/{issue_template.md => 1-issue_template.md} (80%)

diff --git a/.github/ISSUE_TEMPLATE/issue_template.md b/.github/ISSUE_TEMPLATE/1-issue_template.md
similarity index 80%
rename from .github/ISSUE_TEMPLATE/issue_template.md
rename to .github/ISSUE_TEMPLATE/1-issue_template.md
index ff58b3ec..752c97c4 100644
--- a/.github/ISSUE_TEMPLATE/issue_template.md
+++ b/.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.

From 2bab665c8704bd80d0a77fc51e6956e599cc0ca4 Mon Sep 17 00:00:00 2001
From: Aditya Kulkarni <adityapk@gmail.com>
Date: Fri, 17 Jul 2020 11:30:11 -0700
Subject: [PATCH 4/4] minor ui

---
 app/components/Sidebar.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/components/Sidebar.js b/app/components/Sidebar.js
index d746ea64..0781665b 100644
--- a/app/components/Sidebar.js
+++ b/app/components/Sidebar.js
@@ -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}