Merge pull request #39 from GetScatter/master

Fixes for FIO and EOSIO manual link accounts

Author: nsjames

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bridge",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "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/Popups.vue

@@ -30,6 +30,7 @@
 							<EnterSecurityCode      class="popin" :popin="popIn" :closer="closer(popIn)" v-if="popIn.data.type === 'enterSecurityCode'" />
 							<Stabilize              class="popin" :popin="popIn" :closer="closer(popIn)" v-if="popIn.data.type === 'stabilize'" />
 							<SelectList             class="popin" :popin="popIn" :closer="closer(popIn)" v-if="popIn.data.type === 'selectList'" />
+							<GetInput               class="popin" :popin="popIn" :closer="closer(popIn)" v-if="popIn.data.type === 'getInput'" />
 							<DiscardTokens          class="popin" :popin="popIn" :closer="closer(popIn)" v-if="popIn.data.type === 'discardTokens'" />
 							<GoPremium              class="popin" :popin="popIn" :closer="closer(popIn)" v-if="popIn.data.type === 'goPremium'" />
 							<EditNetworkAccount     class="popin" :popin="popIn" :closer="closer(popIn)" v-if="popIn.data.type === 'editNetworkAccount'" />
@@ -117,6 +118,7 @@
 			ResetScatter:() => import('../components/popups/ResetScatter'),
 			Stabilize:() => import('../components/popups/Stabilize'),
 			SelectList:() => import('../components/popups/SelectList'),
+			GetInput:() => import('../components/popups/GetInput'),
 			DeleteKeypair:() => import('../components/popups/DeleteKeypair'),
 			DeleteHistory:() => import('../components/popups/DeleteHistory'),
 			ShowTerms:() => import('../components/popups/ShowTerms'),

src/components/popups/EditNetworkAccount.vue

@@ -32,7 +32,8 @@
 
 				<figure class="action">
 					<figure class="bubble" @click="toggleAddingKey" :class="{'active':addingNewKey}">
-						<i class="fa fa-plus"></i>
+						<span v-if="!addingNewKey">Add key</span>
+						<span v-if="addingNewKey">Back</span>
 					</figure>
 				</figure>
 			</section>
@@ -76,6 +77,7 @@
 									<Button v-if="!key.external" v-tooltip="`Convert blockchains`" icon="fa fa-link" @click.native="convertKeypair(key)" />
 									<Button v-if="!isAccountlessChain" v-tooltip="`Refresh accounts`" icon="fa fa-sync-alt" :loading="loadingAccounts[key.unique()]" @click.native="refreshAccounts(key)" />
 									<Button v-if="detachedKey(key)" icon="fa fa-trash" v-tooltip="`Remove key`" @click.native="removeKey(key)" />
+									<Button v-if="tappedCtrl" icon="fa fa-user" v-tooltip="`Manually Link Account`" @click.native="manuallyLinkAccount(key)" />
 								</section>
 
 								<section class="accounts">
@@ -166,7 +168,14 @@
 			loadingAccounts:{},
 
 			accounts:{},
+			tappedCtrl:false,
 		}},
+		beforeMount(){
+			window.addEventListener("keydown", this.tapCtrl);
+		},
+		beforeDestroy(){
+			window.removeEventListener("keydown", this.tapCtrl);
+		},
 		created(){
 			this.keys.map(keypair => this.loadAccounts(keypair));
 
@@ -202,6 +211,26 @@
 			}
 		},
 		methods:{
+			async manuallyLinkAccount(keypair){
+				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';
+
+					this.select(Account.fromJson({
+						keypairUnique: keypair.unique(),
+						networkUnique: this.network.unique(),
+						name:account_name,
+						permission,
+						publicKey: keypair.publicKeys.find(x => x.blockchain === this.network.blockchain).key
+					}));
+				}))
+			},
+			tapCtrl(event){
+				if (event.keyCode === 17) {
+					this.tappedCtrl = !this.tappedCtrl;
+				}
+			},
 			detachedKey(keypair){
 				return !keypair.base;
 			},
@@ -448,28 +477,22 @@
 				right:20px;
 
 				.bubble {
-					width:40px;
-					height:40px;
+					padding:6px 12px;
 					background:$blue;
 					color:white;
-					font-size: 18px;
+					font-size: $font-size-tiny;
 					display:flex;
 					justify-content: center;
 					align-items: center;
-					border-radius:50%;
+					border-radius:4px;
 					cursor: pointer;
 
-					transition: transform 0.2s ease;
-
-					&:hover { transform:scale(1.1); }
-					&:active { transform:scale(0.9); }
+					backface-visibility: hidden;
 
-					&.active {
-						transform:rotateZ(45deg);
+					transition: background 0.2s ease;
 
-						&:hover { transform:rotateZ(45deg) scale(1.1); }
-						&:active { transform:rotateZ(45deg) scale(0.9); }
-					}
+					&:hover { background:$darkblue; }
+					&:active { background:$blue; }
 				}
 			}
 		}

