Skip to content

[Submit] Submit button with manager email prompt#87998

Open
hungvu193 wants to merge 89 commits into
Expensify:mainfrom
hungvu193:feat-87264
Open

[Submit] Submit button with manager email prompt#87998
hungvu193 wants to merge 89 commits into
Expensify:mainfrom
hungvu193:feat-87264

Conversation

@hungvu193

@hungvu193 hungvu193 commented Apr 15, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

Add a new ReportSubmitTo Popover that will be shown when a member of submit workspace try to submit an expense.

Design doc section

Fixed Issues

$ #87264
PROPOSAL: N/A

Tests

Same as QA Steps

  • Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."
Prerequisite: You're a member of a submit workspace.

Test 1: Expense view

  1. Go to submit workspace and submit an expense.
  2. Verify that a Popover appears and you're able to choose a manager to submit your expense to.
  3. Choose a manager and press confirm.
  4. Verify that you can submit your expense.
  5. Create another expense and click on it to see detail
  6. Try to submit expense from Submit header button
  7. Verify they you can choose a manager and submit expense.

Test 2: Search view

  1. Go to submit workspace
  2. Go to search (Spend) and try to submit that expense.
  3. Verify that a Popover appears and you're able to choose a manager to submit your expense to.
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
Screen.Recording.2026-05-27.at.17.19.12.mov
Android: mWeb Chrome
Screen.Recording.2026-05-27.at.17.22.55.mov
iOS: Native
Screen.Recording.2026-05-27.at.17.09.33.mov
iOS: mWeb Safari
Screen.Recording.2026-05-27.at.17.11.41.mov
MacOS: Chrome / Safari
Screen.Recording.2026-05-26.at.22.30.54.mov

@melvin-bot

melvin-bot Bot commented Apr 15, 2026

Copy link
Copy Markdown

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

  1. Look at the code and make sure there are no malicious changes.
  2. Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx ts-node ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx ts-node ./scripts/generateTranslations.ts --compare-ref main

@hungvu193

Copy link
Copy Markdown
Contributor Author

Note

Confirm to check if we also need to show popup with submit action on Search - submitMoneyRequestOnSearch

@iwiznia

iwiznia commented May 4, 2026

Copy link
Copy Markdown
Contributor

What's holding this up?

@hungvu193

Copy link
Copy Markdown
Contributor Author

Ideally we should hold it for oboarding PR since there is no way to create submit WS for now. I can resume the progress today.

@iwiznia

iwiznia commented May 5, 2026

Copy link
Copy Markdown
Contributor

since there is no way to create submit WS for now

You can create one from the oldDot pricing page

@hungvu193

Copy link
Copy Markdown
Contributor Author

I see. That's helpful 👍 currently I need to checkout onboarding existing PR to onboard on create one then switching back 😅

@hungvu193

Copy link
Copy Markdown
Contributor Author

@MelvinBot Assign yourself to this PR, merge main and revert the changes from Mobile-Expensify.

@MelvinBot MelvinBot self-assigned this May 5, 2026
@MelvinBot

Copy link
Copy Markdown
Contributor

