Merge branch 'main' of https://github.com/Expensify/App into feat/#Ex…

…pensify#23138-clear-after-status

.env.example

@@ -11,6 +11,7 @@ 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,3 +7,4 @@ PUSHER_APP_KEY=268df511a204fbb60884
 USE_WEB_PROXY=false
 ENVIRONMENT=production
 SEND_CRASH_REPORTS=true
+GOOGLE_GEOLOCATION_API_KEY=AIzaSyBFKujMpzExz0_z2pAGfPUwkmlaUc-uw1Q

.env.staging

@@ -7,3 +7,4 @@ PUSHER_APP_KEY=268df511a204fbb60884
 USE_WEB_PROXY=false
 ENVIRONMENT=staging
 SEND_CRASH_REPORTS=true
+GOOGLE_GEOLOCATION_API_KEY=AIzaSyD2T1mlByThbUN88O8OPOD8vKuMMwLD4-M

.github/actions/composite/setupNode/action.yml

@@ -16,38 +16,13 @@ runs:
       uses: actions/cache@v3
       with:
         path: node_modules
-        key: ${{ runner.os }}-node-modules-${{ hashFiles('package-lock.json') }}
+        key: ${{ runner.os }}-node-modules-${{ hashFiles('package-lock.json', 'patches/**') }}
 
     - id: cache-desktop-node-modules
       uses: actions/cache@v3
       with:
         path: desktop/node_modules
-        key: ${{ runner.os }}-desktop-node-modules-${{ hashFiles('desktop/package-lock.json') }}
-
-    - name: Check if patch files changed
-      id: patchCheck
-      shell: bash
-      run: |
-        set -e
-        if [[ `git diff main --name-only | grep \.patch` != null ]]; then 
-          echo 'CHANGES_IN_PATCH_FILES=true' >> "$GITHUB_OUTPUT"
-        else 
-          echo 'CHANGES_IN_PATCH_FILES=false' >> "$GITHUB_OUTPUT"
-        fi
-
-    - name: Patch root project node packages
-      shell: bash
-      if: | 
-        steps.patchCheck.outputs.CHANGES_IN_PATCH_FILES == 'true' && 
-        steps.cache-node-modules.outputs.cache-hit == 'true'
-      run: npx patch-package
-
-    - name: Patch node packages for desktop submodule
-      shell: bash
-      if: | 
-        steps.patchCheck.outputs.CHANGES_IN_PATCH_FILES == 'true' && 
-        steps.cache-desktop-node-modules.outputs.cache-hit == 'true'
-      run: cd desktop && npx patch-package
+        key: ${{ runner.os }}-desktop-node-modules-${{ hashFiles('desktop/package-lock.json', 'desktop/patches/**') }}
 
     - name: Install root project node packages
       if: steps.cache-node-modules.outputs.cache-hit != 'true'

README.md

@@ -45,7 +45,7 @@ In order to have more consistent builds, we use a strict `node` and `npm` versio
 * Changes applied to Javascript will be applied automatically via WebPack as configured in `webpack.dev.js`
 
 ## Running the iOS app 📱
