[No QA][HR Import] Final approver page#91297
Merged
grgia merged 5 commits intoMay 21, 2026
Merged
Conversation
|
Hey, I noticed you changed If you want to automatically generate translations for other locales, an Expensify employee will have to:
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 --helpTypically, you'd want to translate only what you changed by running |
Contributor
Author
|
@grgia @cristipaval can I have polyglot parrot triggered here please ? |
Codecov Report❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.
|
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 diffdiff --git a/src/languages/de.ts b/src/languages/de.ts
index df51590b..d06de533 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -7154,7 +7154,7 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
connectionDescription: (providerName: string) => `Verbinden Sie ${providerName}, um Mitarbeitergenehmigungen mit Ihrem Workspace zu synchronisieren.`,
approvalMode: 'Genehmigungsmodus',
finalApprover: 'Endgültige:r Genehmiger:in',
- providerFinalApprover: (providerName: string) => `${providerName} endgültige:r Genehmiger:in`,
+ providerFinalApprover: (providerName: string) => `${providerName} Endgenehmigende*r`,
notSet: 'Nicht festgelegt',
approvalModeDescription: (providerName: string) => `Mitglieder und Manager sind für die Synchronisation mit ${providerName} eingerichtet.`,
approvalModeWarningTitle: 'Genehmigungsmodus ändern?',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 82a6b681..b25378ba 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -6269,7 +6269,7 @@ ${amount} para ${merchant} - ${date}`,
connectionDescription: (providerName: string) => `Conecta ${providerName} para mantener sincronizadas las aprobaciones de empleados con tu espacio de trabajo.`,
approvalMode: 'Modo de aprobación',
finalApprover: 'Aprobador final',
- providerFinalApprover: (providerName: string) => `Aprobador final de ${providerName}`,
+ providerFinalApprover: (providerName: string) => `aprobador final de ${providerName}`,
notSet: 'No configurado',
approvalModeDescription: (providerName: string) => `Los miembros y gerentes están configurados para sincronizarse con ${providerName}.`,
approvalModeWarningTitle: '¿Cambiar modo de aprobación?',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 7a6c21a7..967df754 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -7141,7 +7141,7 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
connectionDescription: (providerName: string) => `Collega ${providerName} per mantenere sincronizzate le approvazioni dei dipendenti con il tuo spazio di lavoro.`,
approvalMode: 'Modalità di approvazione',
finalApprover: 'Approvatore finale',
- providerFinalApprover: (providerName: string) => `Approvatore finale di ${providerName}`,
+ providerFinalApprover: (providerName: string) => `approvatore finale ${providerName}`,
notSet: 'Non impostato',
approvalModeDescription: (providerName: string) => `I membri e i responsabili sono configurati per la sincronizzazione con ${providerName}.`,
approvalModeWarningTitle: 'Cambiare modalità di approvazione?',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 50251644..9ed7a093 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -7060,7 +7060,7 @@ ${reportName}
connectionDescription: (providerName: string) => `${providerName}を接続して、従業員の承認をワークスペースと同期させましょう。`,
approvalMode: '承認モード',
finalApprover: '最終承認者',
- providerFinalApprover: (providerName: string) => `${providerName}の最終承認者`,
+ providerFinalApprover: (providerName: string) => `${providerName} 最終承認者`,
notSet: '未設定',
approvalModeDescription: (providerName: string) => `メンバーとマネージャーは ${providerName} と同期するように設定されています。`,
approvalModeWarningTitle: '承認モードを変更しますか？',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 6cb77fa2..58090079 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -7116,7 +7116,7 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
connectionDescription: (providerName: string) => `Verbind ${providerName} om goedkeuringen van werknemers gesynchroniseerd te houden met je werkruimte.`,
approvalMode: 'Goedkeuringsmodus',
finalApprover: 'Eindgoedkeurder',
- providerFinalApprover: (providerName: string) => `${providerName} eindgoedkeurder`,
+ providerFinalApprover: (providerName: string) => `Laatste ${providerName}-fiatteur`,
notSet: 'Niet ingesteld',
approvalModeDescription: (providerName: string) => `Leden en managers zijn ingesteld om te synchroniseren met ${providerName}.`,
approvalModeWarningTitle: 'Goedkeuringsmodus wijzigen?',
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 94347b63..6ac6c605 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -7111,7 +7111,7 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
connectionDescription: (providerName: string) => `Połącz ${providerName}, aby synchronizować akceptacje pracowników z Twoim miejscem pracy.`,
approvalMode: 'Tryb zatwierdzania',
finalApprover: 'Ostateczny zatwierdzający',
- providerFinalApprover: (providerName: string) => `Ostateczny zatwierdzający ${providerName}`,
+ providerFinalApprover: (providerName: string) => `Ostateczny akceptujący ${providerName}`,
notSet: 'Nie ustawiono',
approvalModeDescription: (providerName: string) => `Członkowie i menedżerowie są skonfigurowani do synchronizacji z ${providerName}.`,
approvalModeWarningTitle: 'Zmienić tryb zatwierdzania?',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 5634690d..bbb0b7a8 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -7116,7 +7116,7 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
connectionDescription: (providerName: string) => `Conecte ${providerName} para manter as aprovações de funcionários sincronizadas com seu workspace.`,
approvalMode: 'Modo de aprovação',
finalApprover: 'Aprovador final',
- providerFinalApprover: (providerName: string) => `Aprovador final de ${providerName}`,
+ providerFinalApprover: (providerName: string) => `aprovador final de ${providerName}`,
notSet: 'Não definido',
approvalModeDescription: (providerName: string) => `Membros e gerentes estão configurados para sincronizar com ${providerName}.`,
approvalModeWarningTitle: 'Alterar modo de aprovação?',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 0d1f75eb..725b24a7 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -6933,7 +6933,7 @@ ${reportName}
connectionDescription: (providerName: string) => `连接 ${providerName}，以在您的工作区中同步员工审批。`,
approvalMode: '审批模式',
finalApprover: '最终审批人',
- providerFinalApprover: (providerName: string) => `${providerName}最终审批人`,
+ providerFinalApprover: (providerName: string) => `${providerName} 最终审批人`,
notSet: '未设置',
approvalModeDescription: (providerName: string) => `成员和管理员已设置为与 ${providerName} 同步。`,
approvalModeWarningTitle: '更改审批模式？',
Note You can apply these changes to your branch by copying the patch to your clipboard, then running |
melvin-bot
Bot
requested review from
bernhardoj and
heyjennahay
and removed request for
a team
|
@bernhardoj Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button] |
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: cba2d405f2
ℹ️ About Codex in GitHub
Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".
| beta: CONST.BETAS.MERGE_HR, | ||
| isConnected: isMergeHRConnected, | ||
| getCurrentFinalApprover: (policy) => policy?.connections?.merge_hris?.config?.finalApprover ?? null, | ||
| getProviderName: (policy) => getConnectedHRProvider(policy)?.displayName ?? CONST.POLICY.CONNECTIONS.NAME_USER_FRIENDLY.merge_hris, |
There was a problem hiding this comment.
Using getConnectedHRProvider(policy) here can return Gusto or Zenefits because that helper picks the first connected HR integration, so when a workspace has multiple HR connections the Merge final-approver page can render the wrong header label (for example, showing a Gusto title on the Merge route). This page should derive its provider name from the Merge connection itself (e.g., policy.connections.merge_hris.config.integration) so the title always matches the active Merge provider.
Useful? React with 👍 / 👎.
Contributor
There was a problem hiding this comment.
a user should only have one HR integration connected
Contributor
There was a problem hiding this comment.
wondering about the case when a policy deletes one connection and adds a second, do we have both objects
Contributor
|
🚧 @grgia has triggered a test Expensify/App build. You can view the workflow run here. |
This comment has been minimized.
This comment has been minimized.
Contributor
Contributor
Author
Yup, they're separate PRs |
Contributor
|
I think we want to show the error for the final approver too, similar to the approval mode App/src/pages/workspace/hr/HRProviderCard.tsx Lines 147 to 148 in 126ce0e |
Contributor
|
@jmusial the locked workspace flows still let's me click through settings Screen.Recording.2026-05-21.at.3.24.19.PM.mov |
grgia
reviewed
May 21, 2026
| <OfflineWithFeedback pendingAction={card.config?.pendingFields?.finalApprover}> | ||
| <OfflineWithFeedback | ||
| pendingAction={card.config?.pendingFields?.finalApprover} | ||
| errors={card.config?.errorFields?.approvalMode} |
Contributor
There was a problem hiding this comment.
should the error be .finalApprover too
Contributor
Author
Which approval mode do you have set? If it's |
Contributor
|
It was set to nothing |
grgia
approved these changes
May 21, 2026
Contributor
Reviewer Checklist
Screenshots/VideosAndroid: HybridAppandroid.mp4Android: mWeb Chromeandroid.mweb.mp4iOS: HybridAppios.mp4iOS: mWeb Safariios.mweb.mp4MacOS: Chrome / Safariweb.mp4 |
bernhardoj
approved these changes
May 21, 2026
grgia
approved these changes
May 21, 2026
Contributor
|
🚧 @grgia has triggered a test Expensify/App build. You can view the workflow run here. |
Contributor
|
🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
|
Contributor
|
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
Contributor
|
🚀 Deployed to staging by https://github.com/grgia in version: 9.3.79-1 🚀
Bundle Size Analysis (Sentry): |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Explanation of Change
This PR adds
MergeHRFinalApproverPageto the Merge dev flows. It also unifiesGustosandMergeApproval Mode pages.
Fixed Issues
$ #90603
PROPOSAL:
Tests
Pre requisites:
mergeHRConnectionsflag onSteps:
Offline tests
Same as tests
QA Steps
N/A
PR Author Checklist
### Fixed Issuessection aboveTestssectionOffline stepssectionQA stepssectiontoggleReportand notonIconClick)src/languages/*files and using the translation methodSTYLE.md) were followedAvatar, I verified the components usingAvatarare working as expected)StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))npm run compress-svg)Avataris modified, I verified thatAvataris working as expected in all cases)Designlabel and/or tagged@Expensify/designso the design team can review the changes.ScrollViewcomponent to make it scrollable when more elements are added to the page.mainbranch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTeststeps.Screenshots/Videos
Android: Native
Screen.Recording.2026-05-21.at.13.16.53.mov
MacOS: Chrome / Safari
Screen.Recording.2026-05-21.at.13.13.37.mov