Done! I've:

  1. Assigned myself to this PR
  2. Merged main into feat-87264 — resolved merge conflicts in src/libs/actions/IOU/ReportWorkflow.ts (kept your manager email logic, integrated with main's getSubmitToAccountID)
  3. Reverted Mobile-Expensify submodule pointer back to main's version

@MelvinBot

Copy link
Copy Markdown
Contributor

⏱️ Ran out of time before I could finish. This usually means the task was too complex or I got stuck exploring. Please try again with a more specific request or post in #melvinbot-ai.

Run details

@hungvu193

Copy link
Copy Markdown
Contributor Author

Will work on this issue this weekend, currently focusing on Gate Submit feature PR.

@iwiznia

iwiznia commented May 18, 2026

Copy link
Copy Markdown
Contributor

@hungvu193 have you picked this back up?

@hungvu193

Copy link
Copy Markdown
Contributor Author

I'm on it now.

@codecov

codecov Bot commented May 18, 2026

Copy link
Copy Markdown

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
src/CONST/index.ts 93.84% <ø> (ø)
.../MoneyRequestReportView/SelectionToolbar/index.tsx 76.59% <ø> (ø)
...chList/ListItem/ExpenseReportListItemRow/index.tsx 0.00% <ø> (ø)
...earch/SearchList/ListItem/ReportListItemHeader.tsx 91.30% <100.00%> (+0.82%) ⬆️
.../TransactionListItem/TransactionListItemNarrow.tsx 0.00% <ø> (ø)
...em/TransactionListItem/TransactionListItemWide.tsx 0.00% <ø> (ø)
src/components/TransactionItemRow/index.tsx 83.33% <100.00%> (+0.25%) ⬆️
src/hooks/useSelectionModeReportActions.ts 86.51% <100.00%> (+0.63%) ⬆️
src/libs/PersonalDetailsUtils.ts 78.57% <100.00%> (+0.31%) ⬆️
src/pages/Search/SearchPage.tsx 71.01% <100.00%> (ø)
... and 16 more
... and 45 files with indirect coverage changes

@hungvu193

Copy link
Copy Markdown
Contributor Author

@MelvinBot Can you check if ESlint comes from this PR?

@MelvinBot

Copy link
Copy Markdown
Contributor

Yes — the ESLint failure is from this PR.

All four files flagged by the ESLint check are files this PR modifies, and each exceeds its eslint-seatbelt baseline for @typescript-eslint/no-unsafe-type-assertion by exactly +1 — meaning your changes introduced one new unsafe type assertion per file:

  • src/components/Search/SearchList/ListItem/ExpenseReportListItem.tsx — 6 errors, only 5 allowed
  • src/components/Search/SearchList/ListItem/TransactionListItem/index.tsx — 5 errors, only 4 allowed
  • tests/actions/IOUTest/ReportWorkflowTest.ts — 65 errors, only 64 allowed
  • tests/unit/hooks/useSelectionModeReportActions.test.ts — exceeds baseline

Fix: remove the newly-added as <Type> assertion in each of those files (the preferred path — these are narrowing casts the linter flags as unsafe). If a cast is genuinely necessary, the seatbelt baseline would need to be regenerated locally instead. Seatbelt reports every existing assertion in a file once its count goes over baseline, which is why the lists look long — but the actual cause is just the single new assertion you added in each file.

@hungvu193

Copy link
Copy Markdown
Contributor Author

@MelvinBot review

Comment thread src/libs/Permissions.ts Outdated
Comment thread src/components/ReportSubmitToPopoverAnchor.tsx
Comment thread src/libs/actions/IOU/ReportWorkflow.ts Outdated
Comment thread src/hooks/useSearchBulkActions.ts
@hungvu193 hungvu193 requested a review from abzokhattab June 14, 2026 09:34
@hungvu193

Copy link
Copy Markdown
Contributor Author

@abzokhattab Over to you 🙇

Please ignore this case for now, it's being fixed on our BE

@hungvu193

Copy link
Copy Markdown
Contributor Author

@MelvinBot fix the Eslint

@MelvinBot

Copy link
Copy Markdown
Contributor

No code change needed — the refactor on this branch already resolved the ESLint failure.

The failing ESLint run (on commit 53e26da) had a single error:

314:9 error Dependency "selectedSubmitToMember" is too broad. Use specific properties instead: selectedSubmitToMember?.accountID rulesdir/prefer-narrow-hook-dependencies

— in src/pages/ReportSubmitToContent.tsx:314, where the handleSubmit useCallback listed the whole selectedSubmitToMember object as a dependency even though it only read ?.accountID.

Since that run, the branch was refactored (latest commit 28eb1b0 merged main and reworked the submit-to flow into src/pages/ReportSubmitToPage.tsx). The selectedSubmitToMember variable no longer exists anywhere on the branch, and the new handleSubmit hook already uses narrowed dependencies — so this specific rule violation is gone.

⚠️ The latest commit (28eb1b0) hasn't had an ESLint run complete yet, and I'm not able to run the linter in my environment to fully confirm. Please re-check the ESLint check once CI finishes on the latest commit; the prefer-narrow-hook-dependencies error above should no longer appear.

@OSBotify

Copy link
Copy Markdown
Contributor

🦜 Polyglot Parrot! 🦜

Squawk! Looks like you added some shiny new English strings. Allow me to parrot them back to you in other tongues:

View the translation diff
diff --git a/src/languages/de.ts b/src/languages/de.ts
index dcd551bb1da..febfea0f695 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -1710,8 +1710,8 @@ const translations: TranslationDeepObject<typeof en> = {
             subtitle: 'Wählen Sie ein Arbeitsbereichsmitglied aus oder geben Sie die E-Mail-Adresse der Person ein, die diese Einreichung erhalten soll.',
             emailLabel: 'E-Mail-Adresse',
             workspaceMembers: 'Workspace-Mitglieder',
-            sendExpense: 'Senden Sie Ihre Ausgabe an jede beliebige Person',
-            sendExpenseSubtitle: 'Laden Sie jede beliebige Person zu Expensify ein, indem Sie ihre E-Mail-Adresse oder Telefonnummer verwenden.',
+            sendExpense: 'Senden Sie Ihre Ausgabe an jede Person',
+            sendExpenseSubtitle: 'Laden Sie jede Person zu Expensify ein, indem Sie ihre E-Mail-Adresse oder Telefonnummer verwenden.',
         },
     },
     transactionMerge: {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 0826a8caa25..5aeae2575c1 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -1668,7 +1668,7 @@ const translations: TranslationDeepObject<typeof en> = {
             subtitle: 'Elige a un miembro del espacio de trabajo o introduce la dirección de correo electrónico de quien debería recibir este envío.',
             emailLabel: 'Dirección de correo electrónico',
             workspaceMembers: 'Miembros del espacio de trabajo',
-            sendExpense: 'Envía tu gasto a cualquier persona',
+            sendExpense: 'Envía tu gasto a cualquiera',
             sendExpenseSubtitle: 'Invita a cualquiera a Expensify usando su dirección de correo electrónico o número de teléfono.',
         },
     },
