Upgraded to React Native 0.76.1

.github/workflows/react-native-ci.yml

@@ -24,6 +24,12 @@ jobs:
             - name: Install dependencies
               run: npm install -g yarn
 
+            - name: Enable Corepack
+              run: corepack enable
+
+            - name: Activate Yarn 3.6.4
+              run: corepack prepare [email protected] --activate
+
             - name: Install dependencies
               run: yarn install
 
@@ -49,6 +55,12 @@ jobs:
             - name: Install dependencies
               run: npm install -g yarn
 
+            - name: Enable Corepack
+              run: corepack enable
+
+            - name: Activate Yarn 3.6.4
+              run: corepack prepare [email protected] --activate
+
             - name: Install dependencies
               run: yarn install
 
@@ -98,6 +110,12 @@ jobs:
             - name: Install dependencies
               run: npm install -g yarn
 
+            - name: Enable Corepack
+              run: corepack enable
+
+            - name: Activate Yarn 3.6.4
+              run: corepack prepare [email protected] --activate
+
             - name: Install dependencies
               run: yarn install
 

.gitignore

@@ -20,6 +20,7 @@ DerivedData
 *.hmap
 *.ipa
 *.xcuserstate
+**/.xcode.env.local
 
 # Android/IntelliJ
 #
@@ -36,7 +37,6 @@ android/app/build
 node_modules/
 npm-debug.log
 yarn-error.log
-yarn.lock
 .env
 .env.*
 
@@ -46,6 +46,17 @@ buck-out/
 *.keystore
 !debug.keystore
 
+# testing
+/coverage
+
+# Yarn
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
 # fastlane
 #
 # It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
@@ -61,7 +72,7 @@ buck-out/
 *.jsbundle
 
 # CocoaPods
-/ios/Pods/
+**/Pods/
 
 # react-native-config codegen
 ios/tmp.xcconfig

.prettierignore

@@ -0,0 +1,4 @@
+node_modules/
+build/
+ios/
+android/

.prettierrc

@@ -0,0 +1,8 @@
+{
+	"semi": true,
+	"singleQuote": true,
+	"trailingComma": "es5",
+	"printWidth": 190,
+	"tabWidth": 4,
+	"jsxSingleQuote": true
+}

.vscode/settings.json

@@ -0,0 +1,13 @@
+{
+    "java.configuration.updateBuildConfiguration": "automatic",
+    "prettier.prettierPath": "./node_modules/prettier",
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
+    "editor.codeActionsOnSave": {
+        "source.organizeImports": "explicit"
+    },
+    "editor.formatOnSave": true,
+    "editor.formatOnPaste": true,
+    "editor.formatOnType": false,
+    "prettier.configPath": ".prettierrc",
+    "prettier.ignorePath": ".prettierignore"
+}

.yarnrc.yml

@@ -0,0 +1,3 @@
+nodeLinker: node-modules
+
+# yarnPath: .yarn/releases/yarn-3.6.4.cjs

App.tsx

@@ -0,0 +1,43 @@
+import React, { useEffect } from 'react';
+import type { PropsWithChildren } from 'react';
+import { useColorScheme } from 'react-native';
+import { GestureHandlerRootView } from 'react-native-gesture-handler';
+import { TamaguiProvider, Theme } from 'tamagui';
+import { Toasts } from '@backpackapp-io/react-native-toast';
+import { PortalProvider, PortalHost } from '@gorhom/portal';
+import { SafeAreaProvider } from 'react-native-safe-area-context';
+import { BottomSheetModalProvider } from '@gorhom/bottom-sheet';
+import useTheme from './src/hooks/use-theme';
+import AppNavigator from './src/navigation/AppNavigator';
+import { AuthProvider } from './src/contexts/AuthContext';
+import config from './tamagui.config';
+
+function App(): React.JSX.Element {
+    const { theme } = useTheme();
+
+    return (
+        <TamaguiProvider config={config}>
+            <PortalProvider>
+                <Theme name={theme}>
+                    <GestureHandlerRootView style={{ flex: 1 }}>
+                        <PortalProvider>
+                            <SafeAreaProvider>
+                                <BottomSheetModalProvider>
+                                    <AuthProvider>
+                                        <AppNavigator />
+                                        <Toasts extraInsets={{ bottom: 80 }} />
+                                        <PortalHost name='MainPortal' />
+                                        <PortalHost name='BottomSheetPanelPortal' />
+                                        <PortalHost name='LocationPickerPortal' />
+                                    </AuthProvider>
+                                </BottomSheetModalProvider>
+                            </SafeAreaProvider>
+                        </PortalProvider>
+                    </GestureHandlerRootView>
+                </Theme>
+            </PortalProvider>
+        </TamaguiProvider>
+    );
+}
+
+export default App;

