Merge pull request #52 from GetScatter/master

Fixes for hardware, public key copying, and PINs.
GetScatter · Aug 13, 2020 · 8b5561a · 8b5561a
2 parents 083b74d + 4815160
commit 8b5561a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bridge",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "private": true,
   "scripts": {
     "build": "npm run check && yarn && cross-env NODE_ENV=production BABEL_ENV=prod vue-cli-service build && npm run zip",

diff --git a/src/components/popups/ManageKeys.vue b/src/components/popups/ManageKeys.vue
@@ -41,7 +41,7 @@
 					<Button v-if="canUseHardware" text="Import From Hardware" primary="1" @click.native="importingHardware = true" />
 				</section>
 
-				<ImportHardware v-if="importingHardware" :blockchain="network.blockchain" v-on:imported="importedHardware" />
+				<ImportHardware v-if="importingHardware" :blockchain="blockchain" v-on:imported="importedHardware" />
 			</section>
 
 			<section v-if="!addingNewKey">
@@ -220,7 +220,7 @@
 				this.addingNewKey = false;
 			},
 			async copyPublicKey(keypair){
-				window.wallet.utility.copy(keypair.publicKeys.find(x => x.blockchain === this.blockchain).key);
+				window.wallet.utility.copy(keypair.publicKeys.find(x => x.blockchain === keypair.blockchains[0]).key);
 				PopupService.push(Popups.snackbar('Your public key was copied to your clipboard.'))
 			},
 			async exportKey(keypair, bypassPassword = false){

diff --git a/src/services/utility/PasswordHelpers.js b/src/services/utility/PasswordHelpers.js
@@ -5,12 +5,13 @@ import {Popup} from "../../models/popups/Popup";
 export default class PasswordHelpers {
 
 	static async verifyPIN(){
-		if(!StoreService.get().state.scatter.pin || !StoreService.get().state.scatter.pin.length) return true;
-		return new Promise(resolve => {
-			PopupService.push(Popup.enterPIN(verified => {
-				resolve(verified);
-			}))
-		})
+		return true;
+		// if(!StoreService.get().state.scatter.pin || !StoreService.get().state.scatter.pin.length) return true;
+		// return new Promise(resolve => {
+		// 	PopupService.push(Popup.enterPIN(verified => {
+		// 		resolve(verified);
+		// 	}))
+		// })
 	}
 
-}
+}