Merge branch 'main' into fix-8590

.github/workflows/cherryPick.yml

@@ -205,7 +205,7 @@ jobs:
       - name: Auto-merge the PR
         # Important: only auto-merge if there was no merge conflict and the PR is mergable (not blocked by a missing status check)!
         if: ${{ fromJSON(steps.cherryPick.outputs.SHOULD_AUTOMERGE) && fromJSON(steps.isPullRequestMergeable.outputs.IS_MERGEABLE) }}
-        run: gh pr merge --merge --delete-branch
+        run: gh pr merge ${{ steps.createPullRequest.outputs.pr_number }} --merge --delete-branch
         env:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
 

.github/workflows/platformDeploy.yml

@@ -10,7 +10,7 @@ on:
 
 env:
   SHOULD_DEPLOY_PRODUCTION: ${{ github.event_name == 'release' }}
-  DEVELOPER_DIR: /Applications/Xcode_12.5.1.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_13.2.1.app/Contents/Developer
 
 jobs:
   validateActor:

.github/workflows/updateProtectedBranch.yml

@@ -129,7 +129,7 @@ jobs:
         run: exit 1
 
       - name: Auto-merge the PR
-        run: gh pr merge --merge --delete-branch
+        run: gh pr merge ${{ steps.createPullRequest.outputs.PR_NUMBER }} --merge --delete-branch
         env:
           GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }}
 

CONTRIBUTING.md

