Merge branch 'main' into tomm/earn-layout-large-fonts

# Conflicts:
#	src/earn/EarnEnterAmount.tsx

.github/workflows/e2e-main.yml

@@ -32,7 +32,7 @@ jobs:
         # 24 is failing due to Let's Encrypt root certificate expiration
         # 25 is failing (RET-1274)
         # 26 is failing (RET-1275)
-        android-api-level: ['27']
+        android-api-level: [27]
     uses: ./.github/workflows/e2e-android.yml
     with:
       android-api-level: ${{ matrix.android-api-level }}

Gemfile

@@ -1,9 +1,6 @@
 source "https://rubygems.org"
 
-
-# Cocoapods 1.15 introduced a bug which break the build. We will remove the upper
-# bound in the template on Cocoapods with next React Native release.
-gem 'cocoapods', '>= 1.15.2', '< 1.16'
+gem 'cocoapods', '>= 1.16.2', '< 1.17'
 gem "fastlane"
 gem "xcpretty"
 

Gemfile.lock

@@ -5,7 +5,7 @@ GEM
       base64
       nkf
       rexml
-    activesupport (6.1.7.3)
+    activesupport (6.1.7.10)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -37,10 +37,10 @@ GEM
     babosa (1.0.4)
     base64 (0.2.0)
     claide (1.1.0)
-    cocoapods (1.15.2)
+    cocoapods (1.16.2)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.15.2)
+      cocoapods-core (= 1.16.2)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
       cocoapods-downloader (>= 2.1, < 3.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
@@ -54,8 +54,8 @@ GEM
       molinillo (~> 0.8.0)
       nap (~> 1.0)
       ruby-macho (>= 2.3.0, < 3.0)
-      xcodeproj (>= 1.23.0, < 2.0)
-    cocoapods-core (1.15.2)
+      xcodeproj (>= 1.27.0, < 2.0)
+    cocoapods-core (1.16.2)
       activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -78,7 +78,7 @@ GEM
     colored2 (3.1.2)
     commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.3.4)
     declarative (0.0.20)
     digest-crc (0.6.5)
       rake (>= 12.0.0, < 14.0.0)
@@ -162,7 +162,9 @@ GEM
     fastlane-plugin-emerge (0.10.4)
       faraday (~> 1.1)
     fastlane-plugin-versioning (0.6.0)
-    ffi (1.15.5)
+    ffi (1.17.0)
+    ffi (1.17.0-arm64-darwin)
+    ffi (1.17.0-x86_64-darwin)
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
@@ -206,19 +208,19 @@ GEM
     http-cookie (1.0.7)
       domain_name (~> 0.5)
     httpclient (2.8.3)
-    i18n (1.14.1)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     jmespath (1.6.2)
-    json (2.7.2)
+    json (2.9.0)
     jwt (2.8.2)
       base64
     mini_magick (4.13.2)
     mini_mime (1.1.5)
-    minitest (5.18.0)
+    minitest (5.25.4)
     molinillo (0.8.0)
     multi_json (1.15.0)
     multipart-post (2.4.1)
-    nanaimo (0.3.0)
+    nanaimo (0.4.0)
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
@@ -233,7 +235,7 @@ GEM
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.3.7)
+    rexml (3.4.0)
     rouge (2.0.7)
     ruby-macho (2.5.1)
     ruby2_keywords (0.0.5)
@@ -255,25 +257,25 @@ GEM
     tty-screen (0.8.2)
     tty-spinner (0.9.3)
       tty-cursor (~> 0.7)
-    typhoeus (1.4.0)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     uber (0.1.0)
     unicode-display_width (2.5.0)
     word_wrap (1.0.0)
-    xcodeproj (1.25.0)
+    xcodeproj (1.27.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.3.0)
-      rexml (>= 3.3.2, < 4.0)
+      nanaimo (~> 0.4.0)
+      rexml (>= 3.3.6, < 4.0)
     xcpretty (0.3.0)
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
-    zeitwerk (2.6.8)
+    zeitwerk (2.6.18)
 
 PLATFORMS
   ruby
@@ -282,7 +284,7 @@ PLATFORMS
   universal-darwin-21
 
 DEPENDENCIES
