From 6c2d1b225d72685d502df43356408908291eeed0 Mon Sep 17 00:00:00 2001
From: Roland Osborne <roland.osborne@gmail.com>
Date: Fri, 10 Feb 2023 12:12:08 -0800
Subject: [PATCH] more app context cleanup

---
 app/mobile/src/context/useAppContext.hook.js | 5 ++---
 app/mobile/test/App.test.js                  | 7 ++++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/app/mobile/src/context/useAppContext.hook.js b/app/mobile/src/context/useAppContext.hook.js
index ea6c096c..bbb52645 100644
--- a/app/mobile/src/context/useAppContext.hook.js
+++ b/app/mobile/src/context/useAppContext.hook.js
@@ -17,7 +17,6 @@ export function useAppContext() {
   const [state, setState] = useState({
     session: null,
     status: 'disconnected',
-    first: true,
     loggingOut: false,
     adminToken: null,
     version: getVersion(),
@@ -53,7 +52,7 @@ export function useAppContext() {
   }, []);
 
   const setSession = async () => {
-    updateState({ session: true });
+    updateState({ session: true, status: 'connecting' });
     await account.actions.setSession(access.current);
     await profile.actions.setSession(access.current);
     await card.actions.setSession(access.current);
@@ -153,7 +152,7 @@ export function useAppContext() {
       try {
         delay.current = 0;
         const rev = JSON.parse(ev.data);
-        updateState({ first: false, status: 'connected' });
+        updateState({ status: 'connected' });
         profile.actions.setRevision(rev.profile);
         account.actions.setRevision(rev.account);
         channel.actions.setRevision(rev.channel);
diff --git a/app/mobile/test/App.test.js b/app/mobile/test/App.test.js
index 93bcb399..bf6df96d 100644
--- a/app/mobile/test/App.test.js
+++ b/app/mobile/test/App.test.js
@@ -78,6 +78,11 @@ beforeEach(() => {
   React.useContext = mockUseContext;
 
   const mockFetch = jest.fn().mockImplementation((url, options) => {
+    if (url.startsWith('https://test.org/account/apps')) {
+      return Promise.resolve({
+        json: () => Promise.resolve({ guid: '123', appToken: 'abc' })
+      });
+    }
     return Promise.resolve({
       json: () => Promise.resolve([])
     });
@@ -103,7 +108,7 @@ test('testing', async () => {
 
   await act(async () => {
     const app = screen.getByTestId('app').props.app;
-    app.actions.login('testlogin', 'testpassword');
+    app.actions.login('testlogin@test.org', 'testpassword');
   });
 
   await waitFor(async () => {