@@ -69,6 +69,9 @@ Please follow these steps to propose a job:
 ## Working on Expensify Jobs
 *Reminder: For technical guidance please refer to the [README](https://github.com/Expensify/App/blob/main/README.md)*.
 
+## Posting Ideas
+Additionally if you want to discuss an idea with the community without having a P/S statement yet, you can post it in #expensify-open-source with the prefix `IDEA:`. All ideas to build the future of Expensify are always welcome! i.e.: "`IDEA:` I don't have a P/S for this yet, but just kicking the idea around... what if we [insert crazy idea]?".
+
 #### Make sure you can test on all platforms
 * Expensify requires that you can test the app on iOS, MacOS, Android, Web, and mWeb.
 * You'll need a Mac to test the iOS and MacOS app.
@@ -83,7 +86,7 @@ Please follow these steps to propose a job:
 3. If you cannot reproduce the problem, pause on this step and add a comment to the issue explaining where you are stuck or that you don't think the issue can be reproduced.
 
 #### Propose a solution for the job
-4. After you reproduce the issue, make a proposal for your solution and post it as a comment in the corresponding GitHub issue (linked in the Upwork job). Your solution proposal should include a brief technical explanation of the changes you will make.
+4. After you reproduce the issue, make a proposal for your solution and post it as a comment in the corresponding GitHub issue (linked in the Upwork job). Your solution proposal should include a brief written technical explanation of the changes you will make. Include "Proposal" as the first word in your comment. 
     - Note: Issues that have not had the `External` label applied have not yet been approved for implementation. This means, if you propose a solution to an issue without the `External` label (which you are allowed to do) it is possible that the issue will be fixed internally. If the `External` label has not yet been applied, Expensify has the right to use your proposal to fix said issue, without providing compensation for your solution. This process covers the very rare instance where we need or want to fix an issue internally.
     - Note: Before submitting a proposal on an issue, be sure to read any other existing proposals. Any new proposal should be substantively different from existing proposals.
 5. Pause at this step until someone from the Contributor-Plus team and / or someone from Expensify provides feedback on your proposal (do not create a pull request yet).

FORMS.md

@@ -21,15 +21,19 @@ Labels and hints are enabled by passing the appropriate props to each input:
 
 ### Character Limits
 
-If a field has a character limit we should give that field a max limit and let the user know how many characters there are left outside of the input and below it. This is done by passing the maxLength prop to TextInput.
+If a field has a character limit we should give that field a max limit. This is done by passing the maxLength prop to TextInput.
 
 ```jsx
 <TextInput
     maxLength={20}
 />
 ```
+Note: We shouldn't place a max limit on a field if the entered value can be formatted. eg: Phone number.
+The phone number can be formatted in different ways.
 
-![char-limit](https://user-images.githubusercontent.com/22219519/156266959-945c6d26-be9b-426b-9399-98d31ea214c9.png)
+- 2109400803
+- +12109400803
+- (210)-940-0803
 
 ### Native Keyboards
 
@@ -66,7 +70,9 @@ All forms should define an order in which the inputs should be filled out, and u
 3. Add an event listener to the page/component we are creating and update the tab index state on tab/shift + tab key press
 4. Set focus to the input with that tab index.
 
-Additionally, ressing the enter key on any focused field should submit the form.
+Additionally, pressing the enter key on any focused field should submit the form.
+
+Note: This doesn't apply to the multiline fields. To keep the browser behavior consistent, pressing enter on the multiline should not be intercepted. It should follow the default browser behavior (such as adding a newline).
 
 ### Modifying User Input on Change
 
@@ -181,27 +187,24 @@ function onSubmit(values) {
             label="Routing number"
             inputID="routingNumber"
             maxLength={8}
-            isFormInput
             shouldSaveDraft
         />
     </View>
     <TextInput
         label="Account number"
         inputID="accountNumber"
         containerStyles={[styles.mt4]}
-        isFormInput
     />
 </Form>
 ```
 
 ### Props provided to Form inputs
 
-The following props are available to form inputs:
+The following prop is available to form inputs:
 
 - inputID: An unique identifier for the input.
-- isFormInput: A flag that indicates that this input is being used with Form.js.
 
-Form.js will automatically provide the following props to any input flagged with the isFormInput prop.
+Form.js will automatically provide the following props to any input with the inputID prop.
 
 - ref: A React ref that must be attached to the input.
 - defaultValue: The input default value.

README.md

@@ -128,7 +128,7 @@ This is a persistent storage solution wrapped in a Pub/Sub library. In general t
 - Collections of data are usually not stored as a single key (eg. an array with multiple objects), but as individual keys+ID (eg. `report_1234`, `report_4567`, etc.). Store collections as individual keys when a component will bind directly to one of those keys. For example: reports are stored as individual keys because `OptionRow.js` binds to the individual report keys for each link. However, report actions are stored as an array of objects because nothing binds directly to a single report action.
 - Onyx allows other code to subscribe to changes in data, and then publishes change events whenever data is changed
 - Anything needing to read Onyx data needs to:
-    1. Know what key the data is stored in (for web, you can find this by looking in the JS console > Application > local storage)
+    1. Know what key the data is stored in (for web, you can find this by looking in the JS console > Application > IndexedDB > OnyxDB > keyvaluepairs)
     2. Subscribe to changes of the data for a particular key or set of keys. React components use `withOnyx()` and non-React libs use `Onyx.connect()`.
     3. Get initialized with the current value of that key from persistent storage (Onyx does this by calling `setState()` or triggering the `callback` with the values currently on disk as part of the connection process)
 - Subscribing to Onyx keys is done using a constant defined in `ONYXKEYS`. Each Onyx key represents either a collection of items or a specific entry in storage. For example, since all reports are stored as individual keys like `report_1234`, if code needs to know about all the reports (eg. display a list of them in the nav menu), then it would subscribe to the key `ONYXKEYS.COLLECTION.REPORT`.
@@ -160,7 +160,7 @@ That action will then call `Onyx.merge()` to [set default data and a loading sta
 ```js
 function signIn(password, twoFactorAuthCode) {
     Onyx.merge(ONYXKEYS.ACCOUNT, {loading: true});
-    API.Authenticate({
+    Authentication.Authenticate({
         ...defaultParams,
         password,
         twoFactorAuthCode,

__mocks__/@react-native-community/netinfo.js

@@ -1,6 +1,19 @@
-export default {
+const defaultState = {
+    type: 'cellular',
+    isConnected: true,
+    isInternetReachable: true,
+    details: {
+        isConnectionExpensive: true,
+        cellularGeneration: '3g',
+    },
+};
+
+const RNCNetInfoMock = {
     configure: () => {},
-    fetch: () => {},
-    addEventListener: () => {},
+    fetch: () => Promise.resolve(defaultState),
+    refresh: () => Promise.resolve(defaultState),
+    addEventListener: () => (() => {}),
     useNetInfo: () => {},
 };
+
+export default RNCNetInfoMock;

android/app/build.gradle

@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001015600
-        versionName "1.1.56-0"
+        versionCode 1001016103
+        versionName "1.1.61-3"
     }
     splits {
         abi {
@@ -239,8 +239,10 @@ dependencies {
         implementation jscFlavor
     }
 
+    // Firebase libraries (using the Firebase BoM for consistency - see https://firebase.google.com/docs/android/learn-more#bom)
     implementation platform("com.google.firebase:firebase-bom:29.0.3")
     implementation "com.google.firebase:firebase-perf"
+    implementation "com.google.firebase:firebase-crashlytics"
 
     // GIF support
     implementation 'com.facebook.fresco:fresco:2.5.0'
@@ -252,9 +254,6 @@ dependencies {
     // Multi Dex Support: https://developer.android.com/studio/build/multidex#mdex-gradle
     implementation 'com.android.support:multidex:1.0.3'
 
-    // Crashlytics
-    implementation 'com.google.firebase:firebase-crashlytics:17.2.2'
-
     // Plaid SDK
     implementation project(':react-native-plaid-link-sdk')
     // This okhttp3 dependency prevents the app from crashing - See https://github.com/plaid/react-native-plaid-link-sdk/issues/74#issuecomment-648435002

config/webpack/webpack.common.js

@@ -56,7 +56,7 @@ const webpackConfig = ({envFile = '.env', platform = 'web'}) => ({
                 {from: 'assets/css', to: 'css'},
                 {from: 'node_modules/react-pdf/dist/esm/Page/AnnotationLayer.css', to: 'css/AnnotationLayer.css'},
                 {from: 'assets/images/shadow.png', to: 'images/shadow.png'},
-                {from: '.well-known/apple-app-site-association', to: '.well-known/apple-app-site-association'},
+                {from: '.well-known/apple-app-site-association', to: '.well-known/apple-app-site-association', toType: 'file'},
 
                 // These files are copied over as per instructions here
                 // https://github.com/wojtekmaj/react-pdf#copying-cmaps

ios/NewExpensify/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.56</string>
+	<string>1.1.61</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.56.0</string>
+	<string>1.1.61.3</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.1.56</string>
+	<string>1.1.61</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.56.0</string>
+	<string>1.1.61.3</string>
 </dict>
 </plist>