Merge pull request #57 from GetScatter/master

manually link accounts

Author: nsjames

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bridge",
-  "version": "1.0.14",
+  "version": "1.0.15",
   "private": true,
   "scripts": {
     "build": "npm run check && yarn && cross-env NODE_ENV=production BABEL_ENV=prod vue-cli-service build && npm run zip",

src/components/ManageAccounts.vue

@@ -30,9 +30,14 @@
 							{{account.sendable()}}<span class="authority" v-if="account.authority">@{{account.authority}}</span>
 						</figure>
 
-						<figure class="select-account" :class="{'selected':enabledAccounts.find(x => x.unique() === account.unique())}" @click="select(account, network)">
-							<i class="fa fa-check"></i>
-						</figure>
+						<section style="display:flex;">
+							<figure class="select-account remove" @click="removeAccount(account, network)">
+								<i class="fa fa-times"></i>
+							</figure>
+							<figure class="select-account" :class="{'selected':enabledAccounts.find(x => x.unique() === account.unique())}" @click="select(account, network)">
+								<i class="fa fa-check"></i>
+							</figure>
+						</section>
 					</section>
 				</section>
 			</section>
@@ -45,6 +50,7 @@
 <script>
 	import { mapState, mapActions } from 'vuex'
 	import * as UIActions from "../store/ui_actions";
+	import * as Actions from "@walletpack/core/store/constants";
 	import SearchBar from "../components/reusable/SearchBar";
 	import Switcher from "../components/reusable/Switcher";
 	import SingularAccounts from "../services/utility/SingularAccounts";
@@ -156,9 +162,23 @@
 					SingularAccounts.setPredefinedAccount(network, account);
 				}
 			},
+			async removeAccount(account, network){
+				if(this.enabledAccounts.find(x => x.unique() === account.unique())){
+					SingularAccounts.setPredefinedAccount(network, null);
+				}
+
+				const cache = this.accountCache;
+				Object.keys(cache).map(network => {
+					this[UIActions.SET_ACCOUNT_CACHE]({key:network, value:cache[network].filter(x => x.unique() !== account.unique())});
+				});
+
+				this.setNetworkAccounts();
+				this.refreshAccounts();
+			},
 			...mapActions([
 				UIActions.SET_COLLAPSED_SIDEBAR,
 				UIActions.SET_ACCOUNT_CACHE,
+				Actions.SET_SCATTER,
 			])
 		},
 		watch:{
@@ -333,6 +353,27 @@
 									display:block;
 								}
 							}
+
+							&.remove {
+								border:2px solid transparent;
+								color:$red;
+								margin-right:2px;
+
+								i {
+									display:block;
+									font-size: 13px;
+								}
+
+								&.selected, &:hover {
+									background:$red;
+									color:white;
+									border:2px solid transparent;
+
+									i {
+										display:block;
+									}
+								}
+							}
 						}
 
 						.toggle {

src/components/popups/ManageKeys.vue

@@ -68,6 +68,7 @@
 										<Button v-tooltip="`Copy public key`" icon="fal fa-copy" @click.native="copyPublicKey(key)" />
 										<Button v-if="!key.external" v-tooltip="`Convert blockchains`" icon="fal fa-link" @click.native="convertKeypair(key)" />
 										<Button v-if="detachedKey(key)" icon="fal fa-ban" v-tooltip="`Remove key`" @click.native="removeKey(key)" />
+										<Button v-if="canManuallyLink(key)" icon="fal fa-user" v-tooltip="`Manually link account`" @click.native="manuallyLinkAccount(key)" />
 										<Button primary="1" v-if="!key.external" text="Export" icon="fal fa-key" @click.native="exportKey(key)" />
 									</section>
 
@@ -264,6 +265,38 @@
 					if(converted) PopupService.push(Popups.snackbar("Conversion successful. Check the network for the corresponding blockchain."))
 				}));
 			},
+			canManuallyLink(keypair){
+				return keypair.blockchains[0] === 'eos';
+			},
+			async manuallyLinkAccount(keypair){
+				const blockchain = keypair.blockchains[0];
+				const networks = this.scatter.settings.networks.filter(x => x.blockchain === blockchain);
+				PopupService.push(Popups.selectList('Select a <span>Network</span>', 'Select the type of blockchain you want to either create or import a key for.', networks, x => {
+					return x.name;
+				}, async network => {
+					if(!network) return;
+					PopupService.push(Popups.getInput('Manually Link Account', 'If you link an account that does not actually belong to this key, you will not be able to sign anything.', 'account name', 'What is the account name?', async name => {
+						if(!name || !name.length) return;
+						let [account_name, permission] = name.split('@');
+						if(!permission || !permission.length) permission = 'active';
+
+						const account = Account.fromJson({
+							keypairUnique: keypair.unique(),
+							networkUnique: network.unique(),
+							name:account_name,
+							authority:permission,
+							publicKey: keypair.publicKeys.find(x => x.blockchain === blockchain).key
+						});
+
+						await AccountService.addAccount(account);
+						SingularAccounts.setPredefinedAccount(network, account);
+						BalanceService.loadBalancesFor(account);
+						await SingularAccounts.refreshAccounts([network], [keypair]);
+						this.closer(true);
+					}))
+				}));
+
+			},
 			...mapActions([
 				Actions.SET_BALANCES,
 				Actions.REMOVE_BALANCES,

yarn.lock

@@ -1298,10 +1298,10 @@
     eosjs "^20.0.0"
     eosjs-ecc "^4.0.7"
 
-"@walletpack/ethereum@^0.0.59":
-  version "0.0.59"
-  resolved "https://registry.yarnpkg.com/@walletpack/ethereum/-/ethereum-0.0.59.tgz#f41bd920b41c7a462c67aa386062d7dd9a504fe2"
-  integrity sha512-2H8VlpyFG1VFbUzqcd5FF4r82vHTiROwXU048awcIqIie5ud2ps3lI/pp+Bc5nq/ZDkszdUsNUKp3+ookgJBBw==
+"@walletpack/ethereum@^0.0.60":
+  version "0.0.60"
+  resolved "https://registry.yarnpkg.com/@walletpack/ethereum/-/ethereum-0.0.60.tgz#e81a69a8bae08666270af6c4be195dfac69f50e1"
+  integrity sha512-Tr7xd5Eh5BOrok/w8mTf91B6ii1sIC9w74mI/YLQzpKRz2aQGMkTuu9BU8M1X/eAxZHLs1RSSg0mLnMIrozlIA==
   dependencies:
     "@walletpack/core" "^1.0.50"
     ethereumjs-tx "^2.1.0"