merge

thedev132 · thedev132 · commit bd45934dff0b · 2025-11-09T22:20:05.000-08:00
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -0,0 +1,31 @@
+name: Publish Updates to Production
+on:
+  push:
+    branches:
+      - main
+jobs:
+  update:
+    runs-on: ubuntu-latest
+    steps:
+      - name: 🏗 Setup repo
+        uses: actions/checkout@v3
+
+      - name: 🏗 Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 18.x
+          cache: npm
+
+      - name: 🏗 Setup EAS
+        uses: expo/expo-github-action@v8
+        with:
+          eas-version: latest
+          token: ${{ secrets.EXPO_TOKEN }}
+
+      - name: 📦 Install dependencies
+        run: npm ci
+
+      - name: 🚀 Create update
+        run: |
+          MESSAGE=$(git log -1 --pretty=%B)
+          eas update --channel production --environment production --non-interactive --message "$MESSAGE"
diff --git a/App.tsx b/App.tsx
@@ -3,8 +3,11 @@ import "expo-dev-client";
 import * as SentryReact from "@sentry/react";
 import * as Sentry from "@sentry/react-native";
 import { StripeProvider } from "@stripe/stripe-react-native";
+import * as BackgroundTask from "expo-background-task";
 import { useFonts } from "expo-font";
 import { ShareIntentProvider as ExpoShareIntentProvider } from "expo-share-intent";
+import * as TaskManager from "expo-task-manager";
+import * as Updates from "expo-updates";
 import { useColorScheme } from "react-native";
 
 import { AuthProvider } from "./src/auth/AuthProvider";
@@ -15,6 +18,25 @@ import { LinkingProvider } from "./src/providers/LinkingContext";
 import { ShareIntentProvider } from "./src/providers/ShareIntentContext";
 import { ThemeProvider } from "./src/providers/ThemeContext";
 
