From 4f0091ecc859640a329100c348b9a1c7af849f0b Mon Sep 17 00:00:00 2001
From: Matt Stover <mcs@mcstover.com>
Date: Wed, 26 Jun 2024 16:02:50 -0700
Subject: [PATCH] fix: prevent massive error logs due to failed receipt query
 when no transactionId is present

---
 src/pages/Thanks/ThanksPage.vue | 38 +++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/pages/Thanks/ThanksPage.vue b/src/pages/Thanks/ThanksPage.vue
index c1e2ec0eb3..47c46f9c78 100644
--- a/src/pages/Thanks/ThanksPage.vue
+++ b/src/pages/Thanks/ThanksPage.vue
@@ -45,17 +45,6 @@
 								We've emailed your order confirmation to you.
 							</p>
 						</template>
-
-						<template v-else>
-							<h1 class="tw-mb-4">
-								Please log in to see your receipt.
-							</h1>
-							<kv-button
-								:href="`/ui-login?force=true&doneUrl=${encodeURIComponent(this.$route.fullPath)}`"
-							>
-								Log in to continue
-							</kv-button>
-						</template>
 					</div>
 				</div>
 				<thanks-layout-v2
@@ -96,6 +85,22 @@
 					</template>
 				</thanks-layout-v2>
 			</div>
+			<template v-else>
+				<div class="page-content tw-flex tw-flex-col tw-items-center tw-text-center">
+					<h2 class="tw-m-4">
+						Please log in to see your receipt.
+					</h2>
+					<kv-button
+						:href="`/ui-login?force=true&doneUrl=${
+							(this.$route.query.kiva_transaction_id && this.$route.query.kiva_transaction_id !== null)
+								? encodeURIComponent(this.$route.fullPath)
+								: encodeURIComponent('/portfolio')
+						}`"
+					>
+						Log in to continue
+					</kv-button>
+				</div>
+			</template>
 			<template v-if="showMayChallengeHeader">
 				<div
 					v-if="loans.length > 0"
@@ -248,6 +253,11 @@ export default {
 				? numeral(route.query?.kiva_transaction_id).value()
 				: null;
 
+			// Check if transactionId is null, resolve the promise if missing
+			if (!transactionId) {
+				return Promise.resolve();
+			}
+
 			return client.query({
 				query: thanksPageQuery,
 				variables: {
@@ -387,6 +397,12 @@ export default {
 		const transactionId = this.$route.query?.kiva_transaction_id
 			? numeral(this.$route.query?.kiva_transaction_id).value()
 			: null;
+
+		// Check if transactionId is null, exit if missing
+		if (!transactionId) {
+			return false;
+		}
+
 		this.monthlyDonationAmount = this.$route.query?.monthly_donation_amount ?? null;
 
 		try {