File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 4848 ])
4949 },
5050 mounted (){
51+ console .log (this .scatter .settings );
5152 BackupService .setBackupStrategy (BACKUP_STRATEGIES .AUTOMATIC );
5253 },
5354 methods: {
Original file line number Diff line number Diff line change 7373 if (typeof decrypted === ' object' && decrypted .hasOwnProperty (' keychain' )){
7474 decrypted .keychain = AES .decrypt (decrypted .keychain , seed);
7575 decrypted .settings .backupLocation = ' ' ;
76- decrypted .toured = true ;
7776 StorageService .setSalt (salt);
7877 await this [Actions .SET_SEED ](password);
7978 await this [Actions .SET_SCATTER ](Scatter .fromJson (decrypted));
109108 }));
110109 const scatter = await Scatter .create ();
111110 scatter .keychain .keypairs = keypairs;
112- scatter .toured = true ;
113111 StorageService .setSalt (salt);
114112 await this [Actions .SET_SEED ](password);
115113 await this [Actions .SET_SCATTER ](scatter);
Original file line number Diff line number Diff line change @@ -10,7 +10,6 @@ export const m11_0_0 = async scatter => {
1010
1111 const keypairs = scatter . keychain . keypairs . map ( x => x . clone ( ) ) ;
1212 scatter . keychain . keypairs = [ ] ;
13- scatter . onboarded = true ;
1413
1514 scatter . settings . language = LANG . ENGLISH ;
1615
Original file line number Diff line number Diff line change @@ -21,7 +21,6 @@ export default class Scatter {
2121
2222 this . recurring = Recurring . placeholder ( ) ;
2323
24- this . toured = false ;
2524 this . onboarded = false ;
2625
2726 this . pin = null ;
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ export default class SingletonService {
2727 StoreService . get ( ) . dispatch ( Actions . LOAD_LANGUAGE ) ;
2828 RIDLService . init ( ) . then ( ( ) => {
2929 RIDLService . checkAccounts ( ) ;
30- } )
30+ } ) ;
3131
3232 PermissionService . removeDanglingPermissions ( ) ;
3333 AccountService . fixOrphanedAccounts ( ) ;
Original file line number Diff line number Diff line change 119119 import SelectBackupLocation from " ../components/login/SelectBackupLocation" ;
120120 import Welcome from " ../components/login/Welcome" ;
121121 import PopupService from " ../services/utility/PopupService" ;
122- import UpdateService from " ../services/utility/UpdateService" ;
123122 import {Popup } from " ../models/popups/Popup" ;
124- import StoreService from " ../services/utility/StoreService" ;
125123
126124 import SpaceBackground from ' ../components/backgrounds/SpaceBackground' ;
127125 import Reset from ' ../components/svgs/login/Reset' ;
128126 import Restore from ' ../components/svgs/login/Restore' ;
129127 import Support from ' ../components/svgs/login/Support' ;
130128 import ElectronHelpers from " ../util/ElectronHelpers" ;
129+ import BackupService from " ../services/utility/BackupService" ;
131130
132131 const STATES = {
133132 NEW_OR_LOGIN : ' newOrLogin' ,
256255 clone .onboarded = true ;
257256 await this [Actions .SET_SCATTER ](clone);
258257
258+ if (! this .scatter .settings .backupLocation .length ){
259+ await BackupService .setDefaultBackupLocation ();
260+ }
261+
259262 this .success = true ;
260263 this .$router .push ({name: this .RouteNames .HOME });
261264 }))
You can’t perform that action at this time.
0 commit comments