From e4ac3d4b5cf6b498b50401a6035c77e6f44eacc3 Mon Sep 17 00:00:00 2001
From: Lazy Nina <lazynina84@gmail.com>
Date: Wed, 22 Jan 2025 09:34:40 -0500
Subject: [PATCH 1/3] wait for txns in get free deso flows

---
 src/app/get-deso/get-deso.component.html                 | 4 ++++
 src/app/get-deso/get-deso.component.ts                   | 9 +++++++--
 .../sign-up-get-starter-deso.component.html              | 6 ++++++
 .../sign-up-get-starter-deso.component.ts                | 3 ++-
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/app/get-deso/get-deso.component.html b/src/app/get-deso/get-deso.component.html
index e18ed02b..60a73f64 100644
--- a/src/app/get-deso/get-deso.component.html
+++ b/src/app/get-deso/get-deso.component.html
@@ -45,6 +45,10 @@ <h3 class="text--neutral-white">Get starter $DESO</h3>
           (error)="onCaptchaError($event)"
         >
         </ng-hcaptcha>
+        <div *ngIf="captchaFlowSpinner" class="padding-top--medium display--flex flex--column items--center">
+            <div>Waiting for your $DESO to arrive.</div>
+            <div class="spinner-border" style="width: 6rem; height: 6rem"></div>
+        </div>
         <div *ngIf="captchaFailed" class="warning--error margin-top--small">
           There was an issue verifying your captcha. Please
           <a (click)="resetCaptcha()">reset the captcha</a> and try again, or
