🐛 Fix grace period civic liker with expired subscription stuck in pur…

…chase (#434)
likecoin · May 4, 2021 · b8edb91 · b8edb91
1 parent 0aca8f9
commit b8edb91
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/components/CivicSubscriptionView/CivicSubscriptionView.vue b/src/components/CivicSubscriptionView/CivicSubscriptionView.vue
@@ -721,7 +721,7 @@ export default {
 
     confirmSubscription(e) {
       this.$emit('confirm-subscription', e);
-      if (this.getUserIsCivicLikerV2) {
+      if (this.getUserIsCivicLikerV2 && this.getUserSubscriptionInfo) {
         this.updateSubscription();
       } else {
         this.$router.push({

diff --git a/src/pages/civic/register/stripe.vue b/src/pages/civic/register/stripe.vue
@@ -71,17 +71,17 @@ export default {
   },
   mounted() {
     if (this.getUserIsCivicLiker) {
-      if (this.getUserIsCivicLikerV2) {
-        const { from: id } = this.$route.query;
-        this.$router.replace({
-          name: 'id',
-          params: { id },
-          query: { civic_welcome: 1 },
-        });
-        return;
-      }
       if (!this.getUserShouldRenewCivic) {
-        this.$router.replace({ name: 'settings-civic' });
+        if (this.getUserIsCivicLikerV2) {
+          const { from: id } = this.$route.query;
+          this.$router.replace({
+            name: 'id',
+            params: { id },
+            query: { civic_welcome: 1 },
+          });
+        } else {
+          this.$router.replace({ name: 'settings-civic' });
+        }
         return;
       }
     }