Merge pull request #5335 from kiva/fix-invalid-form-in-MP-285

fix: conflict between invalid inputs because of the variants and addi…
kiva · May 30, 2024 · a79a2d0 · a79a2d0
2 parents 7928000 + 5e69622
commit a79a2d0
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 5 deletions.
diff --git a/src/components/Checkout/CheckoutDropInPaymentWrapper.vue b/src/components/Checkout/CheckoutDropInPaymentWrapper.vue
@@ -133,7 +133,7 @@
 import _get from 'lodash/get';
 import numeral from 'numeral';
 import { validationMixin } from 'vuelidate';
-import { required, email } from 'vuelidate/lib/validators';
+import { required, email, requiredIf } from 'vuelidate/lib/validators';
 import * as Sentry from '@sentry/vue';
 
 import checkoutUtils from '@/plugins/checkout-utils-mixin';
@@ -195,7 +195,7 @@ export default {
 			isClientReady: false,
 			paymentTypes: ['paypal', 'card', 'applePay', 'googlePay'],
 			enableCommsExperiment: false,
-			selectedComms: '',
+			selectedComms: false,
 			enableRadioBtnExperiment: false,
 		};
 	},
@@ -204,8 +204,12 @@ export default {
 			required,
 			email,
 		},
-		termsAgreement: { required: value => value === true },
-		selectedComms: { required: value => value !== '' },
+		termsAgreement: {
+			required: value => value === true,
+		},
+		selectedComms: {
+			required: requiredIf(enableRadioBtnExperiment => enableRadioBtnExperiment),
+		},
 	},
 	mounted() {
 		this.isClientReady = !this.$isServer;
@@ -473,6 +477,10 @@ export default {
 			}
 			if (version === 'c') {
 				this.enableRadioBtnExperiment = true;
+
+				// Workaround to validate input within this experiment
+				this.selectedComms = '';
+				this.termsAgreement = true;
 			}
 		}
 	}

diff --git a/src/components/Checkout/UserUpdatesPreference.vue b/src/components/Checkout/UserUpdatesPreference.vue
@@ -45,11 +45,26 @@
 		</p>
 		<p
 			v-if="selectedComms === '0'"
-			class="tw-border-brand-200 tw-border tw-bg-brand-100 tw-p-1 tw-rounded tw-text-small"
+			class="tw-border-brand-200 tw-border tw-bg-brand-100 tw-p-1 tw-rounded tw-text-small tw-mb-2"
 		>
 			Can we ask you to reconsider? This borrower and others like them will need your
 			help to change their lives. You can unsubscribe at any time.
 		</p>
+		<p class="tw-text-small">
+			By completing your loan, you agree to Kiva’s <a
+				:href="`https://${this.$appConfig.host}/legal/terms`"
+				target="_blank"
+				class="tw-underline"
+				title="Open Terms of Use in a new window"
+			>Terms of Use</a>
+			and
+			<a
+				:href="`https://${this.$appConfig.host}/legal/privacy`"
+				target="_blank"
+				class="tw-underline"
+				title="Open Privacy Policy in a new window"
+			>Privacy Policy</a>.
+		</p>
 	</div>
 </template>
 

diff --git a/src/pages/LoginAndRegister/RegisterSocial.vue b/src/pages/LoginAndRegister/RegisterSocial.vue
@@ -329,6 +329,7 @@ export default {
 			}
 			if (version === 'c') {
 				this.enableRadioBtnExperiment = true;
+				this.newAcctTerms = true;
 			}
 		}
 	},