-  cocoapods (>= 1.15.2, < 1.16)
+  cocoapods (>= 1.16.2, < 1.17)
   fastlane
   fastlane-plugin-emerge
   fastlane-plugin-versioning

e2e/src/QRScanner.spec.js

@@ -1,54 +1,52 @@
 import { reloadReactNative } from './utils/retries'
 import { quickOnboarding, waitForElementById } from './utils/utils'
 
+const verifyCamera = async () => {
+  // testID 'Camera' is one of the few that works on Android. iOS uses 'CameraScanInfo' because the camera is behind an opacity overlay
+  device.getPlatform() === 'ios'
+    ? await waitForElementById('CameraScanInfo')
+    : await waitForElementById('Camera')
+}
+
 describe('Given QR Scanner', () => {
   beforeAll(async () => {
     await quickOnboarding()
+    await reloadReactNative()
   })
 
   describe('When opening QR scanner', () => {
     it('Then should display QR code', async () => {
-      await reloadReactNative()
-      await waitForElementById('HomeAction-Receive')
-      await element(by.id('HomeAction-Receive')).tap()
+      await waitForElementById('HomeAction-Receive', { tap: true })
       await waitForElementById('QRCode')
-      await expect(element(by.id('QRCode'))).toBeVisible()
     })
 
     it('Then should be able to toggle camera', async () => {
-      await waitForElementById('Scan')
-      await element(by.id('Scan')).tap()
-      await waitForElementById('CameraScanInfo')
-      await expect(element(by.id('CameraScanInfo'))).toBeVisible()
+      await waitForElementById('Scan', { tap: true })
+      await verifyCamera()
     })
 
     it('Then should be able to toggle to QR code', async () => {
-      await waitForElementById('My Code')
-      await element(by.id('My Code')).tap()
+      await waitForElementById('My Code', { tap: true })
       await waitForElementById('QRCode')
-      await expect(element(by.id('QRCode'))).toBeVisible()
     })
 
     it('Then should be able to close QR code scanner', async () => {
-      await waitForElementById('Times')
-      await element(by.id('Times')).tap()
+      await waitForElementById('Times', { tap: true })
       await waitForElementById('HomeAction-Send')
-      await expect(element(by.id('HomeAction-Send'))).toBeVisible()
     })
   })
 
   describe("When 'scanning' QR", () => {
     beforeEach(async () => {
       await reloadReactNative()
-      await waitForElementById('HomeAction-Receive')
-      await element(by.id('HomeAction-Receive')).tap()
-      await waitForElementById('Scan')
-      await element(by.id('Scan')).tap()
-      await waitForElementById('CameraScanInfo')
-      await element(by.id('CameraScanInfo')).tap()
+      await waitForElementById('HomeAction-Receive', { tap: true })
+      await waitForElementById('Scan', { tap: true })
+      await verifyCamera()
     })
 
     it('Then should be able to handle Celo pay QR', async () => {
+      // Use instead of waitForElementById as the element is not visible behind opacity overlay
+      await element(by.id('CameraScanInfo')).tap()
       await waitForElementById('ManualInput')
       await element(by.id('ManualInput')).replaceText(
         'celo://wallet/pay?address=0xe5F5363e31351C38ac82DBAdeaD91Fd5a7B08846'
@@ -62,6 +60,8 @@ describe('Given QR Scanner', () => {
     })
 
     it('Then should handle address only QR', async () => {
+      // Use instead of waitForElementById as the element is not visible behind opacity overlay
+      await element(by.id('CameraScanInfo')).tap()
       await waitForElementById('ManualInput')
       await element(by.id('ManualInput')).replaceText('0xe5F5363e31351C38ac82DBAdeaD91Fd5a7B08846')
       await waitForElementById('ManualSubmit')

ios/MobileStack.xcodeproj/project.pbxproj

@@ -451,15 +451,13 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-MobileStack/Pods-MobileStack-frameworks.sh",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/AdjustSignature/AdjustSigSdk.framework/AdjustSigSdk",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/PersonaInquirySDK2/Persona2.framework/Persona2",
 				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/Pre-built/hermes.framework/hermes",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AdjustSigSdk.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Persona2.framework",