Merge branch 'main' of github.com:Expensify/Expensify.cash into conte…

…xt-menu

android/app/build.gradle

@@ -148,8 +148,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         multiDexEnabled rootProject.ext.multiDexEnabled
-        versionCode 1001006900
-        versionName "1.0.69-0"
+        versionCode 1001007000
+        versionName "1.0.70-0"
     }
     splits {
         abi {

ios/ExpensifyCash/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.69</string>
+	<string>1.0.70</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -30,7 +30,7 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>1.0.69.0</string>
+	<string>1.0.70.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>

ios/ExpensifyCashTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.69</string>
+	<string>1.0.70</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.69.0</string>
+	<string>1.0.70.0</string>
 </dict>
 </plist>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "expensify.cash",
-  "version": "1.0.69-0",
+  "version": "1.0.70-0",
   "author": "Expensify, Inc.",
   "homepage": "https://expensify.cash",
   "description": "Expensify.cash is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

src/CONST.js

@@ -49,6 +49,14 @@ const CONST = {
             SWIFT_BIC: /^[A-Za-z0-9]{8,11}$/,
         },
     },
+    INCORPORATION_TYPES: {
+        LLC: 'LLC',
+        CORPORATION: 'Corp',
+        PARTNERSHIP: 'Partnership',
+        COOPERATIVE: 'Cooperative',
+        SOLE_PROPRIETORSHIP: 'Sole Proprietorship',
+        OTHER: 'Other',
+    },
     BETAS: {
         ALL: 'all',
         CHRONOS_IN_CASH: 'chronosInCash',

src/Expensify.js

@@ -5,7 +5,6 @@ import {View, AppState} from 'react-native';
 import Onyx, {withOnyx} from 'react-native-onyx';
 
 import BootSplash from './libs/BootSplash';
-import StatusBar from './libs/StatusBar';
 import listenToStorageEvents from './libs/listenToStorageEvents';
 import * as ActiveClientManager from './libs/ActiveClientManager';
 import ONYXKEYS from './ONYXKEYS';
@@ -152,11 +151,7 @@ class Expensify extends PureComponent {
     }
 
     hideSplash() {
-        BootSplash.hide({fade: true}).then(() => {
-            // To prevent the splash from shifting positions we set status bar translucent after splash is hidden.
-            // on IOS it has no effect.
-            StatusBar.setTranslucent(true);
-        });
+        BootSplash.hide({fade: true});
     }
 
     render() {

src/ONYXKEYS.js

@@ -90,6 +90,9 @@ export default {
     // Indicates which locale should be used
     PREFERRED_LOCALE: 'preferredLocale',
 
+    // List of transactionIDs in process of rejection
+    TRANSACTIONS_BEING_REJECTED: 'transactionsBeingRejected',
+
     // User's Expensify Wallet
     USER_WALLET: 'userWallet',
 

src/ROUTES.js

@@ -8,8 +8,8 @@ import {addTrailingForwardSlash} from './libs/Url';
 const REPORT = 'r';
 
 export default {
-    ADD_PERSONAL_BANK_ACCOUNT: 'add-personal-bank-account',
-    ADD_VERIFIED_BANK_ACCOUNT: 'add-verified-bank-account',
+    BANK_ACCOUNT: 'bank-account/:stepToOpen?',
+    BANK_ACCOUNT_PERSONAL: 'bank-account/personal',
     HOME: '',
     SETTINGS: 'settings',
     SETTINGS_PROFILE: 'settings/profile',

src/components/AddPlaidBankAccount.js

@@ -21,8 +21,6 @@ import compose from '../libs/compose';
 import withLocalize, {withLocalizePropTypes} from './withLocalize';
 import Button from './Button';
 import Picker from './Picker';
-import Icon from './Icon';
-import {DownArrow} from './Icon/Expensicons';
 import Text from './Text';
 
 const propTypes = {
@@ -149,7 +147,6 @@ class AddPlaidBankAccount extends React.Component {
                                         label: this.props.translate('bankAccount.chooseAnAccount'),
                                     } : {}}
                                     value={this.state.selectedIndex}
-                                    icon={() => <Icon src={DownArrow} />}
                                 />
                             </View>
                             {!_.isUndefined(this.state.selectedIndex) && (

src/components/CheckboxWithLabel.js

@@ -26,7 +26,7 @@ const defaultProps = {
 const CheckboxWithLabel = ({
     LabelComponent, isChecked, onPress, style,
 }) => {
-    const defaultStyles = [styles.flexRow];
+    const defaultStyles = [styles.flexRow, styles.alignItemsCenter];
     const wrapperStyles = _.isArray(style) ? [...defaultStyles, ...style] : [...defaultStyles, style];
     return (
         <View style={wrapperStyles}>

src/components/Picker/PickerPropTypes.js

@@ -1,4 +1,7 @@
+import React from 'react';
 import PropTypes from 'prop-types';
+import Icon from '../Icon';
+import {DownArrow} from '../Icon/Expensicons';
 
 const propTypes = {
     /** A callback method that is called when the value changes and it received the selected value as an argument */
@@ -32,13 +35,14 @@ const propTypes = {
     value: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
 
     /** An icon to display with the picker */
-    icon: PropTypes.func.isRequired,
+    icon: PropTypes.func,
 };
 const defaultProps = {
     useDisabledStyles: false,
     disabled: false,
     placeholder: {},
     value: null,
+    icon: () => <Icon src={DownArrow} />,
 };
 
 export {

src/components/ReportTransaction.js

@@ -1,7 +1,14 @@
 import React, {Component} from 'react';
 import PropTypes from 'prop-types';
-import {Text, View, Pressable} from 'react-native';
+import lodashGet from 'lodash/get';
+import {
+    Text, View, Pressable, ActivityIndicator,
+} from 'react-native';
+import {withOnyx} from 'react-native-onyx';
+import _ from 'underscore';
+import ONYXKEYS from '../ONYXKEYS';
 import styles from '../styles/styles';
+import themeColors from '../styles/themes/default';
 import {rejectTransaction} from '../libs/actions/IOU';
 import ReportActionPropTypes from '../pages/home/report/ReportActionPropTypes';
 import ReportActionItemSingle from '../pages/home/report/ReportActionItemSingle';
@@ -23,6 +30,15 @@ const propTypes = {
 
     /** Text label for the reject transaction button */
     rejectButtonLabelText: PropTypes.string.isRequired,
+
+    /* Onyx Props */
+
+    /** List of transactionIDs in process of rejection */
+    /* eslint-disable-next-line react/no-unused-prop-types, react/require-default-props */
+    transactionsBeingRejected: PropTypes.shape({
+        /** IOUTransactionID that's being rejected */
+        transactionID: PropTypes.bool,
+    }),
 };
 
 const defaultProps = {
@@ -45,6 +61,19 @@ class ReportTransaction extends Component {
         });
     }
 
+    /**
+     * Checks if current IOUTransactionID is being rejected.
+     * @returns {boolean} Returns `true` if current IOUtransactionID is being rejected, else `false`.
+     */
+    isBeingRejected() {
+        const IOUTransactionID = lodashGet(this.props.action, 'originalMessage.IOUTransactionID', '');
+        const transactionsBeingRejected = lodashGet(this.props, 'transactionsBeingRejected', {});
+        if (_.isEmpty(transactionsBeingRejected)) {
+            return false;
+        }
+        return _.has(transactionsBeingRejected, IOUTransactionID);
+    }
+
     render() {
         return (
             <View styles={[styles.mb5]}>
@@ -63,10 +92,24 @@ class ReportTransaction extends Component {
                                 styles.buttonSmall,
                                 styles.chatItemComposeSecondaryRowOffset,
                                 styles.mb3,
+                                styles.w20,
                             ]}
                             onPress={this.rejectTransaction}
                         >
-                            <Text style={[styles.buttonSmallText]}>{this.props.rejectButtonLabelText}</Text>
+                            {
+                            this.isBeingRejected()
+                                ? (
+                                    <ActivityIndicator
+                                        color={themeColors.text}
+                                        style={[styles.flex1]}
+                                    />
+                                )
+                                : (
+                                    <Text style={[styles.buttonSmallText]}>
+                                        {this.props.rejectButtonLabelText}
+                                    </Text>
+                                )
+                            }
                         </Pressable>
                     </View>
                 )}
@@ -78,4 +121,8 @@ class ReportTransaction extends Component {
 ReportTransaction.displayName = 'ReportTransaction';
 ReportTransaction.defaultProps = defaultProps;
 ReportTransaction.propTypes = propTypes;
-export default ReportTransaction;
+export default withOnyx({
+    transactionsBeingRejected: {
+        key: ONYXKEYS.TRANSACTIONS_BEING_REJECTED,
+    },
+})(ReportTransaction);

src/components/StatePicker.js

@@ -0,0 +1,21 @@
+import _ from 'underscore';
+import React from 'react';
+import PropTypes from 'prop-types';
+import {CONST} from 'expensify-common/lib/CONST';
+import Picker from './Picker';
+
+const STATES = _.map(CONST.STATES, ({stateISO}) => ({
+    value: stateISO,
+    label: stateISO,
+}));
+
+const propTypes = {
+    onChange: PropTypes.func.isRequired,
+};
+
+const StatePicker = props => <Picker items={STATES} onChange={props.onChange} />;
+
+StatePicker.propTypes = propTypes;
+StatePicker.displayName = 'StatePicker';
+
+export default StatePicker;

src/components/TextInputWithLabel.js

@@ -1,25 +1,54 @@
 import _ from 'underscore';
 import React from 'react';
-import {Text, TextInput} from 'react-native';
+import {View, TextInput} from 'react-native';
 import PropTypes from 'prop-types';
 import styles from '../styles/styles';
+import Text from './Text';
+import TextLink from './TextLink';
 
 const propTypes = {
     /** Label text */
     label: PropTypes.string,
 
     /** Text to show if there is an error */
     errorText: PropTypes.string,
+
+    /** Styles for the outermost container for this component. */
+    containerStyles: PropTypes.arrayOf(PropTypes.object),
+
+    /** Text to use for a link shown after the label */
+    helpLinkText: PropTypes.string,
+
+    /** URL to use for a link shown after the label */
+    helpLinkURL: PropTypes.string,
 };
 
 const defaultProps = {
     label: '',
     errorText: '',
+    containerStyles: [],
+    helpLinkText: '',
+    helpLinkURL: '',
 };
 
 const TextInputWithLabel = props => (
-    <>
-        {!_.isEmpty(props.label) && <Text style={[styles.formLabel]}>{props.label}</Text>}
+    <View style={props.containerStyles}>
+        <View
+            style={[
+                styles.flexRow,
+                (!_.isEmpty(props.label) && !_.isEmpty(props.helpLinkURL)) ? styles.alignItemsBaseline : undefined,
+            ]}
+        >
+            {!_.isEmpty(props.label) && <Text style={[styles.formLabel]}>{props.label}</Text>}
+            {!_.isEmpty(props.helpLinkURL) && (
+                <TextLink
+                    href={props.helpLinkURL}
+                    style={!_.isEmpty(props.label) ? [styles.textItalic, styles.textMicro, styles.ml2] : undefined}
+                >
+                    {props.helpLinkText || props.helpLinkURL}
+                </TextLink>
+            )}
+        </View>
         <TextInput
             style={[styles.textInput, styles.mb1]}
             // eslint-disable-next-line react/jsx-props-no-spreading
@@ -28,7 +57,7 @@ const TextInputWithLabel = props => (
         {props.errorText !== '' && (
             <Text style={[styles.formError]}>{props.errorText}</Text>
         )}
-    </>
+    </View>
 );
 
 TextInputWithLabel.propTypes = propTypes;

src/components/TextLink.js

@@ -31,7 +31,7 @@ const TextLink = (props) => {
             href={props.href}
         >
             {({hovered, pressed}) => (
-                <Text style={[...additionalStyles, styles.link, (hovered || pressed) ? styles.linkHovered : undefined]}>
+                <Text style={[styles.link, (hovered || pressed) ? styles.linkHovered : undefined, ...additionalStyles]}>
                     {props.children}
                 </Text>
             )}