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..a34d196c 100644
--- a/src/app/get-deso/get-deso.component.ts
+++ b/src/app/get-deso/get-deso.component.ts
@@ -163,25 +163,26 @@ export class GetDesoComponent implements OnInit {
onCaptchaVerify(token: string): void {
this.captchaFlowSpinner = true;
- this.backendAPIService
- .VerifyHCaptcha(token, this.publicKeyAdded)
- .subscribe(
- async (res) => {
- if (res.Success) {
- await this.backendAPIService
- .GetTxn(res.TxnHashHex, 'InMempool')
- .toPromise();
- this.isFinishFlowDisabled = false;
- this.finishFlow();
- } else {
- this.captchaFailed = true;
- }
- },
- (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;
}
- )
- .add(() => (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 a062809c..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
@@ -300,12 +300,15 @@ 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);