Merge pull request #297 from Lamden/fix-misc

Fix misc

Author: JeffWScott

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lamden-wallet",
-  "version": "2.5.1",
+  "version": "2.5.2",
   "description": "A secure wallet for making transactions on the Lamden blockchain.",
   "author": "Jeff Scott <[email protected]>",
   "license": "",

src/js/backgroundControllers/accountsController.js

@@ -64,8 +64,9 @@ export const accountsController = (utils) => {
 
     const createKeystore = async (info) => {
         let { accountStore } = await getAccountsData()
+        let list = await decryptedKeys(accountStore)
         return JSON.stringify({
-            data: utils.encryptObject(info.pwd, {'version' : info.version, keyList: await decryptedKeys(accountStore).filter(f =>f.type !== "vault" && !f.sk.includes("watchOnly"))}),
+            data: utils.encryptObject(info.pwd, {'version' : info.version, keyList: list.filter(f =>f.type !== "vault" && !f.sk.includes("watchOnly"))}),
             w: info.hint === "" ? "" : utils.encryptStrHash(info.obscure, info.hint),
         });
     }

src/js/backgroundControllers/masterController.js

@@ -487,7 +487,7 @@ export const masterController = () => {
           success: false,
         };
 
-      let sk = accounts.decryptString(account.sk);
+      let sk = accounts.decryptString(account.sk, data.password);
       return {
         success: true,
         data: { ...account, sk },

src/js/latest_event.json

@@ -1,19 +1,28 @@
 {
-	"title": "Change Password Hotfix",
+	"title": "Misc Hotfixes",
 	"type": "hotfix",
-	"version": "2.5.1",
+	"version": "2.5.2",
+	"date_added": 1687289535452,
 	"body": [
-		"Hotfix for the change password bug."
+		"Hotfix 2.5.1 for the change password bug.",
+		"Hotfix 2.5.2 for viewing the private key of a wallet via options.",
+		"Hotfix 2.5.2 fixes Node Dashboard bug in masternode policy UI."
 	],
 	"buttons": [
 		{
 			"class": "primary",
 			"link": "https://github.com/Lamden/wallet/releases/tag/v2.5.1",
-			"name": "Release Info"
+			"name": "Release Info v2.5.1"
+		},
+		{
+			"class": "primary",
+			"link": "https://github.com/Lamden/wallet/releases/tag/v2.5.2",
+			"name": "Release Info v2.5.2"
 		}
 	],
-	"date_added": 1686843863024,
 	"fixes": [
-		"The change password feature would change the loging password but fail to re-encrypt the keys in the legacy vault storage."
+		"The change password feature would change the loging password but fail to re-encrypt the keys in the legacy vault storage.",
+		"The view private key button in the account options didn't work and now does.",
+		"The masternode policy was always OPEN and never closed after completed motion."
 	]
 }

src/js/stores/policyStore.js

@@ -227,7 +227,7 @@ const getCurrentMasterNodeMotion = async () => {
         positions: []
     }
     let stamp = utils.decodePythonTime(data.motion_opened, "time") + 86400000
-    if (data.motion_opened && stamp > new Date().getTime()) {
+    if (data.current_motion !== 0 && data.motion_opened && stamp > new Date().getTime()) {
         // starting
         motion.status = 1
     } else {

src/svelte/dashboard/DashboardMain.svelte

@@ -82,6 +82,12 @@
 
     }
 
+    const refresh = () => {
+        chrome.runtime.sendMessage({type: 'updateNodes'})
+        getStatics()
+        freshPolicy("all")
+    }
+
 </script>
 <style>
     .motion-header-name {
@@ -138,6 +144,13 @@
 {/each}
 </div>
 
+<Button id="refresh-dashboard"
+    margin={'0 0 .625rem 0'}
+    classes={'button__solid button__primary'}
+    name="Refresh" 
+    width={'200px'}
+    click={refresh} />  
+
 <div class="node-list">
     <div class="header header-text text-body1 weight-800">
         <div class="motion-header-name header-text">Policy List</div>