Merge pull request #81 from adshares/develop

v0.4.5

CHANGELOG.md

@@ -5,6 +5,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+## [0.4.5] - 2021-11-22
+### Added
+- Unwrap link
+### Removed
+- New tab proxy option
+### Fixed
+- Missing secret key error
+
 ## [0.4.4] - 2021-11-15
 ### Changed
 - Prevent importing accounts without keys
@@ -100,8 +109,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Storage encryption
 - Docs
 
-[Unreleased]: https://github.com/adshares/ads-browser-wallet/compare/v0.4.4...HEAD
+[Unreleased]: https://github.com/adshares/ads-browser-wallet/compare/v0.4.5...HEAD
 
+[0.4.5]: https://github.com/adshares/ads-browser-wallet/compare/v0.4.4...v0.4.5
 [0.4.4]: https://github.com/adshares/ads-browser-wallet/compare/v0.4.3...v0.4.4
 [0.4.3]: https://github.com/adshares/ads-browser-wallet/compare/v0.4.2...v0.4.3
 [0.4.2]: https://github.com/adshares/ads-browser-wallet/compare/v0.4.1...v0.4.2

app/components/atoms/Box.css

@@ -12,7 +12,7 @@
 }
 
 .box hr {
-    background-color: var(--white);
+    border-color: var(--white);
 }
 
 .box.info {
@@ -42,7 +42,7 @@
 }
 
 .box.inverse hr {
-    background-color: var(--slate-dark);
+    border-color: var(--slate-dark);
 }
 
 .box.inverse > .icon {
@@ -55,7 +55,7 @@
 }
 
 .box.inverse.info hr {
-    background-color: var(--blue-dark);
+    border-color: var(--blue-dark);
 }
 
 .box.inverse.success {
@@ -64,7 +64,7 @@
 }
 
 .box.inverse.success hr {
-    background-color: var(--green-dark);
+    border-color: var(--green-dark);
 }
 
 .box.inverse.warning {
@@ -73,7 +73,7 @@
 }
 
 .box.inverse.warning hr {
-    background-color: var(--yellow-dark);
+    border-color: var(--yellow-dark);
 }
 
 .box.inverse.danger {
@@ -82,7 +82,7 @@
 }
 
 .box.inverse.danger hr {
-    background-color: var(--red-dark);
+    border-color: var(--red-dark);
 }
 
 .box .content {

app/config/config.js

@@ -35,6 +35,7 @@ const config = {
   privacyUrl: 'https://adshares.net/wallet.html#privacy',
   attributionsUrl: 'https://adshares.net/wallet.html#attributions',
   freeCoinsUrl: 'https://github.com/adshares/ads/wiki/How-to-join-the-Testnet#get-free-test-coins',
+  unwrapUrl: 'https://wallet.adshares.net/',
   about: require('./about'),
   terms: require('./terms'),
   attributions: require('./attributions'),

app/containers/Transactions/AuthenticateForm.js

@@ -20,7 +20,7 @@ export default class AuthenticateForm extends SignForm {
   }
 
   static getDerivedStateFromProps(props, state) {
-    const { accounts, keys, selectedAccount, accountsLoaded } = props.vault;
+    const { accounts, keys, selectedAccount } = props.vault;
     const account = accounts.find(
       a => a.address === selectedAccount
     );
@@ -30,7 +30,7 @@ export default class AuthenticateForm extends SignForm {
         k => k.publicKey === account.publicKey
       );
     }
-    return { account, key, keyError: !key && accountsLoaded, };
+    return { account, key, keyError: !key };
   }
 
   getCommand() {

app/containers/Transactions/AvailableGatewaysPage.js

@@ -9,6 +9,7 @@ import Page from '../../components/Page/Page';
 import Box from '../../components/atoms/Box';
 import ButtonLink from '../../components/atoms/ButtonLink';
 import PageComponent from '../../components/PageComponent';
+import config from '../../config/config';
 
 class AvailableGatewaysPage extends PageComponent {
   static propTypes = {
@@ -30,7 +31,9 @@ class AvailableGatewaysPage extends PageComponent {
         {gateways.map(gateway =>
           <ButtonLink
             key={gateway.code}
-            icon="left" layout="info" inverse
+            icon="left"
+            layout="info"
+            inverse
             to={{
               pathname: `/transactions/gateways/${gateway.code}`,
               state: { referrer: this.props.history.location }
@@ -39,6 +42,18 @@ class AvailableGatewaysPage extends PageComponent {
             <FontAwesomeIcon icon={faRandom} /> {gateway.name}
           </ButtonLink>
         )}
+        <hr className="dashed" />
+        <ButtonLink
+          className={style.unwrap}
+          icon="left"
+          layout="info"
+          external
+          target="_blank"
+          rel="noopener noreferrer"
+          href={config.unwrapUrl}
+        >
+          <FontAwesomeIcon icon={faRandom} /> Unwrap
+        </ButtonLink>
       </div>
     );
   }

app/containers/Transactions/SignForm.js

@@ -55,7 +55,7 @@ export default class SignForm extends FormComponent {
       command,
       dataError: !command,
       key,
-      keyError: !key && vault.accountsLoaded,
+      keyError: !key,
     };
   }
 
@@ -494,7 +494,7 @@ export default class SignForm extends FormComponent {
       return this.renderKeyErrorPage();
     }
 
-    const showLoader = this.props.showLoader || !this.props.vault.accountsLoaded;
+    const showLoader = this.props.showLoader;
 
     return (
       <Page

app/containers/Transactions/style.css

@@ -123,3 +123,13 @@
 .availableLinks > *:nth-child(odd) {
 
 }
+
+.availableLinks hr {
+    margin-bottom: 18px;
+    border-color: var(--blue-dark);
+    border-style: dashed;
+}
+
+.unwrap svg {
+    transform: rotatey(180deg);
+}

app/reducers/VaultReducer.js

@@ -19,7 +19,6 @@ const initialVault = {
   seed: '',
   keys: [],
   keyCount: config.initKeysQuantity,
-  accountsLoaded: false,
   accounts: [],
   selectedAccount: null,
   nodes: [],
@@ -244,11 +243,14 @@ export default function (vault = initialVault, action) {
         ...a,
         ...action.account
       } : a);
-      return {
+
+      const updatedVault = {
         ...vault,
-        accountsLoaded: true,
         accounts,
       };
+
+      updatedVault.secret = VaultCrypt.save(updatedVault);
+      return updatedVault;
     }
 
     case RETRIEVE_NODES_DATA_IN_INTERVALS_SUCCESS: {

app/utils/vaultcrypt.js

@@ -11,6 +11,7 @@ const KEY_NAME = 'n';
 const ACCOUNTS = 'a';
 const ACCOUNT_ADDRESS = 'a';
 const ACCOUNT_NAME = 'n';
+const ACCOUNT_PUBLIC_KEY = 'p';
 
 function checkPassword(vault, password) {
   try {
@@ -41,6 +42,7 @@ function encrypt(vault, password) {
         {
           [ACCOUNT_ADDRESS]: account.address,
           [ACCOUNT_NAME]: account.name,
+          [ACCOUNT_PUBLIC_KEY]: account.publicKey,
         }
       )),
   });
@@ -69,6 +71,7 @@ function decrypt(encryptedVault, password) {
       {
         address: account[ACCOUNT_ADDRESS],
         name: account[ACCOUNT_NAME],
+        publicKey: account[ACCOUNT_PUBLIC_KEY],
       }
     )),
   };

chrome/extension/adswallet.css

@@ -63,11 +63,12 @@ a:hover {
 }
 
 hr {
-  border: none;
+  border: 0;
+  border-top: 1px solid var(--gray-dark);
+  background: none;
   height: 1px;
-  background-color: var(--gray-dark);
 }
 
 code {
   overflow-wrap: anywhere;
-}
+}

chrome/extension/background/api_proxy.js

@@ -40,7 +40,7 @@ export default function handleMessage(message, sourceId, callback) {
         data: message.data,
         time: (new Date()).toISOString(),
       });
-      if (message.options.newTab) {
+      {
         const network = message.testnet ? '/testnet' : '/mainnet';
         const url = `window.html#${network}/transactions/${sourceId}/${message.id}/popup-sign`;
         openInTheNewTab(url);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adshares/ads-browser-wallet",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "display-name": "ADS Wallet",
   "description": "Secure identity vault for Adshares network.",
   "private": true,