Merge branch 'master' into fix/1534-checkout-flow

# Conflicts:
#	src/redux/App/selectors.js
#	src/redux/reducers.js

.github/workflows/build.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: '16.x'
+          node-version: '20.x'
       - name: Configure Sentry
         run: |
           sed 's/%token%/${{ secrets.SENTRY_API_TOKEN }}/' ios/sentry.properties.dist > ios/sentry.properties
@@ -108,7 +108,7 @@ jobs:
           java-version: 1.8
       - uses: actions/setup-node@v3
         with:
-          node-version: '16.x'
+          node-version: '20.x'
       - run: yarn install
       - run: cp google-services.json.dist android/app/google-services.json
       - name: Enable clear text traffic in release builds

.github/workflows/fastlane_android.yml

@@ -47,7 +47,7 @@ jobs:
           ref: ${{ inputs.branch }}
       - uses: actions/setup-node@v3
         with:
-          node-version: '16.x'
+          node-version: '20.x'
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.1'

.github/workflows/fastlane_ios.yml

@@ -34,7 +34,7 @@ jobs:
       #     xcode-version: '12.5.1'
       - uses: actions/setup-node@v3
         with:
-          node-version: '16.x'
+          node-version: '20.x'
           cache: 'yarn'
       - uses: ruby/setup-ruby@v1
         with:

.github/workflows/release_android.yml

@@ -8,7 +8,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: '16.x'
+          node-version: '20.x'
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.1'

.github/workflows/release_ios.yml

@@ -8,7 +8,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
         with:
-          node-version: '16.x'
+          node-version: '20.x'
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.1'

.github/workflows/test.yml

@@ -12,7 +12,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v2
         with:
-          node-version: '16.x'
+          node-version: '20.x'
       - run: yarn install
       - run: yarn lint
       - run: yarn i18n-lint

ReactotronConfig.js

@@ -0,0 +1,11 @@
+import Reactotron from "reactotron-react-native";
+import { AsyncStorage } from "@react-native-async-storage/async-storage";
+import { reactotronRedux } from 'reactotron-redux'
+
+const reactotron = Reactotron.setAsyncStorageHandler(AsyncStorage)
+.configure() // controls connection & communication settings
+  .useReactNative() // add all built-in react native plugins
+  .use(reactotronRedux())
+  .connect(); // let's connect!
+
+export default reactotron;

android/build.gradle

@@ -8,7 +8,7 @@ buildscript {
         targetSdkVersion = 33
         // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
         ndkVersion = "23.1.7779620"
-        playServicesVersion = "18.1.0"
+        playServicesVersion = "18.2.0"
         timberVersion = "4.7.1"
         kotlinVersion = "1.8.10"
         androidXCore = "1.0.2"

index.js

@@ -1,3 +1,7 @@
+if (__DEV__) {
+  import("./ReactotronConfig").then(() => console.log("Reactotron Configured"));
+}
+
 import 'react-native-gesture-handler';
 import { AppRegistry } from 'react-native';
 

ios/CoopCycle.xcodeproj/project.pbxproj

@@ -16,7 +16,6 @@
 		346F3EAE31674113876BFD7C /* OpenSans-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2FBFC77D749D4E7DB675EAD8 /* OpenSans-Regular.ttf */; };
 		4EFD5626022946107800EECD /* Pods_CoopCycle_CoopCycleTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A5763258E52216DBA45B1C3D /* Pods_CoopCycle_CoopCycleTests.framework */; };
 		78954DC5C52A12B3837DB2F1 /* Pods_CoopCycle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F8A8B7590270EE06D2D26777 /* Pods_CoopCycle.framework */; };
-		81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
 		845246CF2344832500A3A1B2 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 845246CE2344832500A3A1B2 /* GoogleService-Info.plist */; };
 		84A98B1223D8DA2000EFF666 /* CoopCycleUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A98B1123D8DA2000EFF666 /* CoopCycleUITests.swift */; };
 		84A98B1A23D8DB6500EFF666 /* SnapshotHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A98B1923D8DB6500EFF666 /* SnapshotHelper.swift */; };
