Merge branch 'main' of https://github.com/rezkiy37/Expensify into fea…

…ture/45176-invoicing-details-section

.github/workflows/cla.yml

@@ -4,39 +4,9 @@ on:
   issue_comment:
     types: [created]
   pull_request_target:
-    types: [opened, synchronize]
+    types: [opened, closed, synchronize]
 
 jobs:
   CLA:
-    runs-on: ubuntu-latest
-    # This job only runs for pull request comments or pull request target events (not issue comments)
-    # It does not run for pull requests created by OSBotify
-    if: ${{ github.event.issue.pull_request || (github.event_name == 'pull_request_target' && github.event.pull_request.user.login != 'OSBotify' && github.event.pull_request.user.login != 'imgbot[bot]') }}
-    steps:
-        - name: CLA comment check
-          uses: actions-ecosystem/action-regex-match@9c35fe9ac1840239939c59e5db8839422eed8a73
-          id: sign
-          with:
-            text: ${{ github.event.comment.body }}
-            regex: '\s*I have read the CLA Document and I hereby sign the CLA\s*'
-        - name: CLA comment re-check
-          uses: actions-ecosystem/action-regex-match@9c35fe9ac1840239939c59e5db8839422eed8a73
-          id: recheck
-          with:
-            text: ${{ github.event.comment.body }}
-            regex: '\s*recheck\s*'
-        - name: CLA Assistant
-          if: ${{ steps.recheck.outputs.match != '' || steps.sign.outputs.match != '' || github.event_name == 'pull_request_target' }}
-          # Version: 2.1.2-beta
-          uses: cla-assistant/github-action@948230deb0d44dd38957592f08c6bd934d96d0cf
-          env:
-              GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-              PERSONAL_ACCESS_TOKEN : ${{ secrets.CLA_BOTIFY_TOKEN }}
-          with:
-              path-to-signatures: '${{ github.repository }}/cla.json'
-              path-to-document: 'https://github.com/${{ github.repository }}/blob/main/contributingGuides/CLA.md'
-              branch: 'main'
-              remote-organization-name: 'Expensify'
-              remote-repository-name: 'CLA'
-              lock-pullrequest-aftermerge: false
-              allowlist: OSBotify,snyk-bot
+    uses: Expensify/GitHub-Actions/.github/workflows/cla.yml@main
+    secrets: inherit

android/app/build.gradle

@@ -110,8 +110,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1009005001
-        versionName "9.0.50-1"
+        versionCode 1009005102
+        versionName "9.0.51-2"
         // 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"

contributingGuides/CONTRIBUTING.md

@@ -32,9 +32,9 @@ This project and everyone participating in it is governed by the Expensify [Code
 At this time, we are not hiring contractors in Crimea, North Korea, Russia, Iran, Cuba, or Syria.
 
 ## Slack channels
-All contributors should be a member of a shared Slack channel called [#expensify-open-source](https://expensify.slack.com/archives/C01GTK53T8Q) -- this channel is used to ask **general questions**, facilitate **discussions**, and make **feature requests**.
+We have a shared Slack channel called #expensify-open-source — this channel is used to ask general questions, facilitate discussions, and make feature requests.
 
-Before requesting an invite to Slack, please ensure your Upwork account is active, since we only pay via Upwork (see [below](https://github.com/Expensify/App/blob/main/contributingGuides/CONTRIBUTING.md#payment-for-contributions)). To request an invite to Slack, email [email protected] with the subject `Slack Channel Invites`. We'll send you an invite! 
+That said, we have a small issue with adding users at the moment and we’re working with Slack to try and get this resolved. If you would like to join, [fill out this form](https://forms.gle/Q7hnhUJPnQCK7Fe56) with your email and Upwork profile link. Once resolved, we’ll add you.
 
 Note: Do not send direct messages to the Expensify team in Slack or Expensify Chat, they will not be able to respond. 
 

contributingGuides/OFFLINE_UX.md

@@ -85,7 +85,7 @@ When the user is offline:
        - In the event that `successData` and `failureData` are the same, you can use a single object `finallyData` in place of both. 
 
 **Handling errors:**
-- The [OfflineWithFeedback component](https://github.com/Expensify/App/blob/main/src/components/OfflineWithFeedback.js) already handles showing errors too, as long as you pass the error field in the [errors prop](https://github.com/Expensify/App/blob/128ea378f2e1418140325c02f0b894ee60a8e53f/src/components/OfflineWithFeedback.js#L29-L31)
+- The [OfflineWithFeedback component](https://github.com/Expensify/App/blob/main/src/components/OfflineWithFeedback.tsx) already handles showing errors too, as long as you pass the error field in the [errors prop](https://github.com/Expensify/App/blob/128ea378f2e1418140325c02f0b894ee60a8e53f/src/components/OfflineWithFeedback.js#L29-L31)
 - The behavior for when something fails is:
     - If you were adding new data, the failed to add data is displayed greyed out and with the button to dismiss the error
     - If you were deleting data, the failed data is displayed regularly with the button to dismiss the error