From 4850d4cbf995546ac6a61e96f075bd94f342c718 Mon Sep 17 00:00:00 2001 From: Lazy Nina Date: Wed, 22 Jan 2025 10:47:22 -0500 Subject: [PATCH 1/2] fix spinner state for get deso --- src/app/get-deso/get-deso.component.html | 1 + src/app/get-deso/get-deso.component.ts | 15 +++++++++------ .../sign-up-get-starter-deso.component.ts | 13 +++++++------ 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/app/get-deso/get-deso.component.html b/src/app/get-deso/get-deso.component.html index b10da604..5fec6025 100644 --- a/src/app/get-deso/get-deso.component.html +++ b/src/app/get-deso/get-deso.component.html @@ -63,6 +63,7 @@

Get starter $DESO

(click)="setAlternativeEarnOptions(true)" class="margin-top--large button--primary--outline button--medium" data-control-name="skip-get-deso-button" + [disabled]="captchaFlowSpinner" > Try Another Way diff --git a/src/app/get-deso/get-deso.component.ts b/src/app/get-deso/get-deso.component.ts index b66c0c3d..2ef33983 100644 --- a/src/app/get-deso/get-deso.component.ts +++ b/src/app/get-deso/get-deso.component.ts @@ -166,22 +166,25 @@ export class GetDesoComponent implements OnInit { this.backendAPIService .VerifyHCaptcha(token, this.publicKeyAdded) .subscribe( - async (res) => { + (res) => { if (res.Success) { - await this.backendAPIService + this.backendAPIService .GetTxn(res.TxnHashHex, 'InMempool') - .toPromise(); - this.isFinishFlowDisabled = false; - this.finishFlow(); + .subscribe((res) => { + this.isFinishFlowDisabled = false; + this.finishFlow(); + this.captchaFlowSpinner = false; + }); } else { this.captchaFailed = true; + this.captchaFlowSpinner = false } }, (err) => { this.captchaFailed = true; + this.captchaFlowSpinner = false } ) - .add(() => (this.captchaFlowSpinner = false)); } onCaptchaExpired(event: any): void { diff --git a/src/app/sign-up-get-starter-deso/sign-up-get-starter-deso.component.ts b/src/app/sign-up-get-starter-deso/sign-up-get-starter-deso.component.ts index a062809c..35f84c3f 100644 --- a/src/app/sign-up-get-starter-deso/sign-up-get-starter-deso.component.ts +++ b/src/app/sign-up-get-starter-deso/sign-up-get-starter-deso.component.ts @@ -300,12 +300,13 @@ export class SignUpGetStarterDESOComponent implements OnInit { this.verificationCodeForm.value.verificationCode ) .subscribe( - async (res) => { - await this.backendApi.GetTxn(res.TxnHashHex, 'InMempool').toPromise(); - this.screenToShow = - SignUpGetStarterDESOComponent.COMPLETED_PHONE_NUMBER_VERIFICATION_SCREEN; - this.phoneNumberVerified.emit(); - this.isPhoneNumberSuccess = true; + (res) => { + this.backendApi.GetTxn(res.TxnHashHex, 'InMempool').subscribe((res) => { + this.screenToShow = + SignUpGetStarterDESOComponent.COMPLETED_PHONE_NUMBER_VERIFICATION_SCREEN; + this.phoneNumberVerified.emit(); + this.isPhoneNumberSuccess = true; + }); }, (err) => { this._parseSubmitPhoneNumberVerificationCodeServerErrors(err); From 76ca35f6dcb6e4db81c6f7e49ce1c7b17f69146f Mon Sep 17 00:00:00 2001 From: Lazy Nina Date: Wed, 22 Jan 2025 10:48:37 -0500 Subject: [PATCH 2/2] format --- src/app/get-deso/get-deso.component.ts | 38 +++++++++---------- .../sign-up-get-starter-deso.component.ts | 14 ++++--- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/app/get-deso/get-deso.component.ts b/src/app/get-deso/get-deso.component.ts index 2ef33983..a34d196c 100644 --- a/src/app/get-deso/get-deso.component.ts +++ b/src/app/get-deso/get-deso.component.ts @@ -163,28 +163,26 @@ export class GetDesoComponent implements OnInit { onCaptchaVerify(token: string): void { this.captchaFlowSpinner = true; - this.backendAPIService - .VerifyHCaptcha(token, this.publicKeyAdded) - .subscribe( - (res) => { - if (res.Success) { - this.backendAPIService - .GetTxn(res.TxnHashHex, 'InMempool') - .subscribe((res) => { - this.isFinishFlowDisabled = false; - this.finishFlow(); - this.captchaFlowSpinner = false; - }); - } else { - this.captchaFailed = true; - this.captchaFlowSpinner = false - } - }, - (err) => { + this.backendAPIService.VerifyHCaptcha(token, this.publicKeyAdded).subscribe( + (res) => { + if (res.Success) { + this.backendAPIService + .GetTxn(res.TxnHashHex, 'InMempool') + .subscribe((res) => { + this.isFinishFlowDisabled = false; + this.finishFlow(); + this.captchaFlowSpinner = false; + }); + } else { this.captchaFailed = true; - this.captchaFlowSpinner = false + this.captchaFlowSpinner = false; } - ) + }, + (err) => { + this.captchaFailed = true; + this.captchaFlowSpinner = false; + } + ); } onCaptchaExpired(event: any): void { diff --git a/src/app/sign-up-get-starter-deso/sign-up-get-starter-deso.component.ts b/src/app/sign-up-get-starter-deso/sign-up-get-starter-deso.component.ts index 35f84c3f..5d5e1c1b 100644 --- a/src/app/sign-up-get-starter-deso/sign-up-get-starter-deso.component.ts +++ b/src/app/sign-up-get-starter-deso/sign-up-get-starter-deso.component.ts @@ -301,12 +301,14 @@ export class SignUpGetStarterDESOComponent implements OnInit { ) .subscribe( (res) => { - this.backendApi.GetTxn(res.TxnHashHex, 'InMempool').subscribe((res) => { - this.screenToShow = - SignUpGetStarterDESOComponent.COMPLETED_PHONE_NUMBER_VERIFICATION_SCREEN; - this.phoneNumberVerified.emit(); - this.isPhoneNumberSuccess = true; - }); + this.backendApi + .GetTxn(res.TxnHashHex, 'InMempool') + .subscribe((res) => { + this.screenToShow = + SignUpGetStarterDESOComponent.COMPLETED_PHONE_NUMBER_VERIFICATION_SCREEN; + this.phoneNumberVerified.emit(); + this.isPhoneNumberSuccess = true; + }); }, (err) => { this._parseSubmitPhoneNumberVerificationCodeServerErrors(err);