@terreno/rtk 0.9.0 → 0.9.2

package/dist/useUpgradeCheck.js

@@ -1,17 +1,42 @@
 import { useToast } from "@terreno/ui";
 import Constants from "expo-constants";
-import { useCallback, useEffect, useState } from "react";
-import { Linking } from "react-native";
+import { useCallback, useEffect, useRef, useState } from "react";
+import { AppState, Linking } from "react-native";
 import { useLazyGetVersionCheckQuery } from "./emptyApi";
 import { IsWeb } from "./platform";
-export const useUpgradeCheck = () => {
+/**
+ * Checks the running app build number against the backend's VersionConfig
+ * thresholds and returns the current upgrade status.
+ *
+ * - `isRequired` — the build is below the required threshold; the caller
+ *   should block the UI (e.g. with `UpgradeRequiredScreen`).
+ * - `isWarning` — the build is below the warning threshold; the caller
+ *   can render a dismissible `Banner` or similar prompt.
+ *
+ * By default a single check runs on mount. Pass `pollingIntervalMs` and/or
+ * `recheckOnForeground` to keep long-lived sessions up to date.
+ *
+ * @param options - Optional polling and foreground re-check configuration.
+ * @returns Current upgrade status, messages, and an `onUpdate` callback.
+ */
+export const useUpgradeCheck = (options) => {
+    const { pollingIntervalMs, recheckOnForeground = false } = options ?? {};
     const [isRequired, setIsRequired] = useState(false);
+    const [isWarning, setIsWarning] = useState(false);
     const [requiredMessage, setRequiredMessage] = useState();
-    const [updateUrl, setUpdateUrl] = useState();
     const [warningMessage, setWarningMessage] = useState();
+    const [updateUrl, setUpdateUrl] = useState();
     const toast = useToast();
     const [triggerVersionCheck, result] = useLazyGetVersionCheckQuery();
     const buildNumber = Constants.expoConfig?.extra?.buildNumber;
+    const appState = useRef(AppState.currentState);
+    const runCheck = useCallback(() => {
+        if (buildNumber === undefined || buildNumber === null) {
+            return;
+        }
+        const platform = IsWeb ? "web" : "mobile";
+        void triggerVersionCheck({ platform, version: buildNumber });
+    }, [buildNumber, triggerVersionCheck]);
     const onUpdate = useCallback(() => {
         if (IsWeb) {
             window.location.reload();
@@ -26,11 +51,39 @@ export const useUpgradeCheck = () => {
             console.warn("useUpgradeCheck: no update URL available for mobile update");
         }
     }, [updateUrl]);
+    // Initial check on mount
+    useEffect(() => {
+        runCheck();
+    }, [runCheck]);
+    // Periodic re-check at the configured interval
+    useEffect(() => {
+        if (!pollingIntervalMs) {
+            return;
+        }
+        const interval = setInterval(runCheck, pollingIntervalMs);
+        return () => clearInterval(interval);
+    }, [runCheck, pollingIntervalMs]);
+    // Re-check when app/tab returns to foreground
+    useEffect(() => {
+        if (!recheckOnForeground) {
+            return;
+        }
+        const subscription = AppState.addEventListener("change", (nextAppState) => {
+            const wasBackground = /inactive|background/.test(appState.current);
+            const isNowActive = nextAppState === "active";
+            if (wasBackground && isNowActive) {
+                runCheck();
+            }
+            appState.current = nextAppState;
+        });
+        return () => subscription.remove();
+    }, [runCheck, recheckOnForeground]);
     // Show warning toast in a separate effect. ToastProvider initializes its ref
     // in useEffect, so we may need to retry when toast becomes available.
     useEffect(() => {
-        if (!warningMessage)
+        if (!warningMessage) {
             return;
+        }
         const toastId = toast.warn(warningMessage, { persistent: true });
         if (toastId) {
             setWarningMessage(undefined);
@@ -39,14 +92,7 @@ export const useUpgradeCheck = () => {
             console.warn("useUpgradeCheck: toast not yet available, will retry on next render");
         }
     }, [warningMessage, toast]);
-    useEffect(() => {
-        if (buildNumber === undefined || buildNumber === null) {
-            return;
-        }
-        const platform = IsWeb ? "web" : "mobile";
-        void triggerVersionCheck({ platform, version: buildNumber });
-    }, [buildNumber, triggerVersionCheck]);
-    // Process the version-check response: block on required, warn on warning
+    // Process version-check response — update warning/required state
     useEffect(() => {
         if (result.isError) {
             console.debug("Version check failed, continuing normally", result.error);
@@ -59,15 +105,21 @@ export const useUpgradeCheck = () => {
         if (status === "required") {
             setIsRequired(true);
             setRequiredMessage(message);
+            setIsWarning(false);
         }
-        else if (status === "warning" && message) {
+        else if (status === "warning") {
+            setIsWarning(true);
             setWarningMessage(message);
         }
+        else {
+            setIsWarning(false);
+            setIsRequired(false);
+        }
         if (responseUpdateUrl) {
             setUpdateUrl(responseUpdateUrl);
         }
     }, [result.data, result.error, result.isError, result.isSuccess]);
     const canUpdate = IsWeb || !!updateUrl;
-    return { canUpdate, isRequired, onUpdate, requiredMessage };
+    return { canUpdate, isRequired, isWarning, onUpdate, requiredMessage, warningMessage };
 };
 //# sourceMappingURL=useUpgradeCheck.js.map

package/dist/useUpgradeCheck.js.map

@@ -1 +1 @@
-{"version":3,"file":"useUpgradeCheck.js","sourceRoot":"","sources":["../src/useUpgradeCheck.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useUpgradeCheck.js","sourceRoot":"","sources":["../src/useUpgradeCheck.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -3,7 +3,7 @@
     "@better-auth/expo": "^1.2.8",
     "@react-native-async-storage/async-storage": "2.2.0",
     "@reduxjs/toolkit": "^2.11.1",
-    "@terreno/ui": "0.9.0",
+    "@terreno/ui": "0.9.2",
     "async-mutex": "^0.5.0",
     "axios": "^1.13.2",
     "axios-retry": "^4.5.0",
@@ -57,8 +57,9 @@
     "lint": "biome check .",
     "lint:fix": "biome check --write .",
     "lint:unsafefix": "biome check --write --unsafe .",
-    "test:ci": "echo 'No tests'"
+    "test": "bun test",
+    "test:ci": "bun test"
   },
   "types": "dist/index.d.ts",
-  "version": "0.9.0"
+  "version": "0.9.2"
 }

package/src/authSlice.test.ts

@@ -0,0 +1,306 @@
+import {beforeEach, describe, expect, it} from "bun:test";
+import {configureStore} from "@reduxjs/toolkit";
+import {createApi, fetchBaseQuery} from "@reduxjs/toolkit/query/react";
+
+import {
+  type EmailLoginRequest,
+  generateAuthSlice,
+  selectCurrentUserId,
+  selectIsAuthenticating,
+} from "./authSlice";
+
+// Create a real RTK Query API with the endpoints that generateAuthSlice expects
+const api = createApi({
+  baseQuery: fetchBaseQuery({baseUrl: "/"}),
+  endpoints: (builder) => ({
+    emailLogin: builder.mutation({
+      query: (body: EmailLoginRequest) => ({body, method: "POST", url: "auth/login"}),
+    }),
+    emailSignUp: builder.mutation({
+      query: (body: {email: string; password: string}) => ({
+        body,
+        method: "POST",
+        url: "auth/signup",
+      }),
+    }),
+    googleLogin: builder.mutation({
+      query: (body: {idToken: string}) => ({body, method: "POST", url: "auth/google"}),
+    }),
+  }),
+  reducerPath: "terreno-rtk",
+});
+
+const createTestStore = () => {
+  const {authReducer, middleware, ...rest} = generateAuthSlice(
+    // biome-ignore lint/suspicious/noExplicitAny: Test mock
+    api as any
+  );
+
+  return {
+    ...rest,
+    store: configureStore({
+      middleware: (getDefault) =>
+        getDefault({serializableCheck: false}).concat(api.middleware, ...middleware),
+      reducer: {
+        [api.reducerPath]: api.reducer,
+        auth: authReducer,
+      },
+    }),
+  };
+};
+
+describe("generateAuthSlice", () => {
+  let store: ReturnType<typeof createTestStore>["store"];
+  let authSlice: ReturnType<typeof createTestStore>["authSlice"];
+
+  beforeEach(() => {
+    const result = createTestStore();
+    store = result.store;
+    authSlice = result.authSlice;
+  });
+
+  describe("initial state", () => {
+    it("has correct initial values", () => {
+      const state = store.getState().auth;
+      expect(state.userId).toBeNull();
+      expect(state.error).toBeNull();
+      expect(state.isAuthenticating).toBe(false);
+      expect(state.lastTokenRefreshTimestamp).toBeNull();
+    });
+  });
+
+  describe("reducers", () => {
+    it("setUserId sets userId and clears isAuthenticating", () => {
+      store.dispatch(authSlice.actions.setUserId({userId: "user-123"}));
+      const state = store.getState().auth;
+      expect(state.userId).toBe("user-123");
+      expect(state.isAuthenticating).toBe(false);
+    });
+
+    it("logout clears state", () => {
+      store.dispatch(authSlice.actions.setUserId({userId: "user-123"}));
+      store.dispatch(authSlice.actions.logout());
+      const state = store.getState().auth;
+      expect(state.userId).toBeNull();
+      expect(state.isAuthenticating).toBe(false);
+      expect(state.lastTokenRefreshTimestamp).toBeNull();
+    });
+
+    it("tokenRefreshedSuccess sets timestamp", () => {
+      const before = Date.now();
+      store.dispatch(authSlice.actions.tokenRefreshedSuccess());
+      const state = store.getState().auth;
+      expect(state.lastTokenRefreshTimestamp).toBeGreaterThanOrEqual(before);
+      expect(state.lastTokenRefreshTimestamp).toBeLessThanOrEqual(Date.now());
+    });
+  });
+
+  describe("emailLogin matchers", () => {
+    it("matchPending sets isAuthenticating and clears error", () => {
+      // Simulate a pending email login action
+      store.dispatch({
+        meta: {arg: {endpointName: "emailLogin", type: "mutation"}, requestId: "test-1"},
+        payload: undefined,
+        type: "terreno-rtk/executeMutation/pending",
+      });
+      const state = store.getState().auth;
+      expect(state.isAuthenticating).toBe(true);
+      expect(state.error).toBeNull();
+    });
+
+    it("matchFulfilled clears isAuthenticating", () => {
+      // Set authenticating first
+      store.dispatch({
+        meta: {arg: {endpointName: "emailLogin", type: "mutation"}, requestId: "test-1"},
+        payload: undefined,
+        type: "terreno-rtk/executeMutation/pending",
+      });
+      expect(store.getState().auth.isAuthenticating).toBe(true);
+
+      // Then fulfill
+      store.dispatch({
+        meta: {arg: {endpointName: "emailLogin", type: "mutation"}, requestId: "test-1"},
+        payload: {token: "abc", userId: "user-1"},
+        type: "terreno-rtk/executeMutation/fulfilled",
+      });
+      expect(store.getState().auth.isAuthenticating).toBe(false);
+    });
+
+    it("matchRejected sets error and clears isAuthenticating", () => {
+      // Set authenticating first
+      store.dispatch({
+        meta: {arg: {endpointName: "emailLogin", type: "mutation"}, requestId: "test-1"},
+        payload: undefined,
+        type: "terreno-rtk/executeMutation/pending",
+      });
+
+      // Then reject with error
+      store.dispatch({
+        meta: {arg: {endpointName: "emailLogin", type: "mutation"}, requestId: "test-1"},
+        payload: {data: {message: "Invalid credentials"}},
+        type: "terreno-rtk/executeMutation/rejected",
+      });
+      const state = store.getState().auth;
+      expect(state.isAuthenticating).toBe(false);
+      expect(state.error).toBe("Invalid credentials");
+    });
+  });
+
+  describe("emailSignUp matchers", () => {
+    it("matchPending sets isAuthenticating and clears error", () => {
+      store.dispatch({
+        meta: {arg: {endpointName: "emailSignUp", type: "mutation"}, requestId: "test-1"},
+        payload: undefined,
+        type: "terreno-rtk/executeMutation/pending",
+      });
+      const state = store.getState().auth;
+      expect(state.isAuthenticating).toBe(true);
+      expect(state.error).toBeNull();
+    });
+
+    it("matchFulfilled clears isAuthenticating", () => {
+      store.dispatch({
+        meta: {arg: {endpointName: "emailSignUp", type: "mutation"}, requestId: "test-1"},
+        payload: undefined,
+        type: "terreno-rtk/executeMutation/pending",
+      });
+      store.dispatch({
+        meta: {arg: {endpointName: "emailSignUp", type: "mutation"}, requestId: "test-1"},
+        payload: {token: "abc", userId: "user-1"},
+        type: "terreno-rtk/executeMutation/fulfilled",
+      });
+      expect(store.getState().auth.isAuthenticating).toBe(false);
+    });
+
+    it("matchRejected sets error and clears isAuthenticating", () => {
+      store.dispatch({
+        meta: {arg: {endpointName: "emailSignUp", type: "mutation"}, requestId: "test-1"},
+        payload: undefined,
+        type: "terreno-rtk/executeMutation/pending",
+      });
+      store.dispatch({
+        meta: {arg: {endpointName: "emailSignUp", type: "mutation"}, requestId: "test-1"},
+        payload: {data: {message: "Email already exists"}},
+        type: "terreno-rtk/executeMutation/rejected",
+      });
+      const state = store.getState().auth;
+      expect(state.isAuthenticating).toBe(false);
+      expect(state.error).toBe("Email already exists");
+    });
+  });
+
+  describe("googleLogin matchers", () => {
+    it("matchPending sets isAuthenticating and clears error", () => {
+      store.dispatch({
+        meta: {arg: {endpointName: "googleLogin", type: "mutation"}, requestId: "test-1"},
+        payload: undefined,
+        type: "terreno-rtk/executeMutation/pending",
+      });
+      const state = store.getState().auth;
+      expect(state.isAuthenticating).toBe(true);
+      expect(state.error).toBeNull();
+    });
+
+    it("matchPending clears stale error from previous attempt", () => {
+      // First: fail a login to set an error
+      store.dispatch({
+        meta: {arg: {endpointName: "emailLogin", type: "mutation"}, requestId: "test-1"},
+        payload: {data: {message: "Previous error"}},
+        type: "terreno-rtk/executeMutation/rejected",
+      });
+      expect(store.getState().auth.error).toBe("Previous error");
+
+      // Then: start a google login — should clear the error
+      store.dispatch({
+        meta: {arg: {endpointName: "googleLogin", type: "mutation"}, requestId: "test-2"},
+        payload: undefined,
+        type: "terreno-rtk/executeMutation/pending",
+      });
+      expect(store.getState().auth.error).toBeNull();
+    });
+
+    it("matchFulfilled clears isAuthenticating", () => {
+      store.dispatch({
+        meta: {arg: {endpointName: "googleLogin", type: "mutation"}, requestId: "test-1"},
+        payload: undefined,
+        type: "terreno-rtk/executeMutation/pending",
+      });
+      store.dispatch({
+        meta: {arg: {endpointName: "googleLogin", type: "mutation"}, requestId: "test-1"},
+        payload: {token: "abc", userId: "user-1"},
+        type: "terreno-rtk/executeMutation/fulfilled",
+      });
+      expect(store.getState().auth.isAuthenticating).toBe(false);
+    });
+
+    it("matchRejected sets error and clears isAuthenticating", () => {
+      store.dispatch({
+        meta: {arg: {endpointName: "googleLogin", type: "mutation"}, requestId: "test-1"},
+        payload: undefined,
+        type: "terreno-rtk/executeMutation/pending",
+      });
+      store.dispatch({
+        meta: {arg: {endpointName: "googleLogin", type: "mutation"}, requestId: "test-1"},
+        payload: {data: {message: "Google auth failed"}},
+        type: "terreno-rtk/executeMutation/rejected",
+      });
+      const state = store.getState().auth;
+      expect(state.isAuthenticating).toBe(false);
+      expect(state.error).toBe("Google auth failed");
+    });
+  });
+
+  describe("persist/REHYDRATE", () => {
+    it("resets isAuthenticating to false", () => {
+      // Set authenticating
+      store.dispatch({
+        meta: {arg: {endpointName: "emailLogin", type: "mutation"}, requestId: "test-1"},
+        payload: undefined,
+        type: "terreno-rtk/executeMutation/pending",
+      });
+      expect(store.getState().auth.isAuthenticating).toBe(true);
+
+      // Simulate rehydration
+      store.dispatch({type: "persist/REHYDRATE"});
+      expect(store.getState().auth.isAuthenticating).toBe(false);
+    });
+  });
+});
+
+describe("selectors", () => {
+  it("selectCurrentUserId returns userId", () => {
+    // biome-ignore lint/suspicious/noExplicitAny: Test mock state
+    const state = {auth: {userId: "user-123"}} as any;
+    expect(selectCurrentUserId(state)).toBe("user-123");
+  });
+
+  it("selectCurrentUserId returns undefined when no auth state", () => {
+    // biome-ignore lint/suspicious/noExplicitAny: Test mock state
+    expect(selectCurrentUserId({} as any)).toBeUndefined();
+  });
+
+  it("selectIsAuthenticating returns isAuthenticating", () => {
+    // biome-ignore lint/suspicious/noExplicitAny: Test mock state
+    const state = {auth: {isAuthenticating: true}} as any;
+    expect(selectIsAuthenticating(state)).toBe(true);
+  });
+
+  it("selectIsAuthenticating defaults to false", () => {
+    // biome-ignore lint/suspicious/noExplicitAny: Test mock state
+    expect(selectIsAuthenticating({} as any)).toBe(false);
+  });
+});
+
+describe("EmailLoginRequest type", () => {
+  it("accepts email-based login", () => {
+    const request: EmailLoginRequest = {email: "test@example.com", password: "pass"};
+    expect(request.email).toBe("test@example.com");
+    expect(request.password).toBe("pass");
+  });
+
+  it("accepts username-based login", () => {
+    const request: EmailLoginRequest = {password: "pass", username: "testuser"};
+    expect(request.username).toBe("testuser");
+    expect(request.password).toBe("pass");
+  });
+});

package/src/authSlice.ts

@@ -12,6 +12,7 @@ import {IsWeb} from "./platform";
 type AuthState = {
   userId: string | null;
   error: string | null;
+  isAuthenticating: boolean;
   lastTokenRefreshTimestamp: number | null;
 };
 
@@ -23,10 +24,9 @@ export interface UserResponse {
   };
 }
 
-export interface EmailLoginRequest {
-  email: string;
-  password: string;
-}
+export type EmailLoginRequest =
+  | {email: string; username?: never; password: string}
+  | {username: string; email?: never; password: string};
 
 export interface EmailSignupRequest {
   email: string;
@@ -67,8 +67,8 @@ export function generateProfileEndpoints(
     emailLogin: builder.mutation<UserResponse, EmailLoginRequest>({
       extraOptions: {maxRetries: 0},
       invalidatesTags: [path],
-      query: ({email, password}) => ({
-        body: {email, password},
+      query: ({email, username, password}) => ({
+        body: {email, password, username},
         method: "POST",
         url: "auth/login",
       }),
@@ -105,7 +105,14 @@ export function generateProfileEndpoints(
 export const generateAuthSlice = (api: Api<any, any, any, any, any>) => {
   const authSlice = createSlice({
     extraReducers: (builder) => {
-      builder.addMatcher(api.endpoints.emailLogin.matchFulfilled, () => {
+      // Reset isAuthenticating on rehydration in case the app was killed mid-login
+      builder.addCase("persist/REHYDRATE", (state) => {
+        state.isAuthenticating = false;
+      });
+      builder.addMatcher(api.endpoints.emailLogin.matchFulfilled, (state) => {
+        // Note: isAuthenticating is normally cleared by setUserId after the listener
+        // middleware stores the token. This is a safety fallback in case the listener fails.
+        state.isAuthenticating = false;
         console.debug("Login success");
       });
       builder.addMatcher(
@@ -113,14 +120,18 @@ export const generateAuthSlice = (api: Api<any, any, any, any, any>) => {
         // biome-ignore lint/suspicious/noExplicitAny: Generic
         (state, action: PayloadAction<{data: any}>) => {
           state.error = action.payload?.data?.message;
+          state.isAuthenticating = false;
           console.debug("Login rejected", action.payload?.data?.message);
         }
       );
       builder.addMatcher(api.endpoints.emailLogin.matchPending, (state) => {
         state.error = null;
+        state.isAuthenticating = true;
         console.debug("Login pending");
       });
-      builder.addMatcher(api.endpoints.emailSignUp.matchFulfilled, () => {
+      builder.addMatcher(api.endpoints.emailSignUp.matchFulfilled, (state) => {
+        // Safety fallback: clear isAuthenticating in case the listener middleware fails.
+        state.isAuthenticating = false;
         console.debug("Signup success");
       });
       builder.addMatcher(
@@ -128,23 +139,48 @@ export const generateAuthSlice = (api: Api<any, any, any, any, any>) => {
         // biome-ignore lint/suspicious/noExplicitAny: Generic
         (state, action: PayloadAction<{data: any}>) => {
           state.error = action.payload?.data?.message;
+          state.isAuthenticating = false;
           console.debug("Signup rejected", action.payload);
         }
       );
       builder.addMatcher(api.endpoints.emailSignUp.matchPending, (state) => {
         state.error = null;
+        state.isAuthenticating = true;
         console.debug("Signup pending");
       });
+      builder.addMatcher(api.endpoints.googleLogin.matchPending, (state) => {
+        state.error = null;
+        state.isAuthenticating = true;
+      });
+      builder.addMatcher(api.endpoints.googleLogin.matchFulfilled, (state) => {
+        // Safety fallback: clear isAuthenticating in case the listener middleware fails.
+        state.isAuthenticating = false;
+      });
+      builder.addMatcher(
+        api.endpoints.googleLogin.matchRejected,
+        // biome-ignore lint/suspicious/noExplicitAny: Generic
+        (state, action: PayloadAction<{data: any}>) => {
+          state.error = action.payload?.data?.message;
+          state.isAuthenticating = false;
+        }
+      );
     },
-    initialState: {error: null, lastTokenRefreshTimestamp: null, userId: null} as AuthState,
+    initialState: {
+      error: null,
+      isAuthenticating: false,
+      lastTokenRefreshTimestamp: null,
+      userId: null,
+    } as AuthState,
     name: "auth",
     reducers: {
       logout: (state) => {
         state.userId = null;
+        state.isAuthenticating = false;
         state.lastTokenRefreshTimestamp = null;
       },
       setUserId: (state, {payload: {userId}}: PayloadAction<{userId: string}>) => {
         state.userId = userId;
+        state.isAuthenticating = false;
       },
       tokenRefreshedSuccess: (state) => {
         state.lastTokenRefreshTimestamp = Date.now();
@@ -249,6 +285,8 @@ export const generateAuthSlice = (api: Api<any, any, any, any, any>) => {
 export const selectCurrentUserId = (state: RootState): string | undefined => state.auth?.userId;
 export const selectLastTokenRefreshTimestamp = (state: RootState): number | null =>
   state.auth?.lastTokenRefreshTimestamp;
+export const selectIsAuthenticating = (state: RootState): boolean =>
+  state.auth?.isAuthenticating ?? false;
 
 export const useSelectCurrentUserId = (): string | undefined => {
   return useSelector((state: RootState): string | undefined => {
@@ -256,6 +294,10 @@ export const useSelectCurrentUserId = (): string | undefined => {
   });
 };
 
+export const useSelectIsAuthenticating = (): boolean => {
+  return useSelector((state: RootState): boolean => state.auth?.isAuthenticating ?? false);
+};
+
 export async function getAuthToken(): Promise<string | null> {
   let token: string | null;
 

package/src/test-preload.ts

@@ -0,0 +1,28 @@
+import {mock} from "bun:test";
+
+mock.module("react-native", () => ({
+  Platform: {OS: "web"},
+  StyleSheet: {create: (s: unknown) => s},
+}));
+
+mock.module("expo-secure-store", () => ({
+  deleteItemAsync: async () => {},
+  getItemAsync: async () => null,
+  setItemAsync: async () => {},
+}));
+
+mock.module("@react-native-async-storage/async-storage", () => ({
+  default: {
+    getItem: async () => null,
+    removeItem: async () => {},
+    setItem: async () => {},
+  },
+}));
+
+mock.module("expo-constants", () => ({
+  default: {expoConfig: {extra: {}}},
+}));
+
+mock.module("expo-network", () => ({
+  getNetworkStateAsync: async () => ({isConnected: true}),
+}));