diff --git a/src/app/get-deso/get-deso.component.ts b/src/app/get-deso/get-deso.component.ts
index 74491c38..fa58793a 100644
--- a/src/app/get-deso/get-deso.component.ts
+++ b/src/app/get-deso/get-deso.component.ts
@@ -48,6 +48,8 @@ export class GetDesoComponent implements OnInit {
   captchaFailed = false;
   // Whether the backend is offering rewards for solving captchas.
   captchaAvailable = true;
+  // Loader shown while waiting for DESO to arrive.
+  captchaFlowSpinner = false;
 
   publicKeyCopied = false;
 
@@ -160,9 +162,12 @@ export class GetDesoComponent implements OnInit {
   }
 
   onCaptchaVerify(token: string): void {
+    this.captchaFlowSpinner = true;
     this.backendAPIService.VerifyHCaptcha(token, this.publicKeyAdded).subscribe(
-      (res) => {
+      async (res) => {
         if (res.Success) {
+
+          await this.backendAPIService.GetTxn(res.TxnHashHex, 'Committed').toPromise();
           this.isFinishFlowDisabled = false;
           this.finishFlow();
         } else {
@@ -172,7 +177,7 @@ export class GetDesoComponent implements OnInit {
       (err) => {
         this.captchaFailed = true;
       }
-    );
+    ).add(() => this.captchaFlowSpinner = false);
   }
 
   onCaptchaExpired(event: any): void {
diff --git a/src/app/sign-up-get-starter-deso/sign-up-get-starter-deso.component.html b/src/app/sign-up-get-starter-deso/sign-up-get-starter-deso.component.html
index c7460a7f..cfbbdc74 100644
--- a/src/app/sign-up-get-starter-deso/sign-up-get-starter-deso.component.html
+++ b/src/app/sign-up-get-starter-deso/sign-up-get-starter-deso.component.html
@@ -285,6 +285,10 @@ <h3 class="text--neutral-white">Confirm your authentication code</h3>
       </div>
     </div>
     <div class="margin-top--medium">
+      <div *ngIf="submittingPhoneNumberVerificationCode" class="padding-top--medium display--flex flex--column items--center">
+        <div>Waiting for your $DESO to arrive.</div>
+        <div class="spinner-border" style="width: 6rem; height: 6rem"></div>
+      </div>
       <button
         data-control-name="get-starter-deso-confirm-code-button"
         (click)="submitVerificationCode()"
@@ -292,6 +296,7 @@ <h3 class="text--neutral-white">Confirm your authentication code</h3>
           disabled: !verificationCodeForm.valid,
           'btn-loading': submittingPhoneNumberVerificationCode
         }"
+        [disabled]="submittingPhoneNumberVerificationCode"
         class="button--primary button--medium margin-bottom--medium"
       >
         Confirm
@@ -300,6 +305,7 @@ <h3 class="text--neutral-white">Confirm your authentication code</h3>
         data-control-name="get-starter-deso-back-button"
         *ngIf="displayForSignupFlow"
         (click)="backButtonClickedOnSubmitVerificationScreen()"
+        [disabled]="submittingPhoneNumberVerificationCode"
         class="button--primary--outline button--medium"
       >
         Back
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 7657cb9e..2afcbf10 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,7 +300,8 @@ export class SignUpGetStarterDESOComponent implements OnInit {
         this.verificationCodeForm.value.verificationCode
       )
       .subscribe(
-        (res) => {
+        async(res) => {
+          await this.backendApi.GetTxn(res.TxnHashHex, 'Committed').toPromise();
           this.screenToShow =
             SignUpGetStarterDESOComponent.COMPLETED_PHONE_NUMBER_VERIFICATION_SCREEN;
           this.phoneNumberVerified.emit();

From 2d18695388cb6af8018a32f31eddcd6e9adf63ac Mon Sep 17 00:00:00 2001
From: Lazy Nina <lazynina84@gmail.com>
Date: Wed, 22 Jan 2025 09:35:59 -0500
Subject: [PATCH 2/3] lint and format

---
 src/app/get-deso/get-deso.component.html      |  9 ++++--
 src/app/get-deso/get-deso.component.ts        | 30 +++++++++++--------
 .../sign-up-get-starter-deso.component.html   |  5 +++-
 .../sign-up-get-starter-deso.component.ts     |  2 +-
 4 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/app/get-deso/get-deso.component.html b/src/app/get-deso/get-deso.component.html
index 60a73f64..b10da604 100644
--- a/src/app/get-deso/get-deso.component.html
+++ b/src/app/get-deso/get-deso.component.html
@@ -45,9 +45,12 @@ <h3 class="text--neutral-white">Get starter $DESO</h3>
           (error)="onCaptchaError($event)"
         >
         </ng-hcaptcha>
-        <div *ngIf="captchaFlowSpinner" class="padding-top--medium display--flex flex--column items--center">
-            <div>Waiting for your $DESO to arrive.</div>
-            <div class="spinner-border" style="width: 6rem; height: 6rem"></div>
+        <div
+          *ngIf="captchaFlowSpinner"
+          class="padding-top--medium display--flex flex--column items--center"
+        >
+          <div>Waiting for your $DESO to arrive.</div>
+          <div class="spinner-border" style="width: 6rem; height: 6rem"></div>
         </div>
         <div *ngIf="captchaFailed" class="warning--error margin-top--small">
           There was an issue verifying your captcha. Please
diff --git a/src/app/get-deso/get-deso.component.ts b/src/app/get-deso/get-deso.component.ts
index fa58793a..eee01624 100644
--- a/src/app/get-deso/get-deso.component.ts
+++ b/src/app/get-deso/get-deso.component.ts
@@ -163,21 +163,25 @@ 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, 'Committed').toPromise();
-          this.isFinishFlowDisabled = false;
-          this.finishFlow();
-        } else {
+    this.backendAPIService
+      .VerifyHCaptcha(token, this.publicKeyAdded)
+      .subscribe(
+        async (res) => {
+          if (res.Success) {
+            await this.backendAPIService
+              .GetTxn(res.TxnHashHex, 'Committed')
+              .toPromise();
+            this.isFinishFlowDisabled = false;
+            this.finishFlow();
+          } else {
+            this.captchaFailed = true;
+          }
+        },
+        (err) => {
           this.captchaFailed = true;
         }
-      },
-      (err) => {
-        this.captchaFailed = true;
-      }
-    ).add(() => 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.html b/src/app/sign-up-get-starter-deso/sign-up-get-starter-deso.component.html
index cfbbdc74..6df6bf34 100644
--- a/src/app/sign-up-get-starter-deso/sign-up-get-starter-deso.component.html
+++ b/src/app/sign-up-get-starter-deso/sign-up-get-starter-deso.component.html
@@ -285,7 +285,10 @@ <h3 class="text--neutral-white">Confirm your authentication code</h3>
       </div>
     </div>
     <div class="margin-top--medium">
-      <div *ngIf="submittingPhoneNumberVerificationCode" class="padding-top--medium display--flex flex--column items--center">
+      <div
+        *ngIf="submittingPhoneNumberVerificationCode"
+        class="padding-top--medium display--flex flex--column items--center"
+      >
         <div>Waiting for your $DESO to arrive.</div>
         <div class="spinner-border" style="width: 6rem; height: 6rem"></div>
       </div>
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 2afcbf10..2f27a85c 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,7 +300,7 @@ export class SignUpGetStarterDESOComponent implements OnInit {
         this.verificationCodeForm.value.verificationCode
       )
       .subscribe(
-        async(res) => {
+        async (res) => {
           await this.backendApi.GetTxn(res.TxnHashHex, 'Committed').toPromise();
           this.screenToShow =
             SignUpGetStarterDESOComponent.COMPLETED_PHONE_NUMBER_VERIFICATION_SCREEN;

From 80a26160bd4b182b1dd163193e9b5fbe12290191 Mon Sep 17 00:00:00 2001
From: Lazy Nina <lazynina84@gmail.com>
Date: Wed, 22 Jan 2025 09:49:25 -0500
Subject: [PATCH 3/3] Committed -> InMempool

---
 src/app/get-deso/get-deso.component.ts                          | 2 +-
 .../sign-up-get-starter-deso.component.ts                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/app/get-deso/get-deso.component.ts b/src/app/get-deso/get-deso.component.ts
index eee01624..b66c0c3d 100644
--- a/src/app/get-deso/get-deso.component.ts
+++ b/src/app/get-deso/get-deso.component.ts
@@ -169,7 +169,7 @@ export class GetDesoComponent implements OnInit {
         async (res) => {
           if (res.Success) {
             await this.backendAPIService
-              .GetTxn(res.TxnHashHex, 'Committed')
+              .GetTxn(res.TxnHashHex, 'InMempool')
               .toPromise();
             this.isFinishFlowDisabled = false;
             this.finishFlow();
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 2f27a85c..a062809c 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,7 +301,7 @@ export class SignUpGetStarterDESOComponent implements OnInit {
       )
       .subscribe(
         async (res) => {
-          await this.backendApi.GetTxn(res.TxnHashHex, 'Committed').toPromise();
+          await this.backendApi.GetTxn(res.TxnHashHex, 'InMempool').toPromise();
           this.screenToShow =
             SignUpGetStarterDESOComponent.COMPLETED_PHONE_NUMBER_VERIFICATION_SCREEN;
           this.phoneNumberVerified.emit();