+const BACKGROUND_TASK_NAME = "task-run-expo-update";
+
+export const setupBackgroundUpdates = async () => {
+  TaskManager.defineTask(BACKGROUND_TASK_NAME, async () => {
+    const update = await Updates.checkForUpdateAsync();
+    if (update.isAvailable) {
+      await Updates.fetchUpdateAsync();
+      await Updates.reloadAsync();
+    }
+    return Promise.resolve();
+  });
+
+  await BackgroundTask.registerTaskAsync(BACKGROUND_TASK_NAME, {
+    minimumInterval: 60 * 24,
+  });
+};
+
+setupBackgroundUpdates();
+
 function App() {
   const [fontsLoaded] = useFonts({
     "JetBrainsMono-Regular": require("./assets/fonts/JetBrainsMono-Regular.ttf"),
diff --git a/patches/@thedev132+yellowpages+1.0.0.patch b/patches/@thedev132+yellowpages+1.0.0.patch
@@ -0,0 +1,22 @@
+diff --git a/node_modules/@thedev132/yellowpages/dist/index.js b/node_modules/@thedev132/yellowpages/dist/index.js
+index 80558a8..887aa5c 100644
+--- a/node_modules/@thedev132/yellowpages/dist/index.js
++++ b/node_modules/@thedev132/yellowpages/dist/index.js
+@@ -13,7 +13,7 @@ var _Category = class _Category {
+         "https://raw.githubusercontent.com/hackclub/yellow_pages/main/lib/yellow_pages/categories.yaml"
+       );
+       const text = await response.text();
+-      const yaml = await import("js-yaml");
++      const yaml = require("js-yaml");
+       const data = yaml.load(text);
+       this.categoriesByCode = Object.entries(data).reduce(
+         (acc, [code, obj]) => {
+@@ -79,7 +79,7 @@ var _Merchant = class _Merchant {
+         "https://raw.githubusercontent.com/hackclub/yellow_pages/main/lib/yellow_pages/merchants.yaml"
+       );
+       const text = await response.text();
+-      const yaml = await import("js-yaml");
++      const yaml = require("js-yaml");
+       const data = yaml.load(text);
+       this.merchants = data.reduce((acc, merchant) => {
+         if (!merchant.name) return acc;
diff --git a/src/auth/AuthProvider.tsx b/src/auth/AuthProvider.tsx
@@ -13,9 +13,6 @@ const TOKEN_CREATED_AT_KEY = "auth_token_created_at";
 
 const redirectUri = makeRedirectUri({ scheme: "hcb" });
 
-let lastSuccessfulRefreshTime = 0;
-const MIN_REFRESH_INTERVAL_MS = 1000;
-
 let refreshPromise: Promise<{
   success: boolean;
   newTokens?: AuthTokens;
@@ -120,7 +117,6 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
         await SecureStore.deleteItemAsync(TOKEN_CREATED_AT_KEY);
         await SecureStore.deleteItemAsync(CODE_VERIFIER_KEY);
         setTokensState(null);
-        Sentry.setUser(null);
       }
     } catch (error) {
       console.error("Failed to save auth tokens", error, {
@@ -140,9 +136,7 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
       await SecureStore.deleteItemAsync(CODE_VERIFIER_KEY);
 
       setTokensState(null);
-      Sentry.setUser(null);
 
-      lastSuccessfulRefreshTime = 0;
       refreshPromise = null;
     } catch (error) {
       console.error("Error during forced logout", error, {
@@ -181,13 +175,6 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
       }
 
       const now = Date.now();
-      const timeSinceLastRefresh = now - lastSuccessfulRefreshTime;
-      if (timeSinceLastRefresh < MIN_REFRESH_INTERVAL_MS) {
-        console.log(
-          `Skipping token refresh - last refresh was ${timeSinceLastRefresh}ms ago (minimum interval: ${MIN_REFRESH_INTERVAL_MS}ms)`,
-        );
-        return { success: true, newTokens: tokens };
-      }
 
       console.log("Client ID:", process.env.EXPO_PUBLIC_CLIENT_ID);
       console.log("Redirect URI:", redirectUri);
@@ -284,8 +271,6 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
 
           console.log("Token refreshed successfully");
 
-          lastSuccessfulRefreshTime = Date.now();
-
           return { success: true, newTokens };
         } catch (error) {
           console.error("Token refresh failed", error, {
diff --git a/src/components/cards/CardDetails.tsx b/src/components/cards/CardDetails.tsx
@@ -349,7 +349,13 @@ export default function CardDetails({
               </Text>
             </View>
             {grantCard?.purpose && (
-              <>
+              <View
+                style={{
+                  flexDirection: "row",
+                  justifyContent: "space-between",
+                  marginBottom: 12,
+                }}
+              >
                 <Text
                   style={{
                     fontSize: 16,
@@ -365,11 +371,12 @@ export default function CardDetails({
                     fontSize: 16,
                     fontWeight: "500",
                     fontFamily: "JetBrainsMono-Regular",
+                    flexShrink: 1,
                   }}
                 >
                   {grantCard?.purpose}
                 </Text>
-              </>
+              </View>
             )}
           </View>
           <View
diff --git a/src/components/core/SentryUserBridge.tsx b/src/components/core/SentryUserBridge.tsx
@@ -7,16 +7,14 @@ import User from "../../lib/types/User";
 function SentryUserBridge() {
   const { data: user } = useSWR<User>("user");
   useEffect(() => {
-    console.log("user", user);
     if (user?.id) {
       Sentry.setUser({
         id: String(user.id),
         email: user.email ?? undefined,
-        username: user.name ?? undefined,
+        name: user.name ?? undefined,
       });
     } else {
       Sentry.setUser(null);
-      Sentry.setContext("user", null as unknown as Record<string, unknown>);
     }
   }, [user]);
   return null;
diff --git a/src/core/AppContent.tsx b/src/core/AppContent.tsx
@@ -87,6 +87,7 @@ export default function AppContent({
   const [appIsReady, setAppIsReady] = useState(false);
   const isDark = useIsDark();
   const navigationRef = useRef<NavigationContainerRef<TabParamList>>(null);
+  const isBiometricAuthInProgress = useRef(false);
   const hcb = useClient();
 
   useEffect(() => {
@@ -244,6 +245,16 @@ export default function AppContent({
             return;
           }
 
+          if (isBiometricAuthInProgress.current) {
+            console.log(
+              "Biometric authentication already in progress, skipping...",
+            );
+            return;
+          }
+
+          isBiometricAuthInProgress.current = true;
+
+          // Keep splash screen visible during biometric authentication
           const result = await LocalAuthentication.authenticateAsync({
             promptMessage: "Authenticate to access HCB",
             cancelLabel: "Cancel",
@@ -263,17 +274,21 @@ export default function AppContent({
             );
             setIsAuthenticated(false);
           }
+          setAppIsReady(true);
+          isBiometricAuthInProgress.current = false;
         } catch (error) {
           console.error("Biometric authentication error", error, {
             context: { action: "biometric_auth" },
           });
           setIsAuthenticated(false);
+          setAppIsReady(true);
+          isBiometricAuthInProgress.current = false;
         }
       } else {
         console.log("No access token, skipping biometric authentication");
         setIsAuthenticated(true);
+        setAppIsReady(true);
       }
-      setAppIsReady(true);
     };
 
     checkAuth();
diff --git a/src/lib/NavigatorParamList.ts b/src/lib/NavigatorParamList.ts
@@ -37,7 +37,7 @@ export type StackParamList = {
 
 export type CardsStackParamList = {
   CardList: undefined;
-  Card: { card?: Card; cardId?: string };
+  Card: { card?: Card; cardId?: string; grantId?: string };
   GrantCard: { grantId: string };
   OrderCard: undefined;
   Transaction: {
diff --git a/src/lib/useDigitalWallet.ts b/src/lib/useDigitalWallet.ts
@@ -116,11 +116,15 @@ export default function useDigitalWallet(cardId: string, isPhysical: boolean) {
 
   useEffect(() => {
     if (Platform.OS === "ios") {
-      import("react-native-watch-connectivity").then(({ getIsPaired }) => {
-        getIsPaired().then((isPaired) => {
+      try {
+        // eslint-disable-next-line @typescript-eslint/no-var-requires
+        const { getIsPaired } = require("react-native-watch-connectivity");
+        getIsPaired().then((isPaired: boolean) => {
           setIsPaired(isPaired);
         });
-      });
+      } catch (e) {
+        setIsPaired(false);
+      }
     } else {
       setIsPaired(false);
     }
diff --git a/src/pages/Invitation.tsx b/src/pages/Invitation.tsx
@@ -69,6 +69,7 @@ export default function InvitationPage({
           organization: invitation!.organization,
         });
         mutate(`user/organizations`);
+        mutate("user/invitations");
       },
       onError: () => {
         showAlert(
@@ -96,7 +97,10 @@ export default function InvitationPage({
     {
       populateCache: (_, invitations) =>
         invitations?.filter((i) => i.id != inviteId) || [],
-      onSuccess: () => navigation.goBack(),
+      onSuccess: () => {
+        mutate("user/invitations");
+        navigation.goBack();
+      },
     },
   );
 
diff --git a/src/pages/ReceiptSelectionModal.tsx b/src/pages/ReceiptSelectionModal.tsx
@@ -96,7 +96,7 @@ export default function ReceiptSelectionModal({
       }
 
       // Refresh the receipt bin data
-      await mutate("user/receipt_bin");
+      await mutate("receipts");
       await mutate("user/transactions/missing_receipt");
 
       Toast.show({
diff --git a/src/pages/Transaction.tsx b/src/pages/Transaction.tsx
@@ -1,7 +1,7 @@
 import { useBottomTabBarHeight } from "@react-navigation/bottom-tabs";
 import { useTheme } from "@react-navigation/native";
 import { NativeStackScreenProps } from "@react-navigation/native-stack";
-import { useState } from "react";
+import { useMemo, useState } from "react";
 import {
   ScrollView,
   View,
@@ -31,8 +31,9 @@ import { TransactionViewProps } from "../components/transaction/types/Transactio
 import TransferTransaction from "../components/transaction/types/TransferTransaction";
 import { StackParamList } from "../lib/NavigatorParamList";
 import IComment from "../lib/types/Comment";
-import Organization from "../lib/types/Organization";
+import Organization, { OrganizationExpanded } from "../lib/types/Organization";
 import Transaction, { TransactionType } from "../lib/types/Transaction";
+import User from "../lib/types/User";
 import { useOfflineSWR } from "../lib/useOfflineSWR";
 import { palette } from "../styles/theme";
 
@@ -61,7 +62,13 @@ export default function TransactionPage({
         ? `organizations/${transaction.organization.id}/transactions/${transactionId}/comments`
         : null,
   );
-
+  const { data: organization } = useOfflineSWR<OrganizationExpanded>(
+    `organizations/${orgId || transaction?.organization?.id}`,
+  );
+  const { data: user } = useOfflineSWR<User>(`user`);
+  const isUserInOrganizationOrAuditor = useMemo(() => {
+    return organization?.users.some((u) => u.id === user?.id) || user?.auditor;
+  }, [organization, user]);
   const tabBarHeight = useBottomTabBarHeight();
   const { colors: themeColors } = useTheme();
 
@@ -173,8 +180,9 @@ export default function TransactionPage({
               ))}
             </View>
           )}
-
-          <CommentField orgId={currentOrgId} transactionId={transactionId} />
+          {isUserInOrganizationOrAuditor && (
+            <CommentField orgId={currentOrgId} transactionId={transactionId} />
+          )}
         </View>
       </ScrollView>
     </KeyboardAvoidingView>
diff --git a/src/pages/cards/card.tsx b/src/pages/cards/card.tsx
@@ -68,7 +68,7 @@ export default function CardPage(
   const navigation = "route" in props ? props.navigation : props.navigation;
   const { colors: themeColors } = useTheme();
   const hcb = useClient();
-  const grantId = (props as CardPageProps)?.grantId;
+  const grantId = "route" in props ? props.route.params.grantId : props.grantId;
 
   const { data: grantCard = _card as GrantCard } = useOfflineSWR<GrantCard>(
     grantId ? `card_grants/${grantId}` : null,
@@ -498,7 +498,7 @@ export default function CardPage(
             handleOneTimeUse(
               card as Card,
               setIsOneTimeUse,
-              () => mutate(`card_grants/${grantId}`),
+              mutate,
               hcb,
               grantId as string,
               grantCard as GrantCard,
@@ -553,7 +553,7 @@ export default function CardPage(
               isCardholder,
               grantCard as GrantCard,
               setisReturningGrant,
-              () => mutate(`card_grants/${grantId}`),
+              mutate,
               hcb,
               grantId as string,
               navigation,
@@ -756,10 +756,11 @@ export default function CardPage(
           handleTopup(
             topupAmount,
             card as Card,
+            grantId as string,
             setIsToppingUp,
             setTopupAmount,
             setShowTopupModal,
-            () => mutate(`cards/${card?.id}`),
+            mutate,
             hcb,
           )
         }
@@ -780,7 +781,7 @@ export default function CardPage(
             setIsSettingPurpose,
             setPurposeText,
             setShowPurposeModal,
-            () => mutate(`cards/${card?.id}`),
+            mutate,
             hcb,
             grantId || "",
             purposeText,
diff --git a/src/pages/cards/cards.tsx b/src/pages/cards/cards.tsx
diff --git a/src/pages/settings/About.tsx b/src/pages/settings/About.tsx
diff --git a/src/pages/settings/Settings.tsx b/src/pages/settings/Settings.tsx
diff --git a/src/utils/cardActions.ts b/src/utils/cardActions.ts
