File tree 6 files changed +7
-7
lines changed
6 files changed +7
-7
lines changed Original file line number Diff line number Diff line change 48
48
])
49
49
},
50
50
mounted (){
51
+ console .log (this .scatter .settings );
51
52
BackupService .setBackupStrategy (BACKUP_STRATEGIES .AUTOMATIC );
52
53
},
53
54
methods: {
Original file line number Diff line number Diff line change 73
73
if (typeof decrypted === ' object' && decrypted .hasOwnProperty (' keychain' )){
74
74
decrypted .keychain = AES .decrypt (decrypted .keychain , seed);
75
75
decrypted .settings .backupLocation = ' ' ;
76
- decrypted .toured = true ;
77
76
StorageService .setSalt (salt);
78
77
await this [Actions .SET_SEED ](password);
79
78
await this [Actions .SET_SCATTER ](Scatter .fromJson (decrypted));
109
108
}));
110
109
const scatter = await Scatter .create ();
111
110
scatter .keychain .keypairs = keypairs;
112
- scatter .toured = true ;
113
111
StorageService .setSalt (salt);
114
112
await this [Actions .SET_SEED ](password);
115
113
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 => {
10
10
11
11
const keypairs = scatter . keychain . keypairs . map ( x => x . clone ( ) ) ;
12
12
scatter . keychain . keypairs = [ ] ;
13
- scatter . onboarded = true ;
14
13
15
14
scatter . settings . language = LANG . ENGLISH ;
16
15
Original file line number Diff line number Diff line change @@ -21,7 +21,6 @@ export default class Scatter {
21
21
22
22
this . recurring = Recurring . placeholder ( ) ;
23
23
24
- this . toured = false ;
25
24
this . onboarded = false ;
26
25
27
26
this . pin = null ;
Original file line number Diff line number Diff line change @@ -27,7 +27,7 @@ export default class SingletonService {
27
27
StoreService . get ( ) . dispatch ( Actions . LOAD_LANGUAGE ) ;
28
28
RIDLService . init ( ) . then ( ( ) => {
29
29
RIDLService . checkAccounts ( ) ;
30
- } )
30
+ } ) ;
31
31
32
32
PermissionService . removeDanglingPermissions ( ) ;
33
33
AccountService . fixOrphanedAccounts ( ) ;
Original file line number Diff line number Diff line change 119
119
import SelectBackupLocation from " ../components/login/SelectBackupLocation" ;
120
120
import Welcome from " ../components/login/Welcome" ;
121
121
import PopupService from " ../services/utility/PopupService" ;
122
- import UpdateService from " ../services/utility/UpdateService" ;
123
122
import {Popup } from " ../models/popups/Popup" ;
124
- import StoreService from " ../services/utility/StoreService" ;
125
123
126
124
import SpaceBackground from ' ../components/backgrounds/SpaceBackground' ;
127
125
import Reset from ' ../components/svgs/login/Reset' ;
128
126
import Restore from ' ../components/svgs/login/Restore' ;
129
127
import Support from ' ../components/svgs/login/Support' ;
130
128
import ElectronHelpers from " ../util/ElectronHelpers" ;
129
+ import BackupService from " ../services/utility/BackupService" ;
131
130
132
131
const STATES = {
133
132
NEW_OR_LOGIN : ' newOrLogin' ,
256
255
clone .onboarded = true ;
257
256
await this [Actions .SET_SCATTER ](clone);
258
257
258
+ if (! this .scatter .settings .backupLocation .length ){
259
+ await BackupService .setDefaultBackupLocation ();
260
+ }
261
+
259
262
this .success = true ;
260
263
this .$router .push ({name: this .RouteNames .HOME });
261
264
}))
You can’t perform that action at this time.
0 commit comments