@@ -1760,7 +1760,6 @@ const translations: TranslationDeepObject<typeof en> = {
                 }
             },
             [CONST.NEXT_STEP.MESSAGE_KEY.WAITING_TO_MARK_AS_DONE]: (actor, actorType, _eta, _etaType) => {
-                // eslint-disable-next-line default-case
                 switch (actorType) {
                     case CONST.NEXT_STEP.ACTOR_TYPE.CURRENT_USER:
                         return `Esperando a que <strong>tú</strong> lo marques como listo.`;
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index dd1e9ca169a..8817a764385 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -1,6 +1,7 @@
 /**
  *   _____                      __         __
  *  / ___/__ ___  ___ _______ _/ /____ ___/ /
+ * / (_ / -_) _ \/ -_) __/ _ \`/ __/ -_) _  /
  * \___/\__/_//_/\__/_/  \_,_/\__/\__/\_,_/
  *
  * This file was automatically generated. Please consider these alternatives before manually editing it:
@@ -862,7 +863,7 @@ const translations: TranslationDeepObject<typeof en> = {
         beginningOfChatHistory: (users: string) => `Cette discussion est avec ${users}.`,
         beginningOfChatHistoryPolicyExpenseChat: (workspaceName: string, submitterDisplayName: string) =>
             `C’est ici que <strong>${submitterDisplayName}</strong> soumettra des dépenses à <strong>${workspaceName}</strong>. Utilisez simplement le bouton +.`,
-        beginningOfChatHistoryPolicyExpenseChatTrack: 'C\u2019est ici que vous suivrez vos dépenses',
+        beginningOfChatHistoryPolicyExpenseChatTrack: 'C’est ici que vous suivrez vos dépenses',
         beginningOfChatHistorySelfDM: 'Ceci est votre espace personnel. Utilisez-le pour vos notes, tâches, brouillons et rappels.',
         beginningOfChatHistorySystemDM: 'Bienvenue ! Procédons à la configuration.',
         chatWithAccountManager: 'Discutez avec votre gestionnaire de compte ici',
@@ -1712,7 +1713,7 @@ const translations: TranslationDeepObject<typeof en> = {
         bulkDuplicateLimit: `Vous pouvez dupliquer jusqu’à ${CONST.SEARCH.BULK_DUPLICATE_LIMIT} dépenses à la fois. Veuillez sélectionner moins de dépenses et réessayer.`,
         deleted: 'Supprimé',
         submitReportTo: {
-            subtitle: 'Choisissez un membre de l’espace de travail ou saisissez une adresse e-mail de la personne qui doit recevoir cette soumission.',
+            subtitle: 'Choisissez un membre de l’espace de travail ou saisissez l’adresse e-mail de la personne qui doit recevoir cette soumission.',
             emailLabel: 'Adresse e-mail',
             workspaceMembers: 'Membres de l’espace de travail',
             sendExpense: 'Envoyez votre dépense à n’importe qui',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 0e738b2fe8e..a67d044a5c6 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -1705,9 +1705,9 @@ const translations: TranslationDeepObject<typeof en> = {
         bulkDuplicateLimit: `Puoi duplicare fino a ${CONST.SEARCH.BULK_DUPLICATE_LIMIT} spese alla volta. Seleziona meno spese e riprova.`,
         deleted: 'Eliminato',
         submitReportTo: {
-            subtitle: 'Scegli un membro dello spazio di lavoro o inserisci l’indirizzo email di chi deve ricevere questa richiesta.',
+            subtitle: 'Scegli un membro dello spazio di lavoro o inserisci l’indirizzo email della persona che dovrebbe ricevere questa richiesta.',
             emailLabel: 'Indirizzo email',
-            workspaceMembers: 'Membri dell’area di lavoro',
+            workspaceMembers: 'Membri dello spazio di lavoro',
             sendExpense: 'Invia la tua spesa a chiunque',
             sendExpenseSubtitle: 'Invita chiunque su Expensify usando il suo indirizzo email o numero di telefono.',
         },
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index d4bf64673fd..9e97db747fa 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -1688,7 +1688,7 @@ const translations: TranslationDeepObject<typeof en> = {
         bulkDuplicateLimit: `一度に複製できる経費は最大で ${CONST.SEARCH.BULK_DUPLICATE_LIMIT} 件です。経費の数を減らして、もう一度お試しください。`,
         deleted: '削除済み',
         submitReportTo: {
-            subtitle: 'この申請の受信者として、ワークスペースメンバーを選択するか、メールアドレスを入力してください。',
+            subtitle: 'この申請を受け取る対象として、ワークスペースメンバーを選択するか、メールアドレスを入力してください。',
             emailLabel: 'メールアドレス',
             workspaceMembers: 'ワークスペースメンバー',
             sendExpense: '経費を誰にでも送信できます',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 191a57c0cd6..739f8848028 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -1700,9 +1700,9 @@ const translations: TranslationDeepObject<typeof en> = {
         bulkDuplicateLimit: `Je kunt maximaal ${CONST.SEARCH.BULK_DUPLICATE_LIMIT} uitgaven tegelijk dupliceren. Selecteer minder uitgaven en probeer het opnieuw.`,
         deleted: 'Verwijderd',
         submitReportTo: {
-            subtitle: 'Kies een werkruimtelid of voer het e-mailadres in van degene die deze inzending moet ontvangen.',
+            subtitle: 'Kies een werkruimte-lid of voer het e-mailadres in van degene die deze inzending moet ontvangen.',
             emailLabel: 'E-mailadres',
-            workspaceMembers: 'Werkruimteleden',
+            workspaceMembers: 'Werkruimtelede',
             sendExpense: 'Stuur je uitgave naar iedereen',
             sendExpenseSubtitle: 'Nodig iedereen uit voor Expensify met hun e-mailadres of telefoonnummer.',
         },
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 1775d62dced..2c08f55a09e 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -1704,8 +1704,8 @@ const translations: TranslationDeepObject<typeof en> = {
             subtitle: 'Wybierz członka przestrzeni roboczej lub wpisz adres e‑mail osoby, która powinna otrzymać to zgłoszenie.',
             emailLabel: 'Adres e-mail',
             workspaceMembers: 'Członkowie przestrzeni roboczej',
-            sendExpense: 'Wyślij swój wydatek do dowolnej osoby',
-            sendExpenseSubtitle: 'Zaproś dowolną osobę do Expensify, używając jej adresu e-mail lub numeru telefonu.',
+            sendExpense: 'Wyślij swój wydatek do kogokolwiek',
+            sendExpenseSubtitle: 'Zaproś dowolną osobę do Expensify, używając jej adresu e‑mail lub numeru telefonu.',
         },
     },
     transactionMerge: {
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index bcd21960eb4..2705397cfa0 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -1698,11 +1698,11 @@ const translations: TranslationDeepObject<typeof en> = {
         bulkDuplicateLimit: `Você pode duplicar até ${CONST.SEARCH.BULK_DUPLICATE_LIMIT} despesas por vez. Selecione menos despesas e tente novamente.`,
         deleted: 'Excluído',
         submitReportTo: {
-            subtitle: 'Escolha um membro do espaço de trabalho ou digite o e-mail de quem deve receber este envio.',
+            subtitle: 'Escolha um membro do workspace ou insira o endereço de e-mail de quem deve receber este envio.',
             emailLabel: 'Endereço de e-mail',
             workspaceMembers: 'Membros do workspace',
             sendExpense: 'Envie sua despesa para qualquer pessoa',
-            sendExpenseSubtitle: 'Convide qualquer pessoa para o Expensify usando o endereço de e-mail ou número de telefone.',
+            sendExpenseSubtitle: 'Convide qualquer pessoa para o Expensify usando o endereço de e-mail ou o número de telefone.',
         },
     },
     transactionMerge: {
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index d97a93d85ba..4dfd9e7997e 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -1649,11 +1649,11 @@ const translations: TranslationDeepObject<typeof en> = {
         bulkDuplicateLimit: `您一次最多可以复制 ${CONST.SEARCH.BULK_DUPLICATE_LIMIT} 笔报销。请减少选择的报销数量后重试。`,
         deleted: '已删除',
         submitReportTo: {
-            subtitle: '选择一个工作区成员,或输入应接收此提交的收件人邮箱地址。',
+            subtitle: '选择一个工作区成员,或输入应接收此提交的电子邮箱地址。',
             emailLabel: '电子邮箱地址',
             workspaceMembers: '工作区成员',
             sendExpense: '将你的报销发送给任何人',
-            sendExpenseSubtitle: '使用电子邮箱地址或电话号码邀请任何人加入 Expensify。',
+            sendExpenseSubtitle: '使用对方的邮箱地址或电话号码邀请任何人加入 Expensify。',
         },
     },
     transactionMerge: {

Note

You can apply these changes to your branch by copying the patch to your clipboard, then running pbpaste | git apply 😉

View workflow run

@abzokhattab

Copy link
Copy Markdown
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified there are no new alerts related to the canBeMissing param for useOnyx
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp
Android: mWeb Chrome
iOS: HybridApp
Screen.Recording.2026-06-16.at.19.56.49.mov
Screen.Recording.2026-06-16.at.19.54.47.mov
iOS: mWeb Safari
Screen.Recording.2026-06-16.at.20.03.38.mov
MacOS: Chrome / Safari
Screen.Recording.2026-06-16.at.18.43.56.mov
Screen.Recording.2026-06-16.at.18.44.38.mov

@abzokhattab abzokhattab left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great work... LGTM 🚀🚀

@melvin-bot melvin-bot Bot requested review from carlosmiceli and iwiznia June 16, 2026 18:06
@abzokhattab

Copy link
Copy Markdown
Contributor

Let's just fix the failing pipeline @hungvu193

@abzokhattab

Copy link
Copy Markdown
Contributor

I just have one small question to clarify:

The current member is selected by default when opening the submit list ... is that expected?

@hungvu193

Copy link
Copy Markdown
Contributor Author

@MelvinBot Help me fix the eslint

…accountID

Co-authored-by: Hans Vu <hungvu193@users.noreply.github.com>
@MelvinBot

Copy link
Copy Markdown
Contributor

Fixed the failing ESLint check.

The rulesdir/prefer-narrow-hook-dependencies rule flagged the useCallback dependency on line 314 of src/pages/ReportSubmitToContent.tsx as too broad. Inside the callback, selectedSubmitToMember is only ever read as selectedSubmitToMember?.accountID (and its truthiness is already covered separately by hasSelectedSubmitToMember), so I narrowed the dependency to selectedSubmitToMember?.accountID — exactly as the rule prescribed.

         hasSelectedSubmitToMember,
-        selectedSubmitToMember,
+        selectedSubmitToMember?.accountID,
         managerEmail,

@MelvinBot

Copy link
Copy Markdown
Contributor

⏱️ Ran out of time before I could finish. This usually means the task was too complex or I got stuck exploring. Please try again with a more specific request or post in #melvinbot-ai.

Run details

@hungvu193

Copy link
Copy Markdown
Contributor Author

@MelvinBot Resolve the conflicts please.

@MelvinBot

Copy link
Copy Markdown
Contributor

🤖 I attempted to merge the latest main into this branch, but I'm not auto-resolving the conflicts because several involve overlapping logic/architectural changes where an incorrect resolution could silently break either your feature or recent main changes. Per our merge-safety policy, I'm flagging these for you to resolve manually.

10 files conflict. They split into two groups:

🟢 Mechanical (safe — additive import/case/route unions):

  • SubmitActionButton.tsx — both sides added imports from ReportUtils/TransactionUtils; union them (keep your Navigation, isSubmitPolicy, canSubmitAndIsAwaitingForCurrentUser and main's shouldShowMarkAsDone, hasOnlyPendingCardTransactions, showPendingCardTransactionsBlockModal).
  • useLifecycleActions.tsx, useSelectionModeReportActions.ts — keep both your ROUTES import and main's added import.
  • ReportWorkflow.ts — keep your managerID/approval-chain block (main is empty there).
  • ROUTES.ts (first hunk) — keep your new REPORT_SUBMIT_TO + REPORT_SETTINGS_REPORT_LAYOUT route entries.
  • WorkspaceUpgradePage.tsx — union the switch cases (keep your approveReport case and main's expensifyCard/payments/accounting/travelSubmit/invoicing cases).
  • Navigation/types.ts, PolicyUtils.ts, withReportOrNotFound.tsx — small, likely union/keep-both.

🔴 Needs your judgment (overlapping logic — I won't guess):

  • ROUTES.tsWORKSPACE_UPGRADE.getRouteyou added a 4th reportID? param; main added a 4th upgradePlanType? param. Both can't be the 4th argument. You need to pick a combined signature (e.g. (policyID?, featureName?, backTo?, upgradePlanType?, reportID?)) and update every caller of ROUTES.WORKSPACE_UPGRADE.getRoute accordingly.
  • RightModalNavigator.tsx — a ~270-line dual rewrite of the navigator's JSX. Your branch wraps it in MultifactorAuthenticationContextProviders and registers the new REPORT_SUBMIT_TO screen; main restructured the same tree. This needs a hand-merge that preserves both.

To redo the merge locally:

git checkout feat-87264
git fetch origin main
git merge origin/main
# resolve the 10 files, then:
git commit && git push

I left your branch untouched (no partial merge pushed). Once you've resolved the two 🔴 files I'm happy to take another pass at validating — just re-tag me.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants