Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BG2-2772: Fix doulbe steper advance on payments click for logged in d… #1776

Merged
merged 1 commit into from
Nov 26, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ export class DonationStartFormComponent implements AfterContentChecked, AfterCon
for (const stepperHeader of stepperHeaders) {
stepperHeader.addEventListener('click', (clickEvent: any) => {
if (this.stepper.selectedIndex > 0) {
this.progressToNonAmountsStep(); // Handles amount error if needed, like Continue button does.
this.validateAmountsCreateDonorDonationIfPossible(); // Handles amount error if needed, like Continue button does.
return;
}

Expand Down Expand Up @@ -1180,18 +1180,24 @@ export class DonationStartFormComponent implements AfterContentChecked, AfterCon
* against a scenario where one might get 'stuck' without seeing the amount error that explains why.
*/
progressToNonAmountsStep() {
const success = this.validateAmountsCreateDonorDonationIfPossible();

success && this.next();
}

private validateAmountsCreateDonorDonationIfPossible(): boolean {
const control = this.donationForm.controls['amounts'];
if(! control!.valid) {
if (!control!.valid) {
this.toast.showError(this.displayableAmountsStepErrors() || 'Sorry, there was an error with the donation amount or tip amount');

return;
return false;
}

if (!this.donation && (this.idCaptchaCode || this.donor) && this.donationAmount > 0) {
this.createDonationAndMaybePerson();
}

this.next();
return true;
}

progressFromStepGiftAid(): void {
Expand Down
Loading