@@ -95,7 +95,7 @@ export const Wizard = ({ deviceID }: TProps) => {
95
95
return null ;
96
96
}
97
97
// fixes empty main element, happens when after unlocking the device, reason wizard is now always mounted in app.tsx
98
- if ( appStatus === '' && status === 'initialized ' ) {
98
+ if ( appStatus === '' && status === 'unlocked ' ) {
99
99
return null ;
100
100
}
101
101
return (
@@ -106,14 +106,6 @@ export const Wizard = ({ deviceID }: TProps) => {
106
106
attestation = { attestation } />
107
107
) : null }
108
108
109
- { ( status === 'unpaired' || status === 'pairingFailed' ) && (
110
- < Pairing
111
- key = "pairing"
112
- deviceID = { deviceID }
113
- attestation = { attestation }
114
- pairingFailed = { status === 'pairingFailed' } />
115
- ) }
116
-
117
109
{ ( ! unlockOnly && appStatus === '' ) && (
118
110
< SetupOptions
119
111
key = "choose-setup"
@@ -137,32 +129,40 @@ export const Wizard = ({ deviceID }: TProps) => {
137
129
) }
138
130
139
131
{ /* keeping the backups mounted even restoreBackupStatus === 'restore' is not true so it catches potential errors */ }
140
- { ( ! unlockOnly && appStatus === 'restore-sdcard' && status !== 'initialized ' ) && (
132
+ { ( ! unlockOnly && appStatus === 'restore-sdcard' && status !== 'unlocked ' ) && (
141
133
< RestoreFromSDCard
142
134
key = "restore-sdcard"
143
135
deviceID = { deviceID }
144
136
onAbort = { handleAbort } />
145
137
) }
146
138
147
- { ( ! unlockOnly && appStatus === 'restore-mnemonic' && status !== 'initialized ' ) && (
139
+ { ( ! unlockOnly && appStatus === 'restore-mnemonic' && status !== 'unlocked ' ) && (
148
140
< RestoreFromMnemonic
149
141
key = "restore-mnemonic"
150
142
deviceID = { deviceID }
151
143
onAbort = { handleAbort } />
152
144
) }
153
145
154
- { ( appStatus === 'create-wallet' && status === 'initialized ' ) && (
146
+ { ( appStatus === 'create-wallet' && status === 'unlocked ' ) && (
155
147
< CreateWalletSuccess
156
148
key = "success"
157
149
backupType = { ( createOptions ?. withMnemonic ? 'mnemonic' : 'sdcard' ) }
158
150
onContinue = { handleGetStarted } />
159
151
) }
160
- { ( appStatus === 'restore-sdcard' && status === 'initialized ' ) && (
152
+ { ( appStatus === 'restore-sdcard' && status === 'unlocked ' ) && (
161
153
< RestoreFromSDCardSuccess key = "backup-success" onContinue = { handleGetStarted } />
162
154
) }
163
- { ( appStatus === 'restore-mnemonic' && status === 'initialized ' ) && (
155
+ { ( appStatus === 'restore-mnemonic' && status === 'unlocked ' ) && (
164
156
< RestoreFromMnemonicSuccess key = "backup-mnemonic-success" onContinue = { handleGetStarted } />
165
157
) }
158
+
159
+ { ( status === 'unpaired' || status === 'pairingFailed' ) && (
160
+ < Pairing
161
+ key = "pairing"
162
+ deviceID = { deviceID }
163
+ attestation = { attestation }
164
+ pairingFailed = { status === 'pairingFailed' } />
165
+ ) }
166
166
</ Main >
167
167
) ;
168
168
} ;
0 commit comments