Merge branch 'main' / Resolve conflicts

Author: aldo-expensify

CONTRIBUTING.md

@@ -70,6 +70,7 @@ In this scenario, it’s possible that you found a bug or enhancement that we ha
 #### 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.
     - Note: If you post a proposed solution in an issue that has not been tagged with the `External` label, Expensify has the right to use your proposal to fix said issue, without providing compensation for your solution.
+    - 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 Expensify provides feedback on your proposal (do not begin coding or creating a pull request yet).
 6. If your solution proposal is accepted, Expensify will hire you on Upwork and assign the GitHub issue to you.
 

android/app/build.gradle

@@ -150,8 +150,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001010501
-        versionName "1.1.5-1"
+        versionCode 1001010600
+        versionName "1.1.6-0"
     }
     splits {
         abi {

assets/images/paypal.svg

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.5</string>
+	<string>1.1.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -31,7 +31,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.1.5.1</string>
+	<string>1.1.6.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/NewExpensify/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.5</string>
+	<string>1.1.6</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.1.5.1</string>
+	<string>1.1.6.0</string>
 </dict>
 </plist>

ios/NewExpensifyTests/Info.plist

@@ -1,6 +1,6 @@
 {
   "name": "new.expensify",
-  "version": "1.1.5-1",
+  "version": "1.1.6-0",
   "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.",

package-lock.json

@@ -0,0 +1,113 @@
+import _ from 'underscore';
+import React from 'react';
+import {View} from 'react-native';
+import PropTypes from 'prop-types';
+import styles from '../styles/styles';
+import Icon from './Icon';
+import {Exclamation} from './Icon/Expensicons';
+import colors from '../styles/colors';
+import Button from './Button';
+import withLocalize, {withLocalizePropTypes} from './withLocalize';
+import TextLink from './TextLink';
+import Text from './Text';
+import RenderHTML from './RenderHTML';
+
+const propTypes = {
+    /** Whether to show the alert text */
+    isAlertVisible: PropTypes.bool.isRequired,
+
+    /** Submit function */
+    onSubmit: PropTypes.func.isRequired,
+
+    /** Text for the button */
+    buttonText: PropTypes.string.isRequired,
+
+    /** Callback fired when the "fix the errors" link is pressed */
+    onFixTheErrorsLinkPressed: PropTypes.func.isRequired,
+
+    /** Error message to display above button */
+    message: PropTypes.string,
+
+    /** Whether message is in html format */
+    isMessageHtml: PropTypes.bool,
+
+    ...withLocalizePropTypes,
+};
+
+const defaultProps = {
+    message: '',
+    isMessageHtml: false,
+};
+
+const FormAlertWithSubmitButton = ({
+    isAlertVisible,
+    onSubmit,
+    buttonText,
+    translate,
+    onFixTheErrorsLinkPressed,
+    message,
+    isMessageHtml,
+}) => {
+    /**
+     * @returns {React.Component}
+     */
+    function getAlertPrompt() {
+        let error = '';
+
+        if (!_.isEmpty(message)) {
+            if (isMessageHtml) {
+                error = (
+                    <RenderHTML html={`<muted-text>${message}</muted-text>`} />
+                );
+            } else {
+                error = (
+                    <Text style={styles.mutedTextLabel}>{message}</Text>
+                );
+            }
+        } else {
+            error = (
+                <>
+                    <Text style={styles.mutedTextLabel}>
+                        {`${translate('common.please')} `}
+                    </Text>
+                    <TextLink
+                        style={styles.label}
+                        onPress={onFixTheErrorsLinkPressed}
+                    >
+                        {translate('common.fixTheErrors')}
+                    </TextLink>
+                    <Text style={styles.mutedTextLabel}>
+                        {` ${translate('common.inTheFormBeforeContinuing')}.`}
+                    </Text>
+                </>
+            );
+        }
+
+        return (
+            <View style={[styles.flexRow, styles.ml2, styles.flexWrap, styles.flex1]}>
+                {error}
+            </View>
+        );
+    }
+
+    return (
+        <View style={[styles.mh5, styles.mb5, styles.flex1, styles.justifyContentEnd]}>
+            {isAlertVisible && (
+                <View style={[styles.flexRow, styles.alignItemsCenter, styles.mb3]}>
+                    <Icon src={Exclamation} fill={colors.red} />
+                    {getAlertPrompt()}
+                </View>
+            )}
+            <Button
+                success
+                text={buttonText}
+                onPress={onSubmit}
+                pressOnEnter
+            />
+        </View>
+    );
+};
+
+FormAlertWithSubmitButton.propTypes = propTypes;
+FormAlertWithSubmitButton.defaultProps = defaultProps;
+export default withLocalize(FormAlertWithSubmitButton);

package.json

@@ -78,6 +78,9 @@ export default {
         },
         please: 'Please',
         contactUs: 'contact us',
+        pleaseEnterEmailOrPhoneNumber: 'Please enter an email or phone number',
+        fixTheErrors: 'fix the errors',
+        inTheFormBeforeContinuing: 'in the form before continuing',
         confirm: 'Confirm',
         reset: 'Reset',
         done: 'Done',
@@ -369,7 +372,6 @@ export default {
         },
     },
     loginForm: {
-        pleaseEnterEmailOrPhoneNumber: 'Please enter an email or phone number',
         phoneOrEmail: 'Phone or email',
         error: {
             invalidFormatLogin: 'The email or phone number entered is invalid. Please fix the format and try again.',
@@ -444,8 +446,6 @@ export default {
             firstName: 'Please enter valid first name',
             lastName: 'Please enter valid last name',
             noDefaultDepositAccountOrDebitCardAvailable: 'Please add a default deposit bank account or debit card',
-            fixTheErrors: 'fix the errors',
-            inTheFormBeforeContinuing: 'in the form before continuing',
             validationAmounts: 'The validation amounts you entered are incorrect. Please double-check your bank statement and try again.',
         },
     },

src/components/FormAlertWithSubmitButton.js

@@ -78,6 +78,9 @@ export default {
         },
         please: 'Por favor',
         contactUs: 'contáctenos',
+        pleaseEnterEmailOrPhoneNumber: 'Por favor escribe un email o número de teléfono',
+        fixTheErrors: 'corrige los errores',
+        inTheFormBeforeContinuing: 'en el formulario antes de continuar',
         confirm: 'Confirmar',
         reset: 'Restablecer',
         done: 'Listo',
@@ -369,7 +372,6 @@ export default {
         },
     },
     loginForm: {
-        pleaseEnterEmailOrPhoneNumber: 'Por favor escribe un email o número de teléfono',
         phoneOrEmail: 'Número de teléfono o email',
         error: {
             invalidFormatLogin: 'El email o número de teléfono que has introducido no es válido. Corrígelo e inténtalo de nuevo.',
@@ -444,8 +446,6 @@ export default {
             firstName: 'Ingresa un nombre válido',
             lastName: 'Ingresa un apellido válido',
             noDefaultDepositAccountOrDebitCardAvailable: 'Por favor agrega una cuenta bancaria para depósitos o una tarjeta de débito',
-            fixTheErrors: 'corrige los errores',
-            inTheFormBeforeContinuing: 'en el formulario antes de continuar',
             validationAmounts: 'Los montos de validación que ingresaste son incorrectos. Verifica tu cuenta de banco e intenta de nuevo.',
         },
     },

src/languages/en.js

@@ -529,7 +529,7 @@ function setFreePlanVerifiedBankAccountID(bankAccountID) {
  * @param {Boolean} isErrorModalMessageHtml if @errorModalMessage is in html format or not
  */
 function showBankAccountErrorModal(errorModalMessage = null, isErrorModalMessageHtml = false) {
-    Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {isErrorModalVisible: true, errorModalMessage, isErrorModalMessageHtml});
+    Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {errorModalMessage, isErrorModalMessageHtml});
 }
 
 /**
@@ -583,13 +583,6 @@ function validateBankAccount(bankAccountID, validateCode) {
         });
 }
 
-/**
- * Hide error modal
- */
-function hideBankAccountErrorModal() {
-    Onyx.merge(ONYXKEYS.REIMBURSEMENT_ACCOUNT, {isErrorModalVisible: false});
-}
-
 /**
  * Set the current fields with errors.
  *
@@ -810,7 +803,6 @@ export {
     setupWithdrawalAccount,
     validateBankAccount,
     hideBankAccountErrors,
-    hideBankAccountErrorModal,
     showBankAccountErrorModal,
     showBankAccountFormValidationError,
     setBankAccountFormValidationErrors,

src/languages/es.js

@@ -73,7 +73,7 @@ function updateAllPolicies(policyCollection) {
 
     // Set all the policies
     _.each(policyCollection, (policyData, key) => {
-        Onyx.merge(key, policyData);
+        Onyx.merge(key, {...policyData, alertMessage: '', errors: null});
     });
 }
 
@@ -179,6 +179,7 @@ function invite(logins, welcomeNote, policyID) {
     // Make a shallow copy to preserve original data, and concat the login
     const policy = _.clone(allPolicies[key]);
     policy.employeeList = [...policy.employeeList, ...newEmployeeList];
+    policy.alertMessage = '';
 
     // Optimistically add the user to the policy
     Onyx.set(key, policy);
@@ -193,21 +194,21 @@ function invite(logins, welcomeNote, policyID) {
             // Save the personalDetails for the invited user in Onyx
             if (data.jsonCode === 200) {
                 Onyx.merge(ONYXKEYS.PERSONAL_DETAILS, formatPersonalDetails(data.personalDetails));
+                Navigation.goBack();
                 return;
             }
 
             // If the operation failed, undo the optimistic addition
             const policyDataWithoutLogin = _.clone(allPolicies[key]);
             policyDataWithoutLogin.employeeList = _.without(allPolicies[key].employeeList, ...newEmployeeList);
-            Onyx.set(key, policyDataWithoutLogin);
 
             // Show the user feedback that the addition failed
-            let errorMessage = translateLocal('workspace.invite.genericFailureMessage');
+            policyDataWithoutLogin.alertMessage = translateLocal('workspace.invite.genericFailureMessage');
             if (data.jsonCode === 402) {
-                errorMessage += ` ${translateLocal('workspace.invite.pleaseEnterValidLogin')}`;
+                policyDataWithoutLogin.alertMessage += ` ${translateLocal('workspace.invite.pleaseEnterValidLogin')}`;
             }
 
-            Growl.error(errorMessage, 5000);
+            Onyx.set(key, policyDataWithoutLogin);
         });
 }
 
@@ -294,6 +295,22 @@ function updateLocalPolicyValues(policyID, values) {
     Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, values);
 }
 
+/**
+ * @param {String} policyID
+ * @param {Object} errors
+ */
+function setWorkspaceErrors(policyID, errors) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {errors: null});
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {errors});
+}
+
+/**
+ * @param {String} policyID
+ */
+function hideWorkspaceAlertMessage(policyID) {
+    Onyx.merge(`${ONYXKEYS.COLLECTION.POLICY}${policyID}`, {alertMessage: ''});
+}
+
 export {
     getPolicySummaries,
     getPolicyList,
@@ -304,4 +321,6 @@ export {
     uploadAvatar,
     update,
     updateLocalPolicyValues,
+    setWorkspaceErrors,
+    hideWorkspaceAlertMessage,
 };