fixes

nsjames · nsjames · commit ef2248e1e6ac · 2019-01-22T16:27:10.000+02:00
diff --git a/src/components/popins/fullscreen/EnableWhitelist.vue b/src/components/popins/fullscreen/EnableWhitelist.vue
@@ -1,9 +1,9 @@
 <template>
 	<section>
-		<section class="full-panel inner center-fold limited">
+		<section class="full-panel inner center-fold limited whitelist">
 			<section>
 				<section class="head">
-					<figure class="title">{{locale(langKeys.POPINS.FULLSCREEN.WHITELISTING.Title)}}</figure>
+					<!--<figure class="title">{{locale(langKeys.POPINS.FULLSCREEN.WHITELISTING.Title)}}</figure>-->
 					<p>
 						{{locale(langKeys.POPINS.FULLSCREEN.WHITELISTING.Desc)}}
 					</p>
@@ -19,15 +19,15 @@
 						<br>
 
 						<section class="mock-props">
-							<label>Amount <b class="red">( {{locale(langKeys.POPINS.FULLSCREEN.WHITELISTING.MutableProp)}} )</b></label>
+							<label>amount <b class="red">({{locale(langKeys.POPINS.FULLSCREEN.WHITELISTING.MutableProp)}})</b></label>
 							<section class="split-inputs">
 								<input checked disabled="true" type="checkbox" />
 								<figure class="value">1 TOKENS</figure>
 							</section>
 						</section>
 
 						<section class="mock-props">
-							<label>Recipient <b class="red">( {{locale(langKeys.POPINS.FULLSCREEN.WHITELISTING.ImmutableProp)}} )</b></label>
+							<label>recipient <b class="red">({{locale(langKeys.POPINS.FULLSCREEN.WHITELISTING.ImmutableProp)}})</b></label>
 							<section class="split-inputs">
 								<input disabled="true" type="checkbox" />
 								<figure class="value">xxxxxxxxxxxxx</figure>
@@ -39,8 +39,8 @@
 			</section>
 
 			<section class="action-bar short bottom centered">
-				<btn :text="locale(langKeys.GENERIC.Deny)" red="1" v-on:clicked="returnResult(false)" />
-				<btn :text="locale(langKeys.GENERIC.Confirm)" blue="1" v-on:clicked="returnResult(true)" />
+				<btn :text="locale(langKeys.GENERIC.Back)" v-on:clicked="returnResult(false)" />
+				<btn :text="locale(langKeys.GENERIC.Enable)" blue="1" v-on:clicked="returnResult(true)" />
 			</section>
 		</section>
 	</section>
@@ -94,6 +94,8 @@
 		border:1px solid rgba(0,0,0,0.1);
 		border-radius:4px;
 		margin-bottom:5px;
+		background:#fff;
+		color:$dark-grey;
 
 		input {
 			width:20px;
@@ -108,6 +110,18 @@
 		}
 	}
 
+	.whitelist {
+		background:$reverse-gradient;
+		color:#fff;
+	}
+
+	.head {
+		p {
+			color:rgba(255,255,255,0.65);
+			font-size: 13px;
+		}
+	}
+
 	.action-bar {
 		button {
 			width:auto;
diff --git a/src/components/popins/fullscreen/Exchange.vue b/src/components/popins/fullscreen/Exchange.vue
@@ -475,7 +475,7 @@
 
 					if(sent){
 						if(!TokenService.hasToken(this.pair.token)){
-							if(this.pair.token.contract && !this.pair.token.contract.length) {
+							if(!!this.pair.token.contract && !!this.pair.token.contract.length) {
 								await TokenService.addToken(this.pair.token, false, false);
 							}
 						}
diff --git a/src/migrations/versions/9.0.0.js b/src/migrations/versions/9.0.0.js
@@ -3,13 +3,17 @@ import {Blockchains} from '../../models/Blockchains'
 import {store} from '../../store/store'
 import Crypto from '../../util/Crypto';
 import {BlockchainsArray} from '../../models/Blockchains';
+import {ipcAsync} from "../../util/ElectronHelpers";
 
 export const m9_0_0 = async scatter => {
+	const seed = await ipcAsync('seed');
 
     scatter.keychain.keypairs.map(x => {
         if(x.hasOwnProperty('publicKeys') && x.publicKeys.length) return false;
 
-        x.decrypt(store.state.seed);
+
+
+        x.decrypt(seed);
 
         if(!x.external) {
             x.privateKey = Crypto.privateKeyToBuffer(x.privateKey, x.blockchain);
@@ -31,7 +35,7 @@ export const m9_0_0 = async scatter => {
             }
         });
 
-        x.encrypt(store.state.seed);
+        x.encrypt(seed);
     });
 
     // Wiping out permissions
diff --git a/src/models/api/ApiActions.js b/src/models/api/ApiActions.js
@@ -12,3 +12,4 @@ export const CREATE_TRANSACTION =               'createTransaction';
 export const REQUEST_ARBITRARY_SIGNATURE =      'requestArbitrarySignature';
 export const SUGGEST_NETWORK =                  'requestAddNetwork';
 export const AUTHENTICATE =                     'authenticate';
+export const UPDATE_IDENTITY =                  'updateIdentity';
diff --git a/src/models/popups/Popup.js b/src/models/popups/Popup.js
@@ -29,6 +29,7 @@ export class Popup {
 		    case ApiActions.GET_OR_REQUEST_IDENTITY:
 		    case ApiActions.REQUEST_TRANSFER:
 		    case ApiActions.GET_PUBLIC_KEY:
+		    case ApiActions.UPDATE_IDENTITY:
 			    return {width:420, height:600};
 		    case ApiActions.REQUEST_SIGNATURE:
 			    return {width:920, height:600};
diff --git a/src/services/ApiService.js b/src/services/ApiService.js
@@ -377,6 +377,23 @@ export default class ApiService {
         })
     }
 
+	static async [Actions.UPDATE_IDENTITY](request){
+		return new Promise(async resolve => {
+
+			const {origin, name, kyc} = request.payload;
+
+
+			const possibleId = PermissionService.identityFromPermissions(origin, false);
+			if(!possibleId) return resolve({id:request.id, result:Error.identityMissing()});
+
+			PopupService.push(Popup.popout(Object.assign(request, {}), async ({result}) => {
+				if(!result || (!result.accepted || false)) return resolve({id:request.id, result:Error.signatureError("signature_rejected", "User rejected the signature request")});
+
+				resolve({id:request.id, result:possibleId});
+			}));
+		});
+	}
+
 
 
 
diff --git a/src/services/ExchangeService.js b/src/services/ExchangeService.js
@@ -21,6 +21,7 @@ export default class ExchangeService {
 
 	static async pairs(token){
 		return timeout(POST('exchange/pairs', {token})).then(pairs => {
+			if(!pairs) return [];
 			Object.keys(pairs).map(key => pairs[key].map(x => x.token = Token.fromJson(x.token)));
 			return pairs;
 		});
diff --git a/src/services/PasswordService.js b/src/services/PasswordService.js
@@ -87,7 +87,7 @@ export default class PasswordService {
 
             // Setting a new salt every time the password is changed.
             await StorageService.setSalt(Hasher.unsaltedQuickHash(IdGenerator.text(32)));
-            const [newMnemonic, newSeed] = await Mnemonic.generateMnemonic(newPassword);
+	        const [newMnemonic, newSeed] = await this.seedPassword(newPassword, true);
 
             // Re-encrypting keypairs
             const scatter = store.state.scatter.clone();
@@ -100,7 +100,6 @@ export default class PasswordService {
                 id.encrypt(newSeed);
             });
 
-            await store.commit(Actions.SET_SEED, newSeed);
             await store.dispatch(Actions.SET_SCATTER, scatter);
             await StorageService.swapHistory(store.state.history);
             await StorageService.setTranslation(store.getters.language);
diff --git a/src/services/PermissionService.js b/src/services/PermissionService.js
@@ -201,4 +201,11 @@ export default class PermissionService {
         })
     }
 
+    static async removeDanglingPermissions(){
+	    const scatter = store.state.scatter.clone();
+	    const origins = scatter.keychain.permissions.map(x => x.origin);
+	    scatter.keychain.apps = scatter.keychain.apps.filter(x => origins.includes(x.origin));
+	    return store.dispatch(Actions.SET_SCATTER, scatter);
+    }
+
 }
diff --git a/src/services/SingletonService.js b/src/services/SingletonService.js
@@ -4,6 +4,7 @@ import AccountService from "./AccountService";
 import LanguageService from "./LanguageService";
 import PriceService from "./PriceService";
 import RecurringService from "./RecurringService";
+import PermissionService from "./PermissionService";
 
 let initialized = false;
 
@@ -14,6 +15,7 @@ export default class SingletonService {
 		initialized = true;
 		store.dispatch(Actions.LOAD_HISTORY);
 		store.dispatch(Actions.LOAD_LANGUAGE);
+		await PermissionService.removeDanglingPermissions();
 		await AccountService.fixOrphanedAccounts();
 		await LanguageService.regenerateLanguage();
 		await PriceService.watchPrices();
diff --git a/src/services/SocketService.js b/src/services/SocketService.js
@@ -86,18 +86,18 @@ const socketHandler = (socket) => {
         if(request.data.passthrough)
             return socket.emit('paired', existingApp && existingApp.checkKey(request.data.appkey));
 
-        const addAuthorizedApp = (newKey = null) => {
+        const addAuthorizedApp = async (newKey = null) => {
             const authedApp = new AuthorizedApp(request.data.origin, newKey ? newKey : request.data.appkey);
             const clone = scatter.clone();
             clone.keychain.updateOrPushApp(authedApp);
-            store.dispatch(Actions.SET_SCATTER, clone);
+            await store.dispatch(Actions.SET_SCATTER, clone);
             socket.emit('paired', true);
         };
 
         const repair = async () => {
             const newKey = await getNewKey(socket);
             if(newKey.data.origin !== request.data.origin || newKey.data.appkey.indexOf('appkey:') === -1) return socket.emit('paired', false);
-            addAuthorizedApp(newKey.data.appkey)
+            return addAuthorizedApp(newKey.data.appkey)
         }
 
         if(existingApp){
diff --git a/src/views/Home.vue b/src/views/Home.vue
@@ -64,6 +64,9 @@
     import SingletonService from "../services/SingletonService";
     import PopupService from "../services/PopupService";
     import {Popup} from "../models/popups/Popup";
+    import Token from "../models/Token";
+    import {Blockchains} from "../models/Blockchains";
+    import TokenService from "../services/TokenService";
 
 
     export default {
diff --git a/src/views/Login.vue b/src/views/Login.vue
@@ -194,7 +194,7 @@
 			this.confirmPassword = '';
 
 			const lockout = getLockout();
-			this.lockedOutTime = lockout.tried >= 5 ? lockout.stamp > 0 ? lockout.stamp + lockoutTime : 0 : 0;
+			this.lockedOutTime = lockout.tried >= 10 ? lockout.stamp > 0 ? lockout.stamp + lockoutTime : 0 : 0;
 
 			document.addEventListener('keydown', this.modifyDPresses, true);
 		},
diff --git a/src/views/PopOut.vue b/src/views/PopOut.vue
@@ -1,27 +1,6 @@
 <template>
     <section>
 
-        <!--<section v-if="windowMessage">-->
-
-            <!--<get-identity v-if="popupType === apiActions.GET_OR_REQUEST_IDENTITY"-->
-                          <!--:payload="payload" :plugin-origin="pluginOrigin" v-on:returned="returnResult"></get-identity>-->
-
-            <!--<suggest-network v-if="popupType === apiActions.SUGGEST_NETWORK"-->
-                             <!--:payload="payload" :plugin-origin="pluginOrigin" v-on:returned="returnResult"></suggest-network>-->
-
-            <!--<signature-request v-if="popupType === apiActions.REQUEST_SIGNATURE || popupType === apiActions.REQUEST_ARBITRARY_SIGNATURE"-->
-                               <!--:payload="payload" :plugin-origin="pluginOrigin" v-on:returned="returnResult"></signature-request>-->
-
-            <!--<link-app v-if="popupType === 'linkApp'" :payload="payload" :plugin-origin="pluginOrigin" v-on:returned="returnResult"></link-app>-->
-
-            <!--<get-public-key v-if="popupType === apiActions.GET_PUBLIC_KEY" :payload="payload" :plugin-origin="pluginOrigin" v-on:returned="returnResult"></get-public-key>-->
-
-            <!--<link-account v-if="popupType === apiActions.LINK_ACCOUNT" :payload="payload" :plugin-origin="pluginOrigin" v-on:returned="returnResult"></link-account>-->
-
-            <!--<transfer-request v-if="popupType === apiActions.REQUEST_TRANSFER" :payload="payload" :plugin-origin="pluginOrigin" v-on:returned="returnResult"></transfer-request>-->
-
-        <!--</section>-->
-
         <section v-if="windowMessage" class="popout">
 
             <AppLogin v-if="popupType === apiActions.GET_OR_REQUEST_IDENTITY"
@@ -35,15 +14,16 @@
                       v-on:returned="returnResult" />
 
             <GetPublicKey v-if="popupType === apiActions.GET_PUBLIC_KEY"
-                          :popup="popup"
-                          v-on:returned="returnResult" />
+                          :popup="popup" v-on:returned="returnResult" />
 
             <TransferRequest v-if="popupType === apiActions.REQUEST_TRANSFER"
                              :popup="popup" :pinning="pinning"
                              v-on:returned="returnResult" />
 
-            <LinkApp :popup="popup" v-if="popupType === 'linkApp'" v-on:returned="returnResult" />
+            <UpdateIdentity v-if="popupType === apiActions.UPDATE_IDENTITY"
+                             :popup="popup" v-on:returned="returnResult" />
 
+            <LinkApp :popup="popup" v-if="popupType === 'linkApp'" v-on:returned="returnResult" />
 
         </section>
 
@@ -76,6 +56,7 @@
             AppLogin:() => import('./popouts/AppLogin'),
             Signature:() => import('./popouts/Signature'),
             LinkApp:() => import('./popouts/LinkApp'),
+            UpdateIdentity:() => import('./popouts/UpdateIdentity'),
         },
         mounted(){
             WindowService.watch('popup', windowMessage => {
diff --git a/src/views/popouts/Signature.vue b/src/views/popouts/Signature.vue
@@ -87,7 +87,7 @@
 
                         <section :class="{'previous-whitelist':isPreviouslyWhitelisted(message)}">
 
-                            <section class="details">
+                            <section class="details contract-action">
                                 <figure class="title">
                                     <input v-if="whitelisted && !isPreviouslyWhitelisted(message)"
                                            :checked="!!getWhitelist(message)"
@@ -432,18 +432,7 @@
         position: relative;
 
         &:not(:first-child){
-            padding:30px 0 20px;
-
-            &:after {
-                content:'';
-                position:absolute;
-                top:0;
-                left:-30px;
-                right:-30px;
-                height:2px;
-                background:rgba(0,0,0,0.05);
-                box-shadow:inset 0 1px 3px rgba(0,0,0,0.08), 0 1px 1px #fff;
-            }
+            margin-top:60px;
         }
 
         .previous-whitelist {
@@ -546,5 +535,20 @@
         padding:0;
     }
 
+    .contract-action {
+        margin:-20px -30px 0;
+        border-top:1px solid rgba(0,0,0,0.04);
+        padding:20px 30px;
+        background:rgba(0,0,0,0.02);
+        background:linear-gradient(-180deg, #f2f2f2 -10%, rgba(242, 242, 242, 0) 120%);
+        box-shadow:0 2px 4px rgba(0,0,0,0.04), 0 8px 16px rgba(0,0,0,0.02);
+
+        .title {
+            span {
+                font-size: 18px;
+            }
+        }
+    }
+
 
 </style>
diff --git a/src/views/popouts/UpdateIdentity.vue b/src/views/popouts/UpdateIdentity.vue

Original file line number	Diff line number	Diff line change
`@@ -475,7 +475,7 @@`
`475`	`475`
`476`	`476`	`if(sent){`
`477`	`477`	`if(!TokenService.hasToken(this.pair.token)){`
`478`		`- if(this.pair.token.contract && !this.pair.token.contract.length) {`
	`478`	`+ if(!!this.pair.token.contract && !!this.pair.token.contract.length) {`
`479`	`479`	`await TokenService.addToken(this.pair.token, false, false);`
`480`	`480`	`}`
`481`	`481`	`}`
Original file line number	Diff line number	Diff line change
`@@ -201,4 +201,11 @@ export default class PermissionService {`
`201`	`201`	`})`
`202`	`202`	`}`
`203`	`203`
	`204`	`+ static async removeDanglingPermissions(){`
	`205`	`+ const scatter = store.state.scatter.clone();`
	`206`	`+ const origins = scatter.keychain.permissions.map(x => x.origin);`
	`207`	`+ scatter.keychain.apps = scatter.keychain.apps.filter(x => origins.includes(x.origin));`
	`208`	`+ return store.dispatch(Actions.SET_SCATTER, scatter);`
	`209`	`+ }`
	`210`	`+`
`204`	`211`	`}`