Gemfile

@@ -1,6 +1,9 @@
 source 'https://rubygems.org'
 
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
-ruby '>= 2.6.10'
+ruby ">= 2.6.10"
 
-gem 'cocoapods', '>= 1.11.2'
+# Exclude problematic versions of cocoapods and activesupport that causes build failures.
+gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
+gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
+gem 'xcodeproj', '< 1.26.0'

Gemfile.lock

@@ -91,7 +91,9 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (>= 1.11.2)
+  activesupport (>= 6.1.7.5, != 7.1.0)
+  cocoapods (>= 1.13, != 1.15.1, != 1.15.0)
+  xcodeproj (< 1.26.0)
 
 RUBY VERSION
    ruby 2.6.10p210

README.md

@@ -124,8 +124,12 @@ Run the commands below; first clone the project, use npm or yarn to install the
 ```
 git clone [email protected]:fleetbase/storefront-app.git
 cd storefront-app
+corepack enable
+corepack prepare [email protected] --activate
 yarn
-npx pod-install
+bundle install
+cd ios 
+bundle exec pod install
 touch .env
 ```
 

android/app/build.gradle

@@ -48,6 +48,9 @@ react {
     //
     //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
     // hermesFlags = ["-O", "-output-source-map"]
+
+    /* Autolinking */
+    autolinkLibrariesWithApp()
 }
 
 project.ext.react = [
@@ -92,11 +95,16 @@ def isNewArchitectureEnabled() {
 android {
     ndkVersion rootProject.ext.ndkVersion
 
-    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
+    compileSdk rootProject.ext.compileSdkVersion
+
     namespace "com.storefrontapp"
 
     defaultConfig {
         applicationId project.env.get("APP_IDENTIFIER")
+        manifestPlaceholders = [
+            appAuthRedirectScheme: project.env.get("APP_LINK_PREFIX")
+        ]
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         missingDimensionStrategy 'react-native-camera', 'general' 
@@ -149,21 +157,11 @@ dependencies {
     implementation project(':react-native-config')
     implementation "androidx.core:core-splashscreen:1.0.0-alpha02" 
 
-    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
-    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.facebook.flipper'
-        exclude group:'com.squareup.okhttp3', module:'okhttp'
-    }
-
-    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.facebook.flipper'
-    }
     if (hermesEnabled.toBoolean()) {
         implementation("com.facebook.react:hermes-android")
     } else {
         implementation jscFlavor
     }
 }
 
-apply plugin: 'com.google.gms.google-services'
-apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle")   ; applyNativeModulesAppBuildGradle(project)
+apply plugin: 'com.google.gms.google-services'

android/app/src/debug/AndroidManifest.xml

@@ -2,16 +2,12 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-
     <application
         android:usesCleartextTraffic="true"
         tools:targetApi="28"
         tools:ignore="GoogleAppIndexingWarning"
         android:appComponentFactory="whateverString"
-        tools:replace="android:appComponentFactory">
-        <activity
-            android:name="com.facebook.react.devsupport.DevSettingsActivity"
-            android:exported="false" />
+        tools:replace="android:appComponentFactory"
+        tools:ignore="GoogleAppIndexingWarning" />
     </application>
 </manifest>

android/app/src/main/AndroidManifest.xml

@@ -10,11 +10,18 @@
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
     tools:ignore="ScopedStorage" />
 
-  <application android:name=".MainApplication" android:label="@string/app_name"
-    android:icon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher_round"
-    android:theme="@style/AppTheme" android:networkSecurityConfig="@xml/network_security_config"
-    android:dataExtractionRules="@xml/data_extraction_rules" android:fullBackupContent="true"
-    tools:targetApi="s">
+  <application 
+    android:name=".MainApplication" 
+    android:label="@string/app_name"
+    android:icon="@mipmap/ic_launcher" 
+    android:roundIcon="@mipmap/ic_launcher_round"
+    android:theme="@style/AppTheme" 
+    android:networkSecurityConfig="@xml/network_security_config"
+    android:dataExtractionRules="@xml/data_extraction_rules" 
+    android:fullBackupContent="true"
+    tools:targetApi="s"
+    android:supportsRtl="true"
+    >
     <!-- Change the value to true to enable pop-up for in foreground on receiving remote
     notifications (for prevent duplicating while showing local notifications set this to false) -->
     <meta-data android:name="com.dieam.reactnativepushnotification.notification_foreground"