src/components/popups/GetInput.vue

@@ -0,0 +1,68 @@
+<template>
+	<section class="get-input">
+
+		<section class="popup-content">
+			<figure class="title" v-html="title"></figure>
+			<figure class="sub-title" style="margin-top:-20px;">{{subTitle}}</figure>
+
+			<section class="input-container">
+				<Input style="margin-bottom:0;" :placeholder="placeholder" :label="label" :text="text" v-on:changed="x => text = x"  />
+			</section>
+		</section>
+
+		<section class="popup-buttons">
+			<Button @click.native="closer(null)" text="Cancel" />
+			<Button primary="1" @click.native="closer(text)" text="Done" />
+		</section>
+
+	</section>
+</template>
+
+<script>
+	import Popups from "../../util/Popups";
+	import PopupService from "../../services/utility/PopupService";
+
+	export default {
+		props:['popin', 'closer'],
+		data(){return {
+			text:'',
+		}},
+		computed:{
+			title(){
+				return this.popin.data.props.title;
+			},
+			subTitle(){
+				return this.popin.data.props.subTitle;
+			},
+			placeholder(){
+				return this.popin.data.props.placeholder || '';
+			},
+			label(){
+				return this.popin.data.props.label || '';
+			},
+		},
+		methods:{
+
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+	@import "../../styles/variables";
+
+	.get-input {
+		max-width:380px;
+		width:calc(100% - 80px);
+		margin:0 auto;
+
+		.sub-title {
+			font-size: $font-size-small;
+		}
+
+		.input-container {
+			margin-top:40px;
+		}
+	}
+
+
+</style>

src/components/popups/Transfer.vue

@@ -167,7 +167,7 @@
 
 					const fioRecipient = (await getFioRecipient(this.token.symbol) || await getFioRecipient(this.token.network().systemToken().symbol));
 
-					if (!fioRecipient) return PopupService.push(Popups.snackbar(`The identity you entered does not exist, or does not accept these tokens.`));
+					if (!fioRecipient || fioRecipient.toString() === "0") return PopupService.push(Popups.snackbar(`The identity or FIO address you entered does not exist, or does not accept these tokens.`));
 					recipient = fioRecipient;
 
 				} else {

src/components/popups/fio/ManageFioAddresses.vue

@@ -10,7 +10,7 @@
 					<figure class="name">{{network.name}}</figure>
 					<figure class="action">
 						<Button v-if="!fioData[network.unique()]" text="Attach" @click.native="linkNetwork(network)" />
-						<Button v-if="fioData[network.unique()]" primary="1" disabled="1" text="Linked" />
+						<Button v-if="fioData[network.unique()]" primary="1" text="Detach" @click.native="unlinkNetwork(network)" />
 					</figure>
 				</section>
 			</section>
@@ -68,7 +68,7 @@
 						address:await plugin.recipientToSendable(this.account.network(), this.account.fio_address, network.blockchain, network.systemToken().symbol).catch(() => null)
 					};
 				})).then(x => x.reduce((acc, y) => {
-					acc[y.network.unique()] = y.address;
+					acc[y.network.unique()] = y.address === null ? false : y.address.toString() === '0' ? false : y.address;
 					return acc;
 				}, {}));
 			},
@@ -84,7 +84,19 @@
 				}).then(x => {
 					this.syncData();
 				});
-
+			},
+			async unlinkNetwork(network){
+				const plugin = PluginRepository.plugin(Blockchains.FIO);
+				await plugin.linkAddress(this.account, [{
+					"chain_code": network.blockchain.toUpperCase(),
+					"token_code": network.systemToken().symbol.toUpperCase(),
+					"public_address": "0"
+				}]).catch(err => {
+					PopupService.push(Popups.snackbar(err.error));
+					return false
+				}).then(x => {
+					this.syncData();
+				});
 			},
 		},
 	}

src/components/popups/fio/RequestFioTokens.vue

@@ -93,7 +93,6 @@
 				const sharedSecret = await window.wallet.createSharedSecret('fio', this.account.publicKey, recipientPublicKey);
 				const encrypted = await plugin.encrypt('new_funds_content', content, sharedSecret);
 
-				// this.getCipherContent('new_funds_content', this.content, this.privateKey, this.payerFioPublicKey);
 				const requested = await plugin.requestFunds(this.account, this.recipient, encrypted).catch(() => null);
 				if(requested && requested.hasOwnProperty('transaction_id')){
 					PopupService.push(Popups.transactionSuccess(this.account.blockchain(), requested.transaction_id));