fix: show new thank you page to users who made first transaction and …

…do not opted in
kiva · Jun 17, 2024 · 1b516cb · 1b516cb
1 parent 8533482
commit 1b516cb
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/src/components/Thanks/WhatIsNextTemplate.vue b/src/components/Thanks/WhatIsNextTemplate.vue
@@ -292,10 +292,6 @@ export default {
 			type: Object,
 			default: () => ({})
 		},
-		borrowerName: {
-			type: String,
-			default: ''
-		},
 		isGuest: {
 			type: Boolean,
 			default: false
@@ -333,6 +329,9 @@ export default {
 		};
 	},
 	computed: {
+		borrowerName() {
+			return this.selectedLoan?.name ?? '';
+		},
 		filteredLoans() {
 			const filteredLoans = [...this.loans];
 			if (this.loans.length === 3) {

diff --git a/src/graphql/query/thanksPage.graphql b/src/graphql/query/thanksPage.graphql
@@ -133,6 +133,9 @@ query checkoutReceipt($checkoutId: Int!, $visitorId: String) {
 		loans {
 			totalCount
 		}
+		communicationSettings {
+			lenderNews
+		}
 	}
 	general {
 		shareAskCopy: uiExperimentSetting(key: "share_ask_copy") {

diff --git a/src/pages/Thanks/ThanksPage.vue b/src/pages/Thanks/ThanksPage.vue
@@ -1,5 +1,5 @@
 <template>
-	<www-page data-testid="thanks-page" :class="{'tw-bg-eco-green-1': !showOldThanksPage && !isOnlyDonation}">
+	<www-page data-testid="thanks-page" :class="{'tw-bg-eco-green-1': showNewTYPage && !isOnlyDonation}">
 		<template v-if="isOnlyDonation">
 			<thanks-page-donation-only
 				:monthly-donation-amount="monthlyDonationAmount"
@@ -10,8 +10,6 @@
 				:selected-loan="selectedLoan"
 				:loans="loans"
 				:receipt="receipt"
-				:borrower-name="borrowerName"
-				:hash="hash"
 				:lender="lender"
 				:is-guest="isGuest"
 				:opted-in="optedIn"
@@ -368,7 +366,7 @@ export default {
 		},
 		teamName() {
 			return this.loans?.[0]?.team?.name ?? '';
-		}
+		},
 	},
 	created() {
 		// Retrieve and apply Page level data + experiment state
@@ -494,16 +492,17 @@ export default {
 		}) || {};
 		this.enableMayChallengeHeader = shareChallengeExpData?.version === 'b';
 
-		// Only show the old page if the first page is a borrower page and feature flag is enabled
-		const newThanksPageEnabled = data?.general?.newThanksPageEnabled?.value === 'true';
-		const bpPattern = /^\/lend\/(\d+)\/$/;
+		this.optedIn = data?.my?.communicationSettings?.lenderNews ?? false;
+		const bpPattern = /^\/lend\/(\d+)/;
 
-		if (newThanksPageEnabled && bpPattern.test(this.$appConfig.firstPage)) {
+		if (bpPattern.test(this.$appConfig.firstPage)) {
 			const url = this.$appConfig.firstPage?.split('/');
 			const firstVisitloanId = url?.[2] ?? null;
 
-			const landedLoan = this.loans.find(loan => loan.id === firstVisitloanId);
-			this.showNewTYPage = landedLoan?.geocode?.country?.isoCode !== 'US';
+			const landedLoan = this.loans.find(loan => loan.id === Number(firstVisitloanId));
+			this.showNewTYPage = landedLoan?.geocode?.country?.isoCode !== 'US'
+				&& isFirstLoan
+				&& !this.optedIn;
 		}
 
 		// New Thanks Page Experiment