Merge branch 'main' into fix/42792

.env.example

@@ -11,7 +11,6 @@ USE_WEB_PROXY=false
 USE_WDYR=false
 CAPTURE_METRICS=false
 ONYX_METRICS=false
-GOOGLE_GEOLOCATION_API_KEY=AIzaSyBqg6bMvQU7cPWDKhhzpYqJrTEnSorpiLI
 
 EXPENSIFY_ACCOUNT_ID_ACCOUNTING=-1
 EXPENSIFY_ACCOUNT_ID_ADMIN=-1

.env.production

@@ -7,4 +7,3 @@ PUSHER_APP_KEY=268df511a204fbb60884
 USE_WEB_PROXY=false
 ENVIRONMENT=production
 SEND_CRASH_REPORTS=true
-GOOGLE_GEOLOCATION_API_KEY=AIzaSyBFKujMpzExz0_z2pAGfPUwkmlaUc-uw1Q

.env.staging

@@ -6,5 +6,4 @@ EXPENSIFY_PARTNER_PASSWORD=e21965746fd75f82bb66
 PUSHER_APP_KEY=268df511a204fbb60884
 USE_WEB_PROXY=false
 ENVIRONMENT=staging
-SEND_CRASH_REPORTS=true
-GOOGLE_GEOLOCATION_API_KEY=AIzaSyD2T1mlByThbUN88O8OPOD8vKuMMwLD4-M
+SEND_CRASH_REPORTS=true

.github/workflows/platformDeploy.yml

@@ -366,6 +366,17 @@ jobs:
  with:
  SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK }}
 
+ # Build a version of iOS and Android HybridApp if we are deploying to staging
+ hybridApp:
+ runs-on: ubuntu-latest
+ needs: validateActor
+ if: ${{ fromJSON(needs.validateActor.outputs.IS_DEPLOYER) && github.event_name == 'push' }}
+ steps:
+ - name: 'Deploy HybridApp'
+ run: gh workflow run --repo Expensify/Mobile-Deploy deploy.yml -f force_build=true
+ env:
+ GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
+
  postSlackMessageOnSuccess:
  name: Post a Slack message when all platforms deploy successfully
  runs-on: ubuntu-latest

__mocks__/react-native-permissions.ts

@@ -35,30 +35,30 @@ const requestNotifications: jest.Mock<Notification> = jest.fn((options: Record<s
  status: RESULTS.GRANTED,
  settings: Object.keys(options)
  .filter((option: string) => notificationOptions.includes(option))
- .reduce((acc: NotificationSettings, option: string) => ({...acc, [option]: true}), {
- lockScreen: true,
- notificationCenter: true,
- }),
+ .reduce(
+ (acc: NotificationSettings, option: string) => {
+ acc[option] = true;
+ return acc;
+ },
+ {
+ lockScreen: true,
+ notificationCenter: true,
+ },
+ ),
 }));
 
 const checkMultiple: jest.Mock<ResultsCollection> = jest.fn((permissions: string[]) =>
- permissions.reduce(
- (acc: ResultsCollection, permission: string) => ({
- ...acc,
- [permission]: RESULTS.GRANTED,
- }),
- {},
- ),
+ permissions.reduce((acc: ResultsCollection, permission: string) => {
+ acc[permission] = RESULTS.GRANTED;
+ return acc;
+ }, {}),
 );
 
 const requestMultiple: jest.Mock<ResultsCollection> = jest.fn((permissions: string[]) =>
- permissions.reduce(
- (acc: ResultsCollection, permission: string) => ({
- ...acc,
- [permission]: RESULTS.GRANTED,
- }),
- {},
- ),
+ permissions.reduce((acc: ResultsCollection, permission: string) => {
+ acc[permission] = RESULTS.GRANTED;
+ return acc;
+ }, {}),
 );
 
 export {

android/app/build.gradle

@@ -107,8 +107,8 @@ android {
  minSdkVersion rootProject.ext.minSdkVersion
  targetSdkVersion rootProject.ext.targetSdkVersion
  multiDexEnabled rootProject.ext.multiDexEnabled
- versionCode 1001047802
- versionName "1.4.78-2"
+ versionCode 1001047911
+ versionName "1.4.79-11"
  // Supported language variants must be declared here to avoid from being removed during the compilation.
  // This also helps us to not include unnecessary language variants in the APK.
  resConfigs "en", "es"