-For an M1 Mac, read this [SO](https://stackoverflow.com/c/expensify/questions/11580) for installing cocoapods.
+For an M1 Mac, read this [SO](https://stackoverflow.com/questions/64901180/how-to-run-cocoapods-on-apple-silicon-m1) for installing cocoapods.
 
 * Install project gems, including cocoapods, using bundler to ensure everyone uses the same versions. In the project root, run: `bundle install`
     * If you get the error `Could not find 'bundler'`, install the bundler gem first: `gem install bundler` and try again.
@@ -419,4 +419,4 @@ In order to compile a production desktop build, run `npm run desktop-build`, thi
 In order to compile a production iOS build, run `npm run ios-build`, this will generate a `Chat.ipa` in the root directory of this project.
 
 #### Local production build the Android app
-To build an APK to share run (e.g. via Slack), run `npm run android-build`, this will generate a new APK in the `android/app` folder.
+To build an APK to share run (e.g. via Slack), run `npm run android-build`, this will generate a new APK in the `android/app` folder.

android/app/build.gradle

@@ -90,8 +90,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001036001
-        versionName "1.3.60-1"
+        versionCode 1001036101
+        versionName "1.3.61-1"
     }
 
     flavorDimensions "default"

docs/_layouts/default.html

@@ -27,11 +27,11 @@
     <div id="lhn">
 
         <div class="lhn-header">
-            <div id="header-button">
-                <img id="angle-up-icon" src="/assets/images/arrow-up.svg" class="base-icon hide"></img>
-                <img id="bars-icon" src="/assets/images/menu.svg" class="base-icon"></img>
-            </div>
             <div class="flex">
+                <div id="header-button">
+                    <img id="angle-up-icon" src="/assets/images/arrow-up.svg" class="base-icon hide"></img>
+                    <img id="bars-icon" src="/assets/images/menu.svg" class="base-icon"></img>
+                </div>
                 <div>
                     <a href="/">
                         <img src="/assets/images/expensify-help.svg" class="logo" />

docs/_sass/_main.scss

@@ -267,8 +267,8 @@ button {
         }
 
         #header-button {
-            position: absolute;
             display: block;
+            padding-right: 24px;
             @include breakpoint($breakpoint-tablet) {
                 display: none;
             }
@@ -281,7 +281,7 @@ button {
             margin-left: auto;
             margin-right: auto;
 
-            @include breakpoint($breakpoint-tablet) {
+            @include breakpoint($breakpoint-desktop) {
                 width: 210px;
                 align-content: normal;
                 display: flex;

docs/articles/playbooks/Expensify-Playbook-for-Small-to-Medium-Sized-Businesses.md

@@ -209,7 +209,7 @@ Here’s how to enable it:
       - *Employees* - We recommend a low limit for most employees, roughly double the size of the maximum daily spend – such as $1000.  
       - *Execs* - We recommend a higher limit for executives, roughly 10x the limit of a non-executive employee (eg, $10,000).
 
-Once the Expensify Cards have been assigned, each employee will be prompted to enter their mailing address so they can receive their physical card. In the meantime, a digital card will be ready to use immediately.
+Once the Expensify Cards have been assigned, each employee will be prompted to enter their mailing address so they can receive their physical card. In the meantime, a virtual card will be ready to use immediately.
 
 If you have an accounting system we directly integrate with, check out how we take automation a step further with [Continuous Reconciliation](https://community.expensify.com/discussion/7335/faq-what-is-the-expensify-card-auto-reconciliation-process). We’ll create an Expensify Card clearing and liability account for you. Each time settlement occurs, we’ll take the total amount of your purchases and create a journal entry that credits the settlement account and debits the liability account - saving you hours of manual reconciliation work at the end of your statement period. 
 

ios/NewExpensify/Info.plist

@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.60</string>
+	<string>1.3.61</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.3.60.1</string>
+	<string>1.3.61.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.60</string>
+	<string>1.3.61</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.3.60.1</string>
+	<string>1.3.61.1</string>
 </dict>
 </plist>

ios/Podfile.lock

@@ -581,6 +581,8 @@ PODS:
     - React-Core
   - react-native-flipper (0.159.0):
     - React-Core
+  - react-native-geolocation (3.0.6):
+    - React-Core
   - react-native-image-manipulator (1.0.5):
     - React
   - react-native-image-picker (5.1.0):
@@ -892,6 +894,7 @@ DEPENDENCIES:
   - react-native-config (from `../node_modules/react-native-config`)
   - react-native-document-picker (from `../node_modules/react-native-document-picker`)
   - react-native-flipper (from `../node_modules/react-native-flipper`)
+  - "react-native-geolocation (from `../node_modules/@react-native-community/geolocation`)"
   - "react-native-image-manipulator (from `../node_modules/@oguzhnatly/react-native-image-manipulator`)"
   - react-native-image-picker (from `../node_modules/react-native-image-picker`)
   - react-native-key-command (from `../node_modules/react-native-key-command`)
@@ -1065,6 +1068,8 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-document-picker"
   react-native-flipper:
     :path: "../node_modules/react-native-flipper"
+  react-native-geolocation:
+    :path: "../node_modules/@react-native-community/geolocation"
   react-native-image-manipulator:
     :path: "../node_modules/@oguzhnatly/react-native-image-manipulator"
   react-native-image-picker:
@@ -1249,6 +1254,7 @@ SPEC CHECKSUMS:
   react-native-config: 7cd105e71d903104e8919261480858940a6b9c0e
   react-native-document-picker: f68191637788994baed5f57d12994aa32cf8bf88
   react-native-flipper: dc5290261fbeeb2faec1bdc57ae6dd8d562e1de4
+  react-native-geolocation: 0f7fe8a4c2de477e278b0365cce27d089a8c5903
   react-native-image-manipulator: c48f64221cfcd46e9eec53619c4c0374f3328a56
   react-native-image-picker: c33d4e79f0a14a2b66e5065e14946ae63749660b
   react-native-key-command: c2645ec01eb1fa664606c09480c05cb4220ef67b