From 9a80f4bdf54df4f41d1a58c5d8a43c5e789ab89b Mon Sep 17 00:00:00 2001
From: George Gevoian <george@gevoian.com>
Date: Thu, 6 Jul 2023 00:28:48 -0400
Subject: [PATCH] (core) Exclude additional pages from needsOrg

Summary:
A recent change broke the ability to open the account page if the current
org was inaccessible or invalid. Now the account page, and a few additional
pages, are excluded from needing an org to load.

Test Plan: Browser test.

Reviewers: jarek

Reviewed By: jarek

Differential Revision: https://phab.getgrist.com/D3944
---
 app/client/models/AppModel.ts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/client/models/AppModel.ts b/app/client/models/AppModel.ts
index f2fc1692..bd4c20f3 100644
--- a/app/client/models/AppModel.ts
+++ b/app/client/models/AppModel.ts
@@ -284,7 +284,13 @@ export class AppModelImpl extends Disposable implements AppModel {
 
   public readonly needsOrg: Observable<boolean> = Computed.create(
     this, urlState().state, (use, state) => {
-      return !(Boolean(state.welcome) || state.billing === 'scheduled');
+      return !(
+        Boolean(state.welcome) ||
+        state.billing === 'scheduled' ||
+        Boolean(state.account) ||
+        Boolean(state.activation) ||
+        Boolean(state.supportGrist)
+      );
     });
 
   public readonly notifier = this.topAppModel.notifier;