Merge branch 'main' into thedev132/cardcreation

Author: thedev132

.eslintrc.js

@@ -46,7 +46,6 @@ module.exports = {
     ],
     "@typescript-eslint/no-non-null-assertion": "off",
     "react/no-unescaped-entities": "off",
-    "no-console": "warn",
   },
   globals: {
     fetch: "readonly",

.github/CODEOWNERS

@@ -1 +1 @@
-* @yednapg @thedev132 @Luke-Oldenburg
+* @hackclub/hcb-mobile

.github/dependabot.yml

@@ -1,7 +1,9 @@
 ## Summary of the problem
+
 <!-- Why these changes are being made? What problem does it solve? Link any related issues to provide more details. -->
 
 ## Describe your changes
+
 <!-- Explain your thought process to the solution and provide a quick summary of the changes. -->
 
 ## Checklist

.github/pull_request_template.md

@@ -1,11 +1,11 @@
 name: CI
 on:
   push:
-      branches:
-        - '**'
+    branches:
+      - "**"
   pull_request:
     branches:
-      - '**'
+      - "**"
 jobs:
   eslint:
     name: ESLint

.github/workflows/ci.yml

@@ -0,0 +1,40 @@
+name: preview
+on: pull_request
+
+jobs:
+  update:
+    if: github.event.pull_request.head.repo.fork == false
+    name: EAS Update
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      pull-requests: write
+    steps:
+      - name: Check for EXPO_TOKEN
+        run: |
+          if [ -z "${{ secrets.EXPO_TOKEN }}" ]; then
+            echo "You must provide an EXPO_TOKEN secret linked to this project's Expo account in this repo's secrets. Learn more: https://docs.expo.dev/eas-update/github-actions"
+            exit 1
+          fi
+
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v1
+        with:
+          bun-version: latest
+
+      - name: Setup EAS
+        uses: expo/expo-github-action@v8
+        with:
+          eas-version: latest
+          token: ${{ secrets.EXPO_TOKEN }}
+
+      - name: Install dependencies
+        run: bun install
+
+      - name: 🚀 Create preview
+        uses: expo/expo-github-action/preview@v8
+        with:
+          command: eas update --auto --branch preview

.github/workflows/preview.yml

@@ -2,11 +2,13 @@ import "expo-dev-client";
 
 import { ActionSheetProvider } from "@expo/react-native-action-sheet";
 import { LinkingOptions, NavigationContainer } from "@react-navigation/native";
+import { useStripeTerminal } from "@stripe/stripe-terminal-react-native";
 import { useFonts } from "expo-font";
 import * as Linking from "expo-linking";
 import * as SecureStorage from "expo-secure-store";
 import { useState, useEffect, useCallback } from "react";
 import { StatusBar, useColorScheme } from "react-native";
+import { AlertNotificationRoot } from "react-native-alert-notification";
 import { SafeAreaProvider } from "react-native-safe-area-context";
 import { SWRConfig } from "swr";
 
@@ -24,6 +26,8 @@ const linking: LinkingOptions<TabParamList> = {
     Linking.createURL("/"),
     "https://bank.hackclub.com",
     "https://hcb.hackclub.com",
+    "http://bank.hackclub.com",
+    "http://hcb.hackclub.com",
   ],
   config: {
     screens: {
@@ -37,6 +41,7 @@ const linking: LinkingOptions<TabParamList> = {
               transactionId: (id) => `txn_${id}`,
             },
           },
+          OrganizationLoader: ":orgId",
         },
       },
       Cards: {
@@ -45,27 +50,31 @@ const linking: LinkingOptions<TabParamList> = {
           CardList: "my/cards",
         },
       },
