From c4dbc5cbd2147b695403e6f57254a97d42337965 Mon Sep 17 00:00:00 2001
From: Mo <mo@standardnotes.com>
Date: Thu, 3 Nov 2022 06:46:07 -0500
Subject: [PATCH] fix: purchase flow close on complete

---
 .../Components/PurchaseFlow/Panes/CreateAccount.tsx | 13 +++++++++----
 .../Components/PurchaseFlow/Panes/SignIn.tsx        | 12 ++++++++----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/packages/web/src/javascripts/Components/PurchaseFlow/Panes/CreateAccount.tsx b/packages/web/src/javascripts/Components/PurchaseFlow/Panes/CreateAccount.tsx
index b545673d8..09d3d0257 100644
--- a/packages/web/src/javascripts/Components/PurchaseFlow/Panes/CreateAccount.tsx
+++ b/packages/web/src/javascripts/Components/PurchaseFlow/Panes/CreateAccount.tsx
@@ -91,10 +91,15 @@ const CreateAccount: FunctionComponent<Props> = ({ viewControllerManager, applic
 
     try {
       await application.register(email, password)
-      loadPurchaseFlowUrl(application).catch((err) => {
-        console.error(err)
-        application.alertService.alert(err).catch(console.error)
-      })
+
+      viewControllerManager.purchaseFlowController.closePurchaseFlow()
+
+      if (!application.hideSubscriptionMarketing) {
+        loadPurchaseFlowUrl(application).catch((err) => {
+          console.error(err)
+          application.alertService.alert(err).catch(console.error)
+        })
+      }
     } catch (err) {
       console.error(err)
       application.alertService.alert(err as string).catch(console.error)
diff --git a/packages/web/src/javascripts/Components/PurchaseFlow/Panes/SignIn.tsx b/packages/web/src/javascripts/Components/PurchaseFlow/Panes/SignIn.tsx
index 6fb8ff0c6..172047060 100644
--- a/packages/web/src/javascripts/Components/PurchaseFlow/Panes/SignIn.tsx
+++ b/packages/web/src/javascripts/Components/PurchaseFlow/Panes/SignIn.tsx
@@ -74,10 +74,14 @@ const SignIn: FunctionComponent<Props> = ({ viewControllerManager, application }
       if (response.error || response.data?.error) {
         throw new Error(response.error?.message || response.data?.error?.message)
       } else {
-        loadPurchaseFlowUrl(application).catch((err) => {
-          console.error(err)
-          application.alertService.alert(err).catch(console.error)
-        })
+        viewControllerManager.purchaseFlowController.closePurchaseFlow()
+
+        if (!application.hideSubscriptionMarketing) {
+          loadPurchaseFlowUrl(application).catch((err) => {
+            console.error(err)
+            application.alertService.alert(err).catch(console.error)
+          })
+        }
       }
     } catch (err) {
       console.error(err)