diff --git a/docs/redirects.csv b/docs/redirects.csv index 55cfd267f651..b56f148fcd80 100644 --- a/docs/redirects.csv +++ b/docs/redirects.csv @@ -563,9 +563,13 @@ https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Reimbursing-Reports,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Reimburse-Reports-Invoices-and-Bills https://help.expensify.com/articles/expensify-classic/connect-credit-cards/Global-Reimbursements,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Enable-Global-Reimbursements https://community.expensify.com/discussion/4641/how-to-add-a-deposit-only-bank-account-both-personal-and-business,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/bank-accounts/Connect-US-Business-Bank-Account -https://community.expensify.com/discussion/5940/how-to-get-reimbursed-outside-the-us-with-wise-for-non-us-employees,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/Third-Party-Payments +https://community.expensify.com/discussion/5940/how-to-get-reimbursed-outside-the-us-with-wise-for-non-us-employees,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Get-reimbursed-faster-as-a-non-US-employee https://help.expensify.com/articles/expensify-classic/spending-insights,https://help.expensify.com/articles/expensify-classic/spending-insights/Custom-Templates https://help.expensify.com/articles/expensify-classic/settings/account-settings/Set-notifications,https://help.expensify.com/articles/expensify-classic/settings/account-settings/Set-Notifications https://help.expensify.com/articles/new-expensify/getting-started/Upgrade-to-a-Collect-Plan,https://help.expensify.com/Hidden/Upgrade-to-a-Collect-Plan https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Reimburse-Reports-Invoices-and-Bills,https://help.expensify.com/articles/expensify-classic/bank-accounts-and-payments/payments/Reimburse-Reports https://help.expensify.com/articles/new-expensify/expenses-&-payments/pay-an-invoice.html,https://help.expensify.com/articles/new-expensify/expenses-&-payments/Pay-an-invoice +https://community.expensify.com/discussion/4707/how-to-set-up-your-mobile-app,https://help.expensify.com/articles/expensify-classic/getting-started/Join-your-company's-workspace#download-the-mobile-app +https://community.expensify.com//discussion/6927/deep-dive-how-can-i-estimate-the-savings-applied-to-my-bill,https://help.expensify.com/articles/expensify-classic/expensify-billing/Billing-Overview#savings-calculator +https://community.expensify.com/discussion/5179/faq-what-does-a-policy-for-which-you-are-an-admin-has-out-of-date-billing-information-mean,https://help.expensify.com/articles/expensify-classic/expensify-billing/Out-of-date-Billing +https://community.expensify.com/discussion/6179/setting-up-a-receipt-or-travel-integration-with-expensify,https://help.expensify.com/articles/expensify-classic/connections/Additional-Travel-Integrations diff --git a/src/pages/workspace/categories/ImportedCategoriesPage.tsx b/src/pages/workspace/categories/ImportedCategoriesPage.tsx index 8e942b3060ff..6a8d8895aaaa 100644 --- a/src/pages/workspace/categories/ImportedCategoriesPage.tsx +++ b/src/pages/workspace/categories/ImportedCategoriesPage.tsx @@ -66,14 +66,15 @@ function ImportedCategoriesPage({route}: ImportedCategoriesPageProps) { }); } else { const duplicate = findDuplicate(columns); - if (duplicate) { - errors.duplicates = translate('spreadsheet.singleFieldMultipleColumns', duplicate); + const duplicateColumn = columnRoles.find((role) => role.value === duplicate); + if (duplicateColumn) { + errors.duplicates = translate('spreadsheet.singleFieldMultipleColumns', duplicateColumn.text); } else { errors = {}; } } return errors; - }, [requiredColumns, spreadsheet?.columns, translate]); + }, [requiredColumns, spreadsheet?.columns, translate, columnRoles]); const importCategories = useCallback(() => { setIsValidationEnabled(true); diff --git a/src/pages/workspace/rules/RulesCustomNamePage.tsx b/src/pages/workspace/rules/RulesCustomNamePage.tsx index afd8f455fee5..c32615415755 100644 --- a/src/pages/workspace/rules/RulesCustomNamePage.tsx +++ b/src/pages/workspace/rules/RulesCustomNamePage.tsx @@ -10,6 +10,7 @@ import ScreenWrapper from '@components/ScreenWrapper'; import Text from '@components/Text'; import TextInput from '@components/TextInput'; import TextLink from '@components/TextLink'; +import useAutoFocusInput from '@hooks/useAutoFocusInput'; import useLocalize from '@hooks/useLocalize'; import usePolicy from '@hooks/usePolicy'; import useThemeStyles from '@hooks/useThemeStyles'; @@ -30,7 +31,7 @@ function RulesCustomNamePage({route}: RulesCustomNamePageProps) { const {translate} = useLocalize(); const styles = useThemeStyles(); - + const {inputCallbackRef} = useAutoFocusInput(); const RULE_EXAMPLE_BULLET_POINTS = [ translate('workspace.rules.expenseReportRules.customNameEmailPhoneExample'), translate('workspace.rules.expenseReportRules.customNameStartDateExample'), @@ -95,6 +96,7 @@ function RulesCustomNamePage({route}: RulesCustomNamePageProps) { label={translate('workspace.rules.expenseReportRules.customNameInputLabel')} aria-label={translate('workspace.rules.expenseReportRules.customNameInputLabel')} maxLength={CONST.WORKSPACE_NAME_CHARACTER_LIMIT} + ref={inputCallbackRef} />