Merge pull request #4933 from kiva/fix-mg-settings-MARS-399

fix: small fix in cancellation flow and how to calculate the months y…
kiva · Aug 8, 2023 · 22078c8 · 22078c8
2 parents d8fb905 + 68b05ff
commit 22078c8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/src/components/Subscriptions/SubscriptionsMonthlyGood.vue b/src/components/Subscriptions/SubscriptionsMonthlyGood.vue
@@ -60,7 +60,7 @@
 								Change subscription status
 							</p>
 							<p class="tw-text-secondary">
-								Pause or cancel your membership
+								Cancel your membership
 							</p>
 						</div>
 						<kv-button
@@ -213,16 +213,11 @@ const pageQuery = gql`query monthlyGoodSubscription {
 			id
 			amount
 			donation
+			timestamp
 			category {
 				id
 				subscriptionType
 			}
-			history {
-				values {
-					id
-					timestamp
-				}
-			}
 		}
 	}
 }`;
@@ -281,9 +276,7 @@ export default {
 				this.paymentMethod = data?.my?.autoDeposit?.paymentMethod ?? {};
 				this.subscriptionId = data?.my?.autoDeposit?.id;
 				this.firstName = data?.my?.userAccount?.firstName ?? '';
-				// eslint-disable-next-line max-len
-				const mgSubs = activeMonthlyGoodSubscription?.history?.values ?? [];
-				this.subStartTimestamp = mgSubs?.[0]?.timestamp ?? null;
+				this.subStartTimestamp = activeMonthlyGoodSubscription?.timestamp ?? null;
 			}
 		},
 	},

diff --git a/src/components/Subscriptions/SubscriptionsMonthlyGoodCancellationFlow.vue b/src/components/Subscriptions/SubscriptionsMonthlyGoodCancellationFlow.vue
@@ -89,7 +89,7 @@
 						variant="secondary"
 						@click="trackEvent({
 							label: `monthly good cancel ; These aren't causes I want to support`,
-							property: 'cancel reason ; category_alignment'}); changeContribution()"
+							property: 'cancel reason ; category_alignment'}); goToStep('3-choose-a')"
 					>
 						These aren't causes I want to support
 					</kv-button>