@@ -64,7 +63,6 @@
 		5654BC430BE34AEAAF13CA9E /* RobotoMono-Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "RobotoMono-Bold.ttf"; path = "../assets/fonts/RobotoMono-Bold.ttf"; sourceTree = "<group>"; };
 		767153BC6E2E4B5A88732015 /* RobotoMono-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "RobotoMono-Regular.ttf"; path = "../assets/fonts/RobotoMono-Regular.ttf"; sourceTree = "<group>"; };
 		774F2E083718E7A94D1D3D83 /* Pods-CoopCycle.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CoopCycle.release.xcconfig"; path = "Target Support Files/Pods-CoopCycle/Pods-CoopCycle.release.xcconfig"; sourceTree = "<group>"; };
-		81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = CoopCycle/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		845246CE2344832500A3A1B2 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		84A98B0F23D8DA2000EFF666 /* CoopCycleUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CoopCycleUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		84A98B1123D8DA2000EFF666 /* CoopCycleUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoopCycleUITests.swift; sourceTree = "<group>"; };
@@ -141,7 +139,6 @@
 				13B07FB01A68108700A75B9A /* AppDelegate.mm */,
 				13B07FB51A68108700A75B9A /* Images.xcassets */,
 				13B07FB61A68108700A75B9A /* Info.plist */,
-				81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */,
 				13B07FB71A68108700A75B9A /* main.m */,
 				84E9E2D624E3EA5B00740A6D /* Infoplist.strings */,
 			);
@@ -395,7 +392,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
-				81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
 				845246CF2344832500A3A1B2 /* GoogleService-Info.plist in Resources */,
 				84E9E2D424E3EA5B00740A6D /* Infoplist.strings in Resources */,
 				FAC644362166467C00D1DA52 /* misstickle__indian_bell_chime.wav in Resources */,

ios/CoopCycle/Images.xcassets/Contents.json

@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

ios/CoopCycle/Images.xcassets/LaunchScreenBackgroundColor.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "242",
+          "green" : "242",
+          "red" : "242"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "1",
+          "green" : "1",
+          "red" : "1"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

ios/CoopCycle/Info.plist

@@ -151,8 +151,11 @@
 		<string>location</string>
 		<string>remote-notification</string>
 	</array>
-	<key>UILaunchStoryboardName</key>
-	<string>LaunchScreen</string>
+	<key>UILaunchScreen</key>
+	<dict>
+		<key>UIColorName</key>
+		<string>LaunchScreenBackgroundColor</string>
+	</dict>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>

ios/Podfile.lock

@@ -656,14 +656,14 @@ PODS:
     - React-Core
   - react-native-get-random-values (1.9.0):
     - React-Core
-  - react-native-maps (1.8.4):
+  - react-native-maps (1.10.3):
     - React-Core
   - react-native-netinfo (9.4.1):
     - React-Core
   - react-native-pager-view (6.2.3):
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
-  - react-native-safe-area-context (4.8.2):
+  - react-native-safe-area-context (4.9.0):
     - React-Core
   - react-native-version-number (0.3.6):
     - React
@@ -787,9 +787,9 @@ PODS:
     - React-RCTText
   - RNAppleAuthentication (2.2.2):
     - React-Core
-  - RNBackgroundFetch (4.2.1):
+  - RNBackgroundFetch (4.2.2):
     - React-Core
-  - RNBackgroundGeolocation (4.14.5):
+  - RNBackgroundGeolocation (4.14.6):
     - CocoaLumberjack (~> 3.7.2)
     - React-Core
   - RNCAsyncStorage (1.21.0):
@@ -814,15 +814,15 @@ PODS:
     - FirebaseCoreExtension (= 10.19.0)
     - React-Core
     - RNFBApp
-  - RNGestureHandler (2.14.0):
+  - RNGestureHandler (2.15.0):
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
   - RNGoogleSignin (7.0.4):
     - GoogleSignIn (~> 6.0.0)
     - React-Core
   - RNLocalize (3.0.4):
     - React-Core
-  - RNReanimated (3.6.1):
+  - RNReanimated (3.7.1):
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
     - ReactCommon/turbomodule/core
