diff --git a/pages/auth/register/Register.html b/pages/auth/register/Register.html
index a65ee764a6..43d5ac76df 100644
--- a/pages/auth/register/Register.html
+++ b/pages/auth/register/Register.html
@@ -2,7 +2,7 @@
diff --git a/pages/auth/register/index.vue b/pages/auth/register/index.vue
index bd934d53d3..02156b7e23 100644
--- a/pages/auth/register/index.vue
+++ b/pages/auth/register/index.vue
@@ -18,6 +18,7 @@ export default Vue.extend({
},
computed: {
...mapGetters('accounts', ['getRegistrationStatus']),
+ ...mapGetters(['allPrerequisitesReady']),
hasToRegister() {
return this.getRegistrationStatus === RegistrationStatus.UNKNOWN
},
@@ -32,23 +33,27 @@ export default Vue.extend({
'user.registration.reg_status.sending_transaction',
)
default:
- return this.$i18n.t('user.registration.reg_status.registered')
+ return this.$i18n.t('user.loading.loading_account')
}
},
isRegistered() {
return this.getRegistrationStatus === RegistrationStatus.REGISTERED
},
},
+ watch: {
+ allPrerequisitesReady(nextValue) {
+ if (!nextValue) return
+ this.$router.replace('/chat/direct')
+ },
+ },
mounted() {},
methods: {
async confirm(userData: UserRegistrationData) {
- await this.$store.dispatch('accounts/registerUser', {
+ this.$store.dispatch('accounts/registerUser', {
name: userData.username,
image: userData.photoHash,
status: userData.status,
})
-
- this.$router.replace('/chat/direct')
},
},
})
diff --git a/store/accounts/actions.ts b/store/accounts/actions.ts
index e57f5f8117..37018fb715 100644
--- a/store/accounts/actions.ts
+++ b/store/accounts/actions.ts
@@ -291,8 +291,8 @@ export default {
const { initialized: textileInitialized } = rootState.textile
const { initialized: webrtcInitialized } = rootState.webrtc
- if (!textileInitialized) {
- const { pin } = state
+ const { pin } = state
+ if (!textileInitialized && pin) {
dispatch(
'textile/initialize',
{