From 3908468cfb7b17807dce68499069f26c9742185e Mon Sep 17 00:00:00 2001
From: Tyler <everdev0923@gmail.com>
Date: Fri, 13 Nov 2020 14:37:23 -0500
Subject: [PATCH] fix: payment issue during registration

---
 src/_components/modals/AddSshKey.vue                 | 1 -
 src/_components/modals/LaunchBubbleSettingsModal.vue | 3 ++-
 src/_pages/Layout.vue                                | 2 +-
 src/_pages/auth/Payment.vue                          | 2 ++
 src/_store/account.module.js                         | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/_components/modals/AddSshKey.vue b/src/_components/modals/AddSshKey.vue
index d092ad4..fcab61e 100644
--- a/src/_components/modals/AddSshKey.vue
+++ b/src/_components/modals/AddSshKey.vue
@@ -139,7 +139,6 @@ export default {
       this.sshPublicKey = '';
       this.minExpiration = new Date().toISOString();
       this.expiration = null;
-      this.timezone = this.detectedTimezone.timeZoneId;
       this.submitted = false;
     },
     hide() {
diff --git a/src/_components/modals/LaunchBubbleSettingsModal.vue b/src/_components/modals/LaunchBubbleSettingsModal.vue
index 369fd73..ee53546 100644
--- a/src/_components/modals/LaunchBubbleSettingsModal.vue
+++ b/src/_components/modals/LaunchBubbleSettingsModal.vue
@@ -138,7 +138,7 @@
           v-validate="'required'"
           :placeholder="messages.field_label_network_domain"
           :options="domains"
-          :reduce="d => d.name"
+          :reduce="(d) => d.name"
           v-model="accountPlan.domain"
           label="name"
         >
@@ -774,6 +774,7 @@ export default {
 
     plans(p) {
       if (p) {
+        console.log('plans', JSON.stringify(this.user));
         if (this.user && this.user.preferredPlan) {
           const plans = this.planObjects;
           if (plans) {
diff --git a/src/_pages/Layout.vue b/src/_pages/Layout.vue
index 7c4d22f..e9ba6ff 100644
--- a/src/_pages/Layout.vue
+++ b/src/_pages/Layout.vue
@@ -190,7 +190,7 @@ export default {
           payMethods.length > 0
         ) {
           this.hasPaymentMethod = true;
-          this.navigateToDashboard();
+          this.initDefaults();
         } else {
           this.navigateToPaymentPage();
         }
diff --git a/src/_pages/auth/Payment.vue b/src/_pages/auth/Payment.vue
index bcc059a..32fa5fb 100644
--- a/src/_pages/auth/Payment.vue
+++ b/src/_pages/auth/Payment.vue
@@ -334,6 +334,8 @@ export default {
             this.checkSession({
               messages: this.messages,
               errors: this.errors,
+            }).then(() => {
+              this.$router.push('/');
             });
           });
         }
diff --git a/src/_store/account.module.js b/src/_store/account.module.js
index 3d2c08c..4533b40 100644
--- a/src/_store/account.module.js
+++ b/src/_store/account.module.js
@@ -47,7 +47,7 @@ const actions = {
   },
   checkSession({ commit }, { messages, errors }) {
     commit('checkSessionRequest');
-    userService.getMe(messages, errors).then(
+    return userService.getMe(messages, errors).then(
       (user) => commit('checkSessionSuccess', user),
       (error) => {
         commit('checkSessionFailure', error);