Ln/fix gmail signup flow

src/app/auth/google/google.component.html

@@ -21,7 +21,6 @@ <h4 class="text--neutral-white">Save your recovery code</h4>
       <div
         class="margin-top--medium display--flex justify--between items--center flex--column--tablet gap--25--tablet"
       >
-        >
         <div class="section--seed__actions">
           <button
             (click)="copySeed()"

src/app/auth/google/google.component.ts

@@ -162,6 +162,34 @@ export class GoogleComponent implements OnInit {
       this.globalVars.accessLevelRequest
     );
 
+    if (!this.globalVars.getFreeDeso) {
+      this.login(signedUp);
+      return;
+    }
+    if (!signedUp || !this.globalVars.getFreeDeso) {
+      this.backendApi
+        .GetUsersStateless([this.publicKey], true, true)
+        .subscribe((res) => {
+          if (res?.UserList?.length) {
+            if (res.UserList[0].BalanceNanos !== 0) {
+              this.login(signedUp);
+              return;
+            }
+          }
+          this.router.navigate(['/', RouteNames.GET_DESO], {
+            queryParams: { publicKey: this.publicKey, signedUp },
+            queryParamsHandling: 'merge',
+          });
+        });
+    } else {
+      this.router.navigate(['/', RouteNames.GET_DESO], {
+        queryParams: { publicKey: this.publicKey, signedUp },
+        queryParamsHandling: 'merge',
+      });
+    }
+  }
+
+  login(signedUp: boolean): void {
     if (this.globalVars.derive) {
       this.router.navigate(['/', RouteNames.DERIVE], {
         queryParams: {
@@ -174,35 +202,8 @@ export class GoogleComponent implements OnInit {
         },
         queryParamsHandling: 'merge',
       });
-    } else {
-      if (!this.globalVars.getFreeDeso) {
-        this.login(signedUp);
-      }
-      if (!signedUp) {
-        this.backendApi
-          .GetUsersStateless([this.publicKey], true, true)
-          .subscribe((res) => {
-            if (res?.UserList?.length) {
-              if (res.UserList[0].BalanceNanos !== 0) {
-                this.login(signedUp);
-                return;
-              }
-            }
-            this.router.navigate(['/', RouteNames.GET_DESO], {
-              queryParams: { publicKey: this.publicKey, signedUp },
-              queryParamsHandling: 'merge',
-            });
-          });
-      } else {
-        this.router.navigate(['/', RouteNames.GET_DESO], {
-          queryParams: { publicKey: this.publicKey, signedUp },
-          queryParamsHandling: 'merge',
-        });
-      }
+      return;
     }
-  }
-
-  login(signedUp: boolean): void {
     this.identityService.login({
       users: this.accountService.getEncryptedUsers(),
       publicKeyAdded: this.publicKey,

src/app/buy-deso/buy-deso-heroswap/buy-deso-heroswap.component.ts

@@ -56,7 +56,14 @@ export class BuyDeSoHeroSwapComponent implements OnInit, OnDestroy {
   finishFlow(): void {
     if (this.globalVars.derive) {
       this.router.navigate(['/', RouteNames.DERIVE], {
-        queryParams: { publicKey: this.publicKey },
+        queryParams: {
+          publicKey: this.publicKey,
+          transactionSpendingLimitResponse:
+            this.globalVars.transactionSpendingLimitResponse,
+          deleteKey: this.globalVars.deleteKey || undefined,
+          derivedPublicKey: this.globalVars.derivedPublicKey || undefined,
+          expirationDays: this.globalVars.expirationDays || undefined,
+        },
         queryParamsHandling: 'merge',
       });
     } else {

src/app/buy-or-send-deso/buy-or-send-deso.component.ts

@@ -107,7 +107,14 @@ export class BuyOrSendDesoComponent implements OnInit {
   finishFlow(): void {
     if (this.globalVars.derive) {
       this.router.navigate(['/', RouteNames.DERIVE], {
-        queryParams: { publicKey: this.publicKeyAdded },
+        queryParams: {
+          publicKey: this.publicKeyAdded,
+          transactionSpendingLimitResponse:
+            this.globalVars.transactionSpendingLimitResponse,
+          deleteKey: this.globalVars.deleteKey || undefined,
+          derivedPublicKey: this.globalVars.derivedPublicKey || undefined,
+          expirationDays: this.globalVars.expirationDays || undefined,
+        },
         queryParamsHandling: 'merge',
       });
     } else {

src/app/get-deso/get-deso.component.ts

@@ -237,7 +237,14 @@ export class GetDesoComponent implements OnInit {
     }
     if (this.globalVars.derive) {
       this.router.navigate(['/', RouteNames.DERIVE], {
-        queryParams: { publicKey: this.publicKeyAdded },
+        queryParams: {
+          publicKey: this.publicKeyAdded,
+          transactionSpendingLimitResponse:
+            this.globalVars.transactionSpendingLimitResponse,
+          deleteKey: this.globalVars.deleteKey || undefined,
+          derivedPublicKey: this.globalVars.derivedPublicKey || undefined,
+          expirationDays: this.globalVars.expirationDays || undefined,
+        },
         queryParamsHandling: 'merge',
       });
     } else {

src/app/sign-up-get-starter-deso/sign-up-get-starter-deso.component.ts

@@ -321,7 +321,14 @@ export class SignUpGetStarterDESOComponent implements OnInit {
     this.finishFlowEvent.emit();
     if (this.globalVars.derive) {
       this.router.navigate(['/', RouteNames.DERIVE], {
-        queryParams: { publicKey: this.publicKey },
+        queryParams: {
+          publicKey: this.publicKey,
+          transactionSpendingLimitResponse:
+            this.globalVars.transactionSpendingLimitResponse,
+          deleteKey: this.globalVars.deleteKey || undefined,
+          derivedPublicKey: this.globalVars.derivedPublicKey || undefined,
+          expirationDays: this.globalVars.expirationDays || undefined,
+        },
         queryParamsHandling: 'merge',
       });
       return;