@@ -1277,10 +1277,10 @@ SPEC CHECKSUMS:
   react-native-config: 86038147314e2e6d10ea9972022aa171e6b1d4d8
   react-native-fbsdk-next: 776f49479d36a1e72a1a367baadcc8391cd24374
   react-native-get-random-values: dee677497c6a740b71e5612e8dbd83e7539ed5bb
-  react-native-maps: e2b78affd8e90c807a87bd042dc6b1af2decbcf1
+  react-native-maps: 72a8a903f8a1b53e2c777ba79102078ab502e0bf
   react-native-netinfo: fefd4e98d75cbdd6e85fc530f7111a8afdf2b0c5
   react-native-pager-view: cf96a223846458cc7e932017636b5c6d8cc2c549
-  react-native-safe-area-context: 0ee144a6170530ccc37a0fd9388e28d06f516a89
+  react-native-safe-area-context: b97eb6f9e3b7f437806c2ce5983f479f8eb5de4b
   react-native-version-number: b415bbec6a13f2df62bf978e85bc0d699462f37f
   react-native-webview: 88293a0f23eca8465c0433c023ec632930e644d0
   React-NativeModulesApple: 54adc761c7a6fa5f183ca62ad0cb94f4f1cdce4a
@@ -1303,8 +1303,8 @@ SPEC CHECKSUMS:
   ReactNativeAvoidSoftinput: b4ec4c8084c397a91800d21170a9949a263d288a
   ReactNativeKeyboardManager: 60292dbac467c49841a7d69588208ec4a4f7b2a2
   RNAppleAuthentication: 0571c08da8c327ae2afc0261b48b4a515b0286a6
-  RNBackgroundFetch: 501c34ad6e880818ba17e7840b23f20a2d112923
-  RNBackgroundGeolocation: bf3b45667c4d3c999501f5f8cb16dc35fc01e759
+  RNBackgroundFetch: 35c7183f6eeff69396d42c4b206e1ae2a21e9327
+  RNBackgroundGeolocation: 7dde6957120db41209f0d11427c425f368416afa
   RNCAsyncStorage: 618d03a5f52fbccb3d7010076bc54712844c18ef
   RNCMaskedView: 090213d32d8b3bb83a4dcb7d12c18f0152591906
   RNCPicker: cb57c823d5ce8d2d0b5dfb45ad97b737260dc59e
@@ -1313,10 +1313,10 @@ SPEC CHECKSUMS:
   RNFBAnalytics: fdecb8b774abd12f9ed79675794159d1a0fadc6c
   RNFBApp: 5ee688b07ed0fa692a3a8fd07df6d6ae41e4c3a0
   RNFBCrashlytics: 11f52604cc41fde69e8cc8fcc9c578fc8d5b8a15
-  RNGestureHandler: a5039da2ac028b073ae801289476060b34d559b1
+  RNGestureHandler: 6a0bca5c5b2fb62211e9a75d5f4ed877817c4412
   RNGoogleSignin: c4381751eefd73c552b923ba347a9bfc6f18771c
   RNLocalize: 1ce4263770515f53d3de442ce7657b3661b16a37
-  RNReanimated: 8a6a83984cb4d61ebf1065b6137150b6b31ce609
+  RNReanimated: 509f67d2bac330a8f7a58fffc88e766106343f74
   RNScreens: 1c2444658fbb696a094272d946708167b1f63409
   RNSentry: 11917f7bf3e28806aca4c2791c6ba7522d8f09fe
   RNShare: a5dc3b9c53ddc73e155b8cd9a94c70c91913c43c
@@ -1337,6 +1337,6 @@ SPEC CHECKSUMS:
   StripeUICore: 5099399e52853370736aca81b27fc0e86b1822c8
   Yoga: 86fed2e4d425ee4c6eab3813ba1791101ee153c6
 
-PODFILE CHECKSUM: bde38ede69c54332041bca0808b5e3ef3d6f8285
+PODFILE CHECKSUM: 053323c68a244f866b6eb13c40405f6d1a999f7c
 
 COCOAPODS: 1.13.0