+      Receipts: "my/inbox",
     },
   },
   getStateFromPath,
 };
 
 export default function App() {
   const [fontsLoaded] = useFonts({
-    'JetBrainsMono-Regular': require('./assets/fonts/JetBrainsMono-Regular.ttf'),
-    'JetBrainsMono-Bold': require('./assets/fonts/JetBrainsMono-Bold.ttf'),
-    'Consolas-Bold': require('./assets/fonts/CONSOLAB.ttf'),
+    "JetBrainsMono-Regular": require("./assets/fonts/JetBrainsMono-Regular.ttf"),
+    "JetBrainsMono-Bold": require("./assets/fonts/JetBrainsMono-Bold.ttf"),
+    "Consolas-Bold": require("./assets/fonts/CONSOLAB.ttf"),
+    Damion: require("./assets/fonts/Damion-Regular.ttf"),
   });
 
   const [isLoading, setIsLoading] = useState(true);
   const [token, setToken] = useState<string | null>(null);
   const hcb = useClient(token);
   const scheme = useColorScheme();
+  useStripeTerminal();
 
   const fetcher = useCallback(
-    async (url: string) => {
+    async (url: string, options: RequestInit) => {
       try {
-        return await hcb(url).json();
+        // Allows us to use the v3 API in the v4 SWR
+        return await hcb(url, options).json();
       } catch (error) {
         if (
           error.name === "HTTPError" &&
@@ -111,17 +120,20 @@ export default function App() {
 
       <SWRConfig
         value={{
-          provider: asyncStorageProvider, fetcher
+          provider: asyncStorageProvider,
+          fetcher,
         }}
       >
         <SafeAreaProvider>
           <ActionSheetProvider>
-            <NavigationContainer
-              theme={scheme == "dark" ? theme : lightTheme}
-              linking={linking}
-            >
-              <Navigator />
-            </NavigationContainer>
+            <AlertNotificationRoot>
+              <NavigationContainer
+                theme={scheme == "dark" ? theme : lightTheme}
+                linking={linking}
+              >
+                <Navigator />
+              </NavigationContainer>
+            </AlertNotificationRoot>
           </ActionSheetProvider>
         </SafeAreaProvider>
       </SWRConfig>

App.tsx

@@ -1,4 +1,5 @@
 # Contributing
+
 Thank you for choosing to contribute to HCB Mobile! Please follow the guidelines before on how to contribute.
 
 - Use the PR template

CONTRIBUTING.md

@@ -58,4 +58,6 @@ EXPO_PUBLIC_CLIENT_ID=<uid field from the Doorkeeper app>
    - Bonus task: painfully watch Gradle attempt to work
 
 ## Contributing
-Please see [CONTRIBUTING.md](CONTRIBUTING.md).
+
+Please see [CONTRIBUTING.md](CONTRIBUTING.md).
+

README.md

@@ -1,3 +1,4 @@
+import appIcons from "./src/lib/AppIconList";
 const IS_DEV = process.env.APP_VARIANT === "development";
 
 export default {
@@ -17,16 +18,19 @@ export default {
     },
     assetBundlePatterns: ["**/*"],
     ios: {
-      supportsTablet: true,
+      supportsTablet: false,
       bundleIdentifier: IS_DEV ? "com.hackclub.hcb.dev" : "com.hackclub.hcb",
-      buildNumber: "1.0.0.15",
+      buildNumber: "1.0.0.17",
       config: {
         usesNonExemptEncryption: false,
       },
       associatedDomains: [
         "applinks:hcb.hackclub.com",
         "applinks:bank.hackclub.com",
       ],
+      // entitlements: {
+      //   "com.apple.developer.proximity-reader.payment.acceptance": true,
+      // }
     },
     android: {
       icon: "./assets/app-icon.png",
@@ -45,6 +49,12 @@ export default {
         projectId: "dfc97c77-31b1-4267-896f-9472c87f166c",
       },
     },
+    updates: {
+      url: "https://u.expo.dev/dfc97c77-31b1-4267-896f-9472c87f166c",
+    },
+    runtimeVersion: {
+      policy: "appVersion",
+    },
     plugins: [
       [
         "expo-image-picker",
@@ -53,73 +63,38 @@ export default {
           photosPermission: "Allow HCB to access your photos for receipts",
         },
       ],
-      [
-        "expo-font",
-        {
-          fonts: [
-            "./assets/fonts/JetBrainsMono-Regular.ttf",
-            "./assets/fonts/JetBrainsMono-Bold.ttf",
-          ],
-        },
-      ],
       "expo-secure-store",
       [
         "expo-local-authentication",
         { faceIDPermission: "Allow $(PRODUCT_NAME) to use Face ID." },
       ],
       [
-        "expo-alternate-app-icons",
-        [
-          {
-            name: "Default",
-            ios: "./assets/app-icon.png",
-            android: {
-              foregroundImage: "./assets/app-icon-foreground.png",
-              backgroundColor: "#EC3750",
-            },
-          },
-          {
-            name: "Artskillz",
-            ios: "./assets/icons/art-skillz.png",
-            android: {
-              foregroundImage: "./assets/icons/art-skillz-foreground.png",
-              backgroundColor: "#FF2500",
-            },
-          },
-          {
-            name: "Dev",
-            ios: "./assets/icons/dev.png",
-            android: {
-              foregroundImage: "./assets/icons/dev-foreground.png",
-              backgroundColor: "#33D6A6",
-            },
-          },
-          {
-            name: "Cashmoney",
-            ios: "./assets/icons/cash-money.png",
-            android: {
-              foregroundImage: "./assets/icons/cash-money-foreground.png",
-              backgroundColor: "#fff",
-            },
-          },
-          {
-            name: "Hacknight",
-            ios: "./assets/icons/hack-night.png",
-            android: {
-              foregroundImage: "./assets/icons/hack-night.png",
-              backgroundColor: "#FFD700",
-            },
-          },
-          {
-            name: "Testflight",
-            ios: "./assets/icons/testflight.png",
-            android: {
-              foregroundImage: "./assets/icons/testflight.png",
-              backgroundColor: "#FFD700",
+        "@stripe/stripe-terminal-react-native",
+        {
+          bluetoothBackgroundMode: true,
+          locationWhenInUsePermission:
+            "Location access is required in order to accept payments.",
+          bluetoothPeripheralPermission:
+            "Bluetooth access is required in order to connect to supported bluetooth card readers.",
+          bluetoothAlwaysUsagePermission:
+            "This app uses Bluetooth to connect to supported card readers.",
+        },
+      ],
+      [
+        "expo-build-properties",
+        {
+          android: {
+            minSdkVersion: 26,
+            packagingOptions: {
+              pickFirst: [
+                "org/bouncycastle/pqc/crypto/picnic/lowmcL*",
+                "org/bouncycastle/x509/CertPathReviewerMessages*",
+              ],
             },
           },
-        ],
+        },
       ],
+      ["expo-alternate-app-icons", appIcons],
     ],
   },
 };