Skip to content

Commit 318aa29

Browse files
mjasikowskimjasikowski
authored
Merge pull request #54756 from Expensify/Beamanator-cherry-pick-staging-54729-1
🍒 Cherry pick PR #54729 to staging 🍒
2 parents b3f0729 + 1e3e676 commit 318aa29

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+207
-1746
lines changed

‎android/app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,8 @@ android {
110110
minSdkVersion rootProject.ext.minSdkVersion
111111
targetSdkVersion rootProject.ext.targetSdkVersion
112112
multiDexEnabled rootProject.ext.multiDexEnabled
113-
versionCode 1009008004
114-
versionName "9.0.80-4"
113+
versionCode 1009008005
114+
versionName "9.0.80-5"
115115
// Supported language variants must be declared here to avoid from being removed during the compilation.
116116
// This also helps us to not include unnecessary language variants in the APK.
117117
resConfigs "en", "es"

‎ios/NewExpensify/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
</dict>
4141
</array>
4242
<key>CFBundleVersion</key>
43-
<string>9.0.80.4</string>
43+
<string>9.0.80.5</string>
4444
<key>FullStory</key>
4545
<dict>
4646
<key>OrgId</key>

‎ios/NewExpensifyTests/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
<key>CFBundleSignature</key>
2020
<string>????</string>
2121
<key>CFBundleVersion</key>
22-
<string>9.0.80.4</string>
22+
<string>9.0.80.5</string>
2323
</dict>
2424
</plist>

‎ios/NotificationServiceExtension/Info.plist

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<key>CFBundleShortVersionString</key>
1414
<string>9.0.80</string>
1515
<key>CFBundleVersion</key>
16-
<string>9.0.80.4</string>
16+
<string>9.0.80.5</string>
1717
<key>NSExtension</key>
1818
<dict>
1919
<key>NSExtensionPointIdentifier</key>

‎package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "new.expensify",
3-
"version": "9.0.80-4",
3+
"version": "9.0.80-5",
44
"author": "Expensify, Inc.",
55
"homepage": "https://new.expensify.com",
66
"description": "New Expensify is the next generation of Expensify: a reimagination of payments based atop a foundation of chat.",

‎src/CONST.ts

-45
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,6 @@ const CONST = {
939939
CONFIGURE_REIMBURSEMENT_SETTINGS_HELP_URL: 'https://help.expensify.com/articles/expensify-classic/workspaces/Configure-Reimbursement-Settings',
940940
COPILOT_HELP_URL: 'https://help.expensify.com/articles/expensify-classic/copilots-and-delegates/Assign-or-remove-a-Copilot',
941941
DELAYED_SUBMISSION_HELP_URL: 'https://help.expensify.com/articles/expensify-classic/reports/Automatically-submit-employee-reports',
942-
ENCRYPTION_AND_SECURITY_HELP_URL: 'https://help.expensify.com/articles/new-expensify/settings/Encryption-and-Data-Security',
943942
PLAN_TYPES_AND_PRICING_HELP_URL: 'https://help.expensify.com/articles/new-expensify/billing-and-subscriptions/Plan-types-and-pricing',
944943
// Use Environment.getEnvironmentURL to get the complete URL with port number
945944
DEV_NEW_EXPENSIFY_URL: 'https://dev.new.expensify.com:',
@@ -6441,50 +6440,6 @@ const CONST = {
64416440
},
64426441
},
64436442

6444-
CORPAY_FIELDS: {
6445-
BANK_ACCOUNT_DETAILS_FIELDS: ['accountNumber', 'localAccountNumber', 'routingCode', 'localRoutingCode', 'swiftBicCode'] as string[],
6446-
ACCOUNT_TYPE_KEY: 'BeneficiaryAccountType',
6447-
BANK_INFORMATION_FIELDS: ['bankName', 'bankAddressLine1', 'bankAddressLine2', 'bankCity', 'bankRegion', 'bankPostal', 'BeneficiaryBankBranchName'] as string[],
6448-
ACCOUNT_HOLDER_FIELDS: [
6449-
'accountHolderName',
6450-
'accountHolderAddress1',
6451-
'accountHolderAddress2',
6452-
'accountHolderCity',
6453-
'accountHolderRegion',
6454-
'accountHolderCountry',
6455-
'accountHolderPostal',
6456-
'accountHolderPhoneNumber',
6457-
'accountHolderEmail',
6458-
'ContactName',
6459-
'BeneficiaryCPF',
6460-
'BeneficiaryRUT',
6461-
'BeneficiaryCedulaID',
6462-
'BeneficiaryTaxID',
6463-
] as string[],
6464-
SPECIAL_LIST_REGION_KEYS: ['bankRegion', 'accountHolderRegion'] as string[],
6465-
SPECIAL_LIST_ADDRESS_KEYS: ['bankAddressLine1', 'accountHolderAddress1'] as string[],
6466-
STEPS_NAME: {
6467-
COUNTRY_SELECTOR: 'CountrySelector',
6468-
BANK_ACCOUNT_DETAILS: 'BankAccountDetails',
6469-
ACCOUNT_TYPE: 'AccountType',
6470-
BANK_INFORMATION: 'BankInformation',
6471-
ACCOUNT_HOLDER_INFORMATION: 'AccountHolderInformation',
6472-
CONFIRMATION: 'Confirmation',
6473-
SUCCESS: 'Success',
6474-
},
6475-
INDEXES: {
6476-
MAPPING: {
6477-
COUNTRY_SELECTOR: 0,
6478-
BANK_ACCOUNT_DETAILS: 1,
6479-
ACCOUNT_TYPE: 2,
6480-
BANK_INFORMATION: 3,
6481-
ACCOUNT_HOLDER_INFORMATION: 4,
6482-
CONFIRMATION: 5,
6483-
SUCCESS: 6,
6484-
},
6485-
},
6486-
},
6487-
64886443
HYBRID_APP: {
64896444
REORDERING_REACT_NATIVE_ACTIVITY_TO_FRONT: 'reorderingReactNativeActivityToFront',
64906445
},

‎src/ONYXKEYS.ts

-3
Original file line numberDiff line numberDiff line change
@@ -600,8 +600,6 @@ const ONYXKEYS = {
600600
HOME_ADDRESS_FORM_DRAFT: 'homeAddressFormDraft',
601601
PERSONAL_DETAILS_FORM: 'personalDetailsForm',
602602
PERSONAL_DETAILS_FORM_DRAFT: 'personalDetailsFormDraft',
603-
INTERNATIONAL_BANK_ACCOUNT_FORM: 'internationalBankAccountForm',
604-
INTERNATIONAL_BANK_ACCOUNT_FORM_DRAFT: 'internationalBankAccountFormDraft',
605603
NEW_ROOM_FORM: 'newRoomForm',
606604
NEW_ROOM_FORM_DRAFT: 'newRoomFormDraft',
607605
ROOM_SETTINGS_FORM: 'roomSettingsForm',
@@ -821,7 +819,6 @@ type OnyxFormValuesMapping = {
821819
[ONYXKEYS.FORMS.RULES_MAX_EXPENSE_AGE_FORM]: FormTypes.RulesMaxExpenseAgeForm;
822820
[ONYXKEYS.FORMS.SEARCH_SAVED_SEARCH_RENAME_FORM]: FormTypes.SearchSavedSearchRenameForm;
823821
[ONYXKEYS.FORMS.DEBUG_DETAILS_FORM]: FormTypes.DebugReportForm | FormTypes.DebugReportActionForm | FormTypes.DebugTransactionForm | FormTypes.DebugTransactionViolationForm;
824-
[ONYXKEYS.FORMS.INTERNATIONAL_BANK_ACCOUNT_FORM]: FormTypes.InternationalBankAccountForm;
825822
[ONYXKEYS.FORMS.WORKSPACE_PER_DIEM_FORM]: FormTypes.WorkspacePerDiemForm;
826823
};
827824

‎src/ROUTES.ts

-1
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,6 @@ const ROUTES = {
200200
},
201201
SETTINGS_ADD_DEBIT_CARD: 'settings/wallet/add-debit-card',
202202
SETTINGS_ADD_BANK_ACCOUNT: 'settings/wallet/add-bank-account',
203-
SETTINGS_ADD_US_BANK_ACCOUNT: 'settings/wallet/add-us-bank-account',
204203
SETTINGS_ENABLE_PAYMENTS: 'settings/wallet/enable-payments',
205204
SETTINGS_WALLET_CARD_DIGITAL_DETAILS_UPDATE_ADDRESS: {
206205
route: 'settings/wallet/card/:domain/digital-details/update-address',

‎src/SCREENS.ts

-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ const SCREENS = {
6969
ADD_DEBIT_CARD: 'Settings_Add_Debit_Card',
7070
ADD_PAYMENT_CARD_CHANGE_CURRENCY: 'Settings_Add_Payment_Card_Change_Currency',
7171
ADD_BANK_ACCOUNT: 'Settings_Add_Bank_Account',
72-
ADD_US_BANK_ACCOUNT: 'Settings_Add_US_Bank_Account',
7372
CLOSE: 'Settings_Close',
7473
TWO_FACTOR_AUTH: 'Settings_TwoFactorAuth',
7574
REPORT_CARD_LOST_OR_DAMAGED: 'Settings_ReportCardLostOrDamaged',

‎src/components/CurrencyPicker.tsx

-86
This file was deleted.

‎src/components/Form/FormProvider.tsx

+2-7
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,6 @@ type FormProviderProps<TFormID extends OnyxFormKey = OnyxFormKey> = FormProps<TF
6969

7070
/** Whether HTML is allowed in form inputs */
7171
allowHTML?: boolean;
72-
73-
/** Whether the form is loading */
74-
isLoading?: boolean;
7572
};
7673

7774
function FormProvider(
@@ -85,7 +82,6 @@ function FormProvider(
8582
onSubmit,
8683
shouldTrimValues = true,
8784
allowHTML = false,
88-
isLoading = false,
8985
...rest
9086
}: FormProviderProps,
9187
forwardedRef: ForwardedRef<FormRef>,
@@ -193,7 +189,7 @@ function FormProvider(
193189
const submit = useDebounceNonReactive(
194190
useCallback(() => {
195191
// Return early if the form is already submitting to avoid duplicate submission
196-
if (!!formState?.isLoading || isLoading) {
192+
if (formState?.isLoading) {
197193
return;
198194
}
199195

@@ -214,7 +210,7 @@ function FormProvider(
214210
}
215211

216212
KeyboardUtils.dismiss().then(() => onSubmit(trimmedStringValues));
217-
}, [enabledWhenOffline, formState?.isLoading, inputValues, isLoading, network?.isOffline, onSubmit, onValidate, shouldTrimValues]),
213+
}, [enabledWhenOffline, formState?.isLoading, inputValues, network?.isOffline, onSubmit, onValidate, shouldTrimValues]),
218214
1000,
219215
{leading: true, trailing: false},
220216
);
@@ -410,7 +406,6 @@ function FormProvider(
410406
onSubmit={submit}
411407
inputRefs={inputRefs}
412408
errors={errors}
413-
isLoading={isLoading}
414409
enabledWhenOffline={enabledWhenOffline}
415410
>
416411
{typeof children === 'function' ? children({inputValues}) : children}

‎src/components/Form/FormWrapper.tsx

+1-6
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,6 @@ type FormWrapperProps = ChildrenProps &
3636

3737
/** Callback to submit the form */
3838
onSubmit: () => void;
39-
40-
/** Whether the form is loading */
41-
isLoading?: boolean;
4239
};
4340

4441
function FormWrapper({
@@ -60,7 +57,6 @@ function FormWrapper({
6057
shouldHideFixErrorsAlert = false,
6158
disablePressOnEnter = false,
6259
isSubmitDisabled = false,
63-
isLoading = false,
6460
}: FormWrapperProps) {
6561
const styles = useThemeStyles();
6662
const {paddingBottom: safeAreaInsetPaddingBottom} = useStyledSafeAreaInsets();
@@ -116,7 +112,7 @@ function FormWrapper({
116112
buttonText={submitButtonText}
117113
isDisabled={isSubmitDisabled}
118114
isAlertVisible={((!isEmptyObject(errors) || !isEmptyObject(formState?.errorFields)) && !shouldHideFixErrorsAlert) || !!errorMessage}
119-
isLoading={!!formState?.isLoading || isLoading}
115+
isLoading={!!formState?.isLoading}
120116
message={isEmptyObject(formState?.errorFields) ? errorMessage : undefined}
121117
onSubmit={onSubmit}
122118
footerContent={footerContent}
@@ -147,7 +143,6 @@ function FormWrapper({
147143
formState?.isLoading,
148144
shouldHideFixErrorsAlert,
149145
errorMessage,
150-
isLoading,
151146
onSubmit,
152147
footerContent,
153148
onFixTheErrorsLinkPressed,

‎src/components/SelectionList/BaseSelectionList.tsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ function BaseSelectionList<TItem extends ListItem>(
6767
showScrollIndicator = true,
6868
showLoadingPlaceholder = false,
6969
showConfirmButton = false,
70-
isConfirmButtonDisabled = false,
7170
shouldUseDefaultTheme = false,
7271
shouldPreventDefaultFocusOnSelectRow = false,
7372
containerStyle,
@@ -766,7 +765,7 @@ function BaseSelectionList<TItem extends ListItem>(
766765
{
767766
captureOnInputs: true,
768767
shouldBubble: !flattenedSections.allOptions.at(focusedIndex) || focusedIndex === -1,
769-
isActive: !disableKeyboardShortcuts && isFocused && !isConfirmButtonDisabled,
768+
isActive: !disableKeyboardShortcuts && isFocused,
770769
},
771770
);
772771

@@ -849,7 +848,6 @@ function BaseSelectionList<TItem extends ListItem>(
849848
onPress={onConfirm}
850849
pressOnEnter
851850
enterKeyEventListenerPriority={1}
852-
isDisabled={isConfirmButtonDisabled}
853851
/>
854852
</FixedFooter>
855853
)}

‎src/components/SelectionList/types.ts

-3
Original file line numberDiff line numberDiff line change
@@ -485,9 +485,6 @@ type BaseSelectionListProps<TItem extends ListItem> = Partial<ChildrenProps> & {
485485
/** Whether to show the default confirm button */
486486
showConfirmButton?: boolean;
487487

488-
/** Whether to show the default confirm button disabled */
489-
isConfirmButtonDisabled?: boolean;
490-
491488
/** Whether to use the default theme for the confirm button */
492489
shouldUseDefaultTheme?: boolean;
493490

‎src/components/TextPicker/index.tsx

+2-10
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,11 @@ import CONST from '@src/CONST';
77
import TextSelectorModal from './TextSelectorModal';
88
import type {TextPickerProps} from './types';
99

10-
function TextPicker(
11-
{value, description, placeholder = '', errorText = '', onInputChange, furtherDetails, rightLabel, disabled = false, interactive = true, ...rest}: TextPickerProps,
12-
forwardedRef: ForwardedRef<View>,
13-
) {
10+
function TextPicker({value, description, placeholder = '', errorText = '', onInputChange, furtherDetails, rightLabel, ...rest}: TextPickerProps, forwardedRef: ForwardedRef<View>) {
1411
const styles = useThemeStyles();
1512
const [isPickerVisible, setIsPickerVisible] = useState(false);
1613

1714
const showPickerModal = () => {
18-
if (disabled) {
19-
return;
20-
}
2115
setIsPickerVisible(true);
2216
};
2317

@@ -36,7 +30,7 @@ function TextPicker(
3630
<View>
3731
<MenuItemWithTopDescription
3832
ref={forwardedRef}
39-
shouldShowRightIcon={!disabled}
33+
shouldShowRightIcon
4034
title={value ?? placeholder ?? ''}
4135
description={description}
4236
onPress={showPickerModal}
@@ -45,15 +39,13 @@ function TextPicker(
4539
brickRoadIndicator={errorText ? CONST.BRICK_ROAD_INDICATOR_STATUS.ERROR : undefined}
4640
errorText={errorText}
4741
style={[styles.moneyRequestMenuItem]}
48-
interactive={interactive}
4942
/>
5043
<TextSelectorModal
5144
value={value}
5245
isVisible={isPickerVisible}
5346
description={description}
5447
onClose={hidePickerModal}
5548
onValueSelected={updateInput}
56-
disabled={disabled}
5749
// eslint-disable-next-line react/jsx-props-no-spreading
5850
{...rest}
5951
/>

0 commit comments

Comments
 (0)