Merge remote-tracking branch 'origin' into marcaaron-networkCleanup2

android/app/build.gradle

@@ -152,8 +152,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001014600
-        versionName "1.1.46-0"
+        versionCode 1001014601
+        versionName "1.1.46-1"
     }
     splits {
         abi {

ios/NewExpensify/Info.plist

@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.46.0</string>
+	<string>1.1.46.1</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensifyTests/Info.plist

@@ -19,6 +19,6 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.46.0</string>
+	<string>1.1.46.1</string>
 </dict>
 </plist>

ios/Podfile.lock

@@ -443,7 +443,7 @@ PODS:
     - React-Core
   - react-native-flipper (0.117.0):
     - React-Core
-  - react-native-image-picker (4.1.2):
+  - react-native-image-picker (4.7.3):
     - React-Core
   - react-native-netinfo (8.0.0):
     - React-Core
@@ -933,7 +933,7 @@ SPEC CHECKSUMS:
   react-native-config: 6502b1879f97ed5ac570a029961fc35ea606cd14
   react-native-document-picker: 772d04a4bc5c35da9abe27b08ac271420ae3f9ef
   react-native-flipper: cd9eabd8917104c1bbdca2621717cdca3b2addef
-  react-native-image-picker: f45729c43d4f854508ab25c0d0f0f711a2a8a267
+  react-native-image-picker: ae1202414bd5c37c00b2a701daa5b6194a06b7d9
   react-native-netinfo: 0124c0695373fce63cea24aeebb97ab2d237947a
   react-native-pdf: 4b5a9e4465a6a3b399e91dc4838eb44ddf716d1f
   react-native-performance: 8edfa2bbc9a2af4a02f01d342118e413a95145e0
@@ -979,4 +979,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 1199d07d3ccd1ea23300ad9e27bc9287716223bf
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.11.2

package.json

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.46-0",
+  "version": "1.1.46-1",
   "author": "Expensify, Inc.",
   "homepage": "https://new.expensify.com",
   "description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",
@@ -84,7 +84,7 @@
     "react-native-google-places-autocomplete": "git+https://github.com/Expensify/react-native-google-places-autocomplete.git#3bbd17d63e6c38d38d857b50f6037c1c0376ff06",
     "react-native-haptic-feedback": "^1.13.0",
     "react-native-image-pan-zoom": "^2.1.12",
-    "react-native-image-picker": "^4.1.2",
+    "react-native-image-picker": "^4.7.3",
     "react-native-image-size": "^1.1.3",
     "react-native-keyboard-spacer": "^0.4.1",
     "react-native-modal": "^13.0.0",

src/components/AttachmentPicker/index.native.js

@@ -32,6 +32,7 @@ const imagePickerOptions = {
     includeBase64: false,
     saveToPhotos: false,
     selectionLimit: 1,
+    includeExtra: false,
 };
 
 /**

src/components/TextInput/index.js

@@ -16,6 +16,8 @@ class TextInput extends React.Component {
     }
 
     render() {
+        const isLabeledMultiline = Boolean(this.props.label.length) && this.props.multiline;
+
         return (
             <BaseTextInput
                 // eslint-disable-next-line react/jsx-props-no-spreading
@@ -33,7 +35,12 @@ class TextInput extends React.Component {
 
                     this.props.innerRef.current = el;
                 }}
-                inputStyle={[styles.baseTextInput, styles.textInputDesktop, ...this.props.inputStyle]}
+                inputStyle={[
+                    styles.baseTextInput,
+                    styles.textInputDesktop,
+                    isLabeledMultiline && styles.textInputMultiline,
+                    ...this.props.inputStyle,
+                ]}
             />
         );
     }

src/libs/actions/IOU.js

@@ -138,6 +138,10 @@ function createIOUSplit(params) {
         emailList: _.map(params.splits, participant => participant.email).join(','),
     })
         .then((response) => {
+            if (response.jsonCode !== 200) {
+                return response;
+            }
+
             chatReportID = response.reportID;
             return API.CreateIOUSplit({
                 ...params,

src/libs/actions/Session/index.js

@@ -49,21 +49,18 @@ function setSuccessfulSignInData(data) {
  * @param {String} login
  */
 function createAccount(login) {
-    Onyx.merge(ONYXKEYS.SESSION, {error: ''});
+    Onyx.merge(ONYXKEYS.ACCOUNT, {error: ''});
 
     API.User_SignUp({
         email: login,
     }).then((response) => {
-        if (response.jsonCode === 200) {
+        // A 405 means that the account needs to be validated. We should let the user proceed to the ResendValidationForm view.
+        if (response.jsonCode === 200 || response.jsonCode === 405) {
             return;
         }
 
-        let errorMessage = response.message || `Unknown API Error: ${response.jsonCode}`;
-        if (!response.message && response.jsonCode === 405) {
-            errorMessage = 'Cannot create an account that is under a controlled domain';
-        }
-        Onyx.merge(ONYXKEYS.SESSION, {error: errorMessage});
         Onyx.merge(ONYXKEYS.CREDENTIALS, {login: null});
+        Onyx.merge(ONYXKEYS.ACCOUNT, {error: response.message || `Unknown API Error: ${response.jsonCode}`});
     });
 }
 

src/styles/styles.js

@@ -702,6 +702,10 @@ const styles = {
         borderRadius: variables.componentBorderRadiusNormal,
     },
 
+    textInputMultiline: {
+        scrollPadding: '23px 0 0 0',
+    },
+
     textInputAndIconContainer: {
         flex: 1,
         height: '100%',