Merge pull request #27 from GetScatter/master

Production

Author: nsjames

dist/main.bundle.js

@@ -59,9 +59,11 @@
 
             <p>{{$t('settings.general.testingModeDescription')}}</p>
 
-            <Button :text="$t('settings.general.testingModeButton')" @click.native="openInBrowser('https://t.me/ScatterTesters')" />
-            <br>
-            <br>
+            <section v-if="!testingMode">
+                <Button :text="$t('settings.general.testingModeButton')" @click.native="openInBrowser('https://t.me/ScatterTesters')" />
+                <br>
+                <br>
+            </section>
 
             <Switcher :state="testingMode" v-on:switched="toggleTestingMode" />
         </section>
@@ -85,6 +87,7 @@
     import Injectable from "../../../services/wallets/Injectable";
     import {Popup} from "../../../models/popups/Popup";
     import PopupService from "../../../services/utility/PopupService";
+    import SocketService from "@walletpack/core/services/utility/SocketService";
 
     export default {
         data () {return {
@@ -118,12 +121,22 @@
         },
         methods: {
         	async toggleTestingMode(){
+
+        		const setMode = async bool => {
+			        await this[UIActions.SET_TESTING_MODE](bool);
+			        await SocketService.close();
+			        setTimeout(async () => {
+				        await window.wallet.lock();
+				        window.wallet.utility.reload();
+			        }, 500);
+                };
+
         		if(!this.testingMode){
         			PopupService.push(Popup.verifyPassword(pass => {
-        				if(pass === 'i_am_testing') this[UIActions.SET_TESTING_MODE](true);
+        				if(pass === 'i_am_testing') setMode(true);
         				else PopupService.push(Popup.snackbar("You must get the password from the testing group!"))
                     }, true))
-                } else this[UIActions.SET_TESTING_MODE](false);
+                } else setMode(false);
             },
 	        async enableSimpleMode(){
 	        	PopupService.push(Popup.enableSimpleMode(async enabled => {

src/components/panels/settings/SettingsGeneral.vue

@@ -38,41 +38,6 @@
 
 
 
-				<section class="boxes" v-for="(account, networkUnique) in accounts">
-					<section class="box-container" style="width:100%;">
-						<label>{{accountNetwork(networkUnique).name}}</label>
-						<section class="box nested account-selector flex" @click="replaceAccount(account)">
-							<section class="symbol">
-								<TokenSymbol :token="accountNetwork(networkUnique).systemToken()" />
-							</section>
-							<section>
-								<figure class="name">{{sendable(account)}}</figure>
-							</section>
-							<figure class="chevron fas fa-caret-square-down"></figure>
-						</section>
-					</section>
-				</section>
-
-
-
-
-				<section class="boxes" v-for="(account, networkUnique) in accounts">
-					<section class="box-container" style="width:100%;">
-						<label>{{accountNetwork(networkUnique).name}}</label>
-						<section class="box nested account-selector flex" @click="replaceAccount(account)">
-							<section class="symbol">
-								<TokenSymbol :token="accountNetwork(networkUnique).systemToken()" />
-							</section>
-							<section>
-								<figure class="name">{{sendable(account)}}</figure>
-							</section>
-							<figure class="chevron fas fa-caret-square-down"></figure>
-						</section>
-					</section>
-				</section>
-
-
-
 
 			</section>
 		</section>
@@ -147,7 +112,7 @@
 						};
 
 						const defaultAccounts = this.defaultKeyAccounts(key, network);
-						if(defaultAccounts.length){
+						if(defaultAccounts && defaultAccounts.length){
 							this.accounts[network.unique()] = defaultAccounts[0].clone();
 						}
 					})

src/components/popins/overlay/EnableSimpleMode.vue

@@ -63,11 +63,13 @@
 			pageLength:20,
 		}},
 		mounted(){
-			elem = document.getElementById('assets');
-			elem.addEventListener('scroll', this.handleScroll);
+			setTimeout(() => {
+				elem = document.getElementById('assets');
+				if(elem) elem.addEventListener('scroll', this.handleScroll);
+			}, 200);
 		},
 		destroyed(){
-			elem.removeEventListener('scroll', this.handleScroll);
+			if(elem) elem.removeEventListener('scroll', this.handleScroll);
 		},
 		computed:{
 			...mapState([

src/components/tokens/TokenList.vue

@@ -15,11 +15,13 @@ export const m11_0_0 = async scatter => {
 	await Promise.all(keypairs.map(async keypair => {
 		delete keypair.keyHash;
 
-		await KeyPairService.addPublicKey(keypair, Blockchains.BTC, true);
+		keypair.privateKey = await window.wallet.decrypt(keypair.privateKey);
+		if(typeof keypair.privateKey === 'object' && keypair.privateKey.hasOwnProperty('data')) keypair.privateKey = keypair.privateKey.data;
+		await KeyPairService.addPublicKey(keypair, Blockchains.BTC, false);
 
 		let first = true;
 		keypair.blockchains.map(blockchain => {
-			const accounts = scatter.keychain.accounts.filter(x => x.keypairUnique === keypair.unique() && x.blockchain() === blockchain);
+			const accounts = scatter.keychain.accounts.filter(x => x.keypairUnique === keypair.unique() && x.networkUnique.split(':')[0] === blockchain);
 			if(accounts.length){
 				const clone = keypair.clone();
 				if(!first) {
@@ -55,5 +57,5 @@ export const m11_0_0 = async scatter => {
 
 	scatter.settings.explorers[Blockchains.BTC] = Explorer.fromRaw(PluginRepository.plugin(Blockchains.BTC).defaultExplorer());
 
-    return true;
-};
+	return true;
+};

src/migrations/11.0.0.js

@@ -0,0 +1,8 @@
+import {blockchainName, Blockchains, BlockchainsArray} from "@walletpack/core/models/Blockchains";
+
+export const m12_0_0 = async scatter => {
+
+	if(scatter.hasOwnProperty('recurring')) delete scatter.recurring;
+
+	return true;
+};

src/migrations/12.0.0.js

@@ -4,3 +4,4 @@ export * from './10.0.0';
 export * from './10.1.0';
 export * from './10.2.0';
 export * from './11.0.0';
+export * from './12.0.0';

src/migrations/version.js

@@ -24,8 +24,10 @@ export default class SingletonService {
 			PluginRepository.plugin(Blockchains.TRX).init();
 
 			try {
-				store.dispatch(UIActions.SET_TESTING_MODE, await window.wallet.storage.getGeneralSetting('testingMode').catch(() => false));
-			} catch(e){}
+				store.dispatch(UIActions.SET_TESTING_MODE, await window.wallet.storage.getGeneralSetting('testingMode'));
+			} catch(e){
+				console.error('e', e);
+			}
 
 			store.dispatch(Actions.LOAD_HISTORY);
 			store.dispatch(UIActions.SET_TOKEN_METAS, await GET('tokenmeta'));

src/services/utility/SingletonService.js

@@ -58,6 +58,7 @@ export const actions = {
 	    if (!scatter) return null;
 
 	    scatter = Scatter.fromJson(scatter);
+	    commit(Actions.SET_SCATTER, scatter);
 
 	    if(!isPopOut && !migrationChecked){
 		    migrationChecked = true;
@@ -72,11 +73,11 @@ export const actions = {
 			    ) scatter.keychain.removeAccount(account);
 		    });
 
-
 		    scatter.meta.regenerateVersion();
+		    commit(Actions.SET_SCATTER, scatter);
 	    }
 
-	    return commit(Actions.SET_SCATTER, scatter);
+	    return true;
     },
 
     [UIActions.CREATE_SCATTER]:({state, commit, dispatch}, password) => {

src/store/actions.js

@@ -32,6 +32,8 @@ export default class WalletHelpers {
 				}
 				popup.data.props.appData = AppsService.getAppData(popup.data.props.payload.origin);
 
+				popup.dimensions = popup.dimensions();
+
 				return await WindowService.openPopOut(popup);
 			}
 

src/util/WalletHelpers.js

@@ -121,7 +121,7 @@
 				const plugin = PluginRepository.plugin(this.account.blockchain());
 				const hasActions = plugin.hasAccountActions();
 				if(!hasActions) return null;
-				return plugin.accountActions(this.account);
+				return plugin.accountActions(this.account).filter(x => x.type !== 'proxy_vote');
 			},
 		},
 		mounted(){