diff --git a/src/_pages/Layout.vue b/src/_pages/Layout.vue
index 682629f..7c4d22f 100644
--- a/src/_pages/Layout.vue
+++ b/src/_pages/Layout.vue
@@ -66,7 +66,11 @@ export default {
this.currentUser.locale !== null
? this.currentUser.locale
: 'detect';
- if (this.currentUser && !this.currentUser.admin) {
+ if (
+ this.currentUser &&
+ !this.currentUser.admin &&
+ !this.verifiedContacts
+ ) {
this.getPolicyByUserId({
userId: this.currentUser.uuid,
messages: this.messages,
@@ -76,6 +80,7 @@ export default {
this.isPageAvailable =
!this.currentUser ||
+ this.$route.path === '/login' ||
this.$route.path === '/me/action' ||
this.$route.path === '/logout' ||
this.$route.path === '/verifyEmail' ||
@@ -106,6 +111,8 @@ export default {
navigateToPaymentPage() {
if (this.$route.path !== '/payment') {
this.$router.push('/payment');
+ } else {
+ this.initDefaults();
}
},
diff --git a/src/_pages/auth/Payment.vue b/src/_pages/auth/Payment.vue
index 825d720..bcc059a 100644
--- a/src/_pages/auth/Payment.vue
+++ b/src/_pages/auth/Payment.vue
@@ -277,7 +277,14 @@ export default {
priceMinorUnits: this.plans[i].price % 100,
});
}
- this.bubblePlan = this.plans[0].name;
+ const matchingPlan = this.plans.find(
+ (plan) => plan.uuid === this.user.preferredPlan
+ );
+ if (matchingPlan) {
+ this.bubblePlan = matchingPlan.name;
+ } else {
+ this.bubblePlan = this.plans[0].name;
+ }
}
return plans_array;
},
diff --git a/src/_pages/main/account/Policy.vue b/src/_pages/main/account/Policy.vue
index 58fa8cb..9c79a07 100644
--- a/src/_pages/main/account/Policy.vue
+++ b/src/_pages/main/account/Policy.vue
@@ -938,9 +938,7 @@