fix(registration): fix wrong redirect on registration flow

Satellite-im · Feb 25, 2022 · eb4e488 · eb4e488
1 parent ceee624
commit eb4e488
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/pages/auth/register/Register.html b/pages/auth/register/Register.html
@@ -2,7 +2,7 @@
   <div class="registration-body">
     <UserCreate :onConfirm="confirm" v-if="hasToRegister" />
     <UiLoadersPageLoader
-      :is-loading="!hasToRegister && !isRegistered"
+      :is-loading="!hasToRegister && !allPrerequisitesReady"
       :title="$t('pages.loading.loading')"
       :subtitle="registrationStep"
     />

diff --git 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
@@ -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',
         {