Skip to content

[NoQA] [HR Import] Initial sync modal, sync action and info on Members page#91315

Merged
grgia merged 22 commits into
Expensify:mainfrom
software-mansion-labs:merge-hr/sync
May 22, 2026
Merged

[NoQA] [HR Import] Initial sync modal, sync action and info on Members page#91315
grgia merged 22 commits into
Expensify:mainfrom
software-mansion-labs:merge-hr/sync

Conversation

@mhawryluk
Copy link
Copy Markdown
Contributor

@mhawryluk mhawryluk commented May 21, 2026

Explanation of Change

Adds support for some of the employee syncing features for Merge HR integrations: the initial sync info modal, as well as the Members page link to HR, syncing spinner and sync action in the menu. Adjusts the data structures for Merge HR syncing info to match the backend.

Fixed Issues

$ #91273
PROPOSAL: N/A

Tests

Prerequisites: Enable the mergeHRConnections beta.

  1. Connect a Merge HR provider.
  2. Check if after connecting, when the backend schedules the first synchronization an info modal shows up.
  3. Verify the modal shows up just once, doesn't reappear when switching tabs/screens and coming back (reappearing after clearing cache/logging out is acceptable).
  4. Verify there is a "Synchronizing employees" text below the name of the connection when it is syncing.
  5. Verify there is a spinner in place of the three dot menu when the sync is in progress.
  6. Verify the "approval mode" and "final approver" items and the "Other" section don't show up during the initial sync.

  1. Open a workspace that has a Merge HR provider connected.
  2. Go to the Members tab.
  3. There should be a link to the HR page (Configure sync.).
  4. If the sync is in progress there should be a spinner next to the link.
  5. Click More.
  6. There should be a Sync with item, which schedules the synchronization. (Disabled when sync is in progress).

Offline tests

QA Steps

  1. Enable the gustoNewDot beta.
  2. Open a workspace with HR enabled and connect Gusto.
  3. Verify the initial sync works the same as before.
  4. Go to Members.
  5. Verify More > Sync with Gusto works as before.
  6. Verify the "Configure Gusto sync." link and spinner work the same as before.

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
Android: mWeb Chrome
iOS: Native
Simulator.Screen.Recording.-.iPhone.17.Pro.-.2026-05-22.at.15.29.35.mov
iOS: mWeb Safari
MacOS: Chrome / Safari
Nagranie.z.ekranu.2026-05-22.o.12.56.57-kopia.mov

@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented May 21, 2026

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

@mhawryluk mhawryluk changed the title [NoQA] [HR Import] Sync now, initial sync modal [NoQA] [HR Import] Initial sync modal, sync action and info on Members page May 21, 2026
@grgia grgia requested review from bernhardoj, cristipaval and grgia May 21, 2026 15:55
@OSBotify

This comment has been minimized.

@@ -633,16 +634,18 @@ function WorkspaceMembersPage({personalDetails, route, policy}: WorkspaceMembers
<View style={[styles.pl5, styles.mb5, styles.mt3, styles.flexRow, styles.alignItemsCenter]}>
<Text style={[styles.textSupporting, styles.flexShrink1, isPendingAddOrDelete && styles.offlineFeedbackPending]}>
{translate('workspace.people.workspaceMembersCount', memberCount)}
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.

@mhawryluk do we hide the three dot modal during initial sync?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

no, there's a spinner in its place

Copy link
Copy Markdown
Contributor

@grgia grgia left a comment

Choose a reason for hiding this comment

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

btw, cristi is updating this object on the policy.connection.XXX to include additional syncing data

type ConnectionLastSync = {
/** Date when the connection's last successful sync occurred */
successfulDate?: string;
/** Date when the connection's last failed sync occurred */
errorDate?: string;
/** Error message when the connection's last sync failed */
errorMessage?: string;
/** If the connection's last sync failed due to authentication error */
isAuthenticationError: boolean;
/** Whether the connection's last sync was successful */
isSuccessful: boolean;
/** Where did the connection's last sync job come from */
source: JobSourceValues;
/**
* Sometimes we'll have a connection that is not connected, but the connection object is still present, so we can
* show an error message
*/
isConnected?: boolean;
};

@codecov
Copy link
Copy Markdown

codecov Bot commented May 21, 2026

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.

Files with missing lines Coverage Δ
src/CONST/index.ts 93.89% <ø> (ø)
src/ONYXKEYS.ts 100.00% <ø> (ø)
src/libs/PolicyUtils.ts 70.86% <ø> (-0.11%) ⬇️
src/pages/workspace/hr/utils.ts 98.55% <100.00%> (+0.21%) ⬆️
src/pages/workspace/hr/WorkspaceHRPage.tsx 0.00% <0.00%> (ø)
src/libs/actions/connections/index.ts 25.22% <0.00%> (-0.47%) ⬇️
src/pages/workspace/hr/HRProviderCard.tsx 0.00% <0.00%> (ø)
src/pages/workspace/WorkspaceMembersPage.tsx 63.29% <41.66%> (-0.40%) ⬇️
src/libs/actions/connections/MergeHR.ts 12.90% <0.00%> (-3.77%) ⬇️
src/hooks/useMergeHRInitialSyncingModal.ts 0.00% <0.00%> (ø)
... and 176 files with indirect coverage changes

Comment thread src/types/onyx/Policy.ts Outdated
result?: GustoSyncResult;

/** Whether this is the initial sync after the connection was established */
isInitialSync?: boolean;
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.

instead of a boolean, we'll have an enum named syncType which will have 'initial' value

Copy link
Copy Markdown
Contributor

@grgia grgia left a comment

Choose a reason for hiding this comment

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

here ya go

Comment thread src/CONST/index.ts
CUSTOM: 'custom',
},
SYNC_TYPE: {
INITIAL: 'initial',
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.

SYNC_STATUS: "SYNCING" | "DONE" | "FAILED" | "DISABLED";

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.

SYNC_TYPE: "initial" | "manual" | "auto" | "webhook";

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.

So the loading state is

First sync:

{
...
syncStatus: 'SYNCING',
syncType: 'initial'
}

When done:

{
...
successfulDate: `<idk some date format off top of head>`
syncStatus: 'DONE' | 'FAILED' | 'DISABLED',
syncType: 'initial'

}

We only care about initial vs not initial for now, so we can ignore the other syncTypes for the time status


if (hasGustoConnection) {
const hrProvider = getConnectedHRProvider(policy);
if (hrProvider) {
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.

We already have connectedHRProvider defined above, so let's reuse that.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

when I put connectedHRProvider in the dependency array there is an error saying that react-compiler cannot preserve the memoization, so I would leave it for now

@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 7c522774..ebe0ec73 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -6093,7 +6093,7 @@ _Für ausführlichere Anweisungen [besuchen Sie unsere Hilfeseite](${CONST.NETSU
             approvers: 'Genehmigende',
             auditors: 'Prüfer',
             emptyRoleFilter: {title: 'Keine Mitglieder entsprechen diesem Filter', subtitle: 'Laden Sie ein Mitglied ein oder ändern Sie den Filter oben.'},
-            configureHRSync: (providerName: string) => `Synchronisierung mit ${providerName} einrichten.`,
+            configureHRSync: (providerName: string) => `${providerName}-Synchronisierung konfigurieren.`,
             syncWithHR: (providerName: string) => `Mit ${providerName} synchronisieren`,
         },
         card: {
@@ -7177,15 +7177,15 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
                     case 'gustoSyncLoadData':
                         return 'Daten werden von Gusto geladen';
                     case 'gustoSyncProvisioning':
-                        return 'Mitarbeiterbereitstellung in Richtlinie';
+                        return 'Mitarbeitende in der Richtlinie bereitstellen';
                     case 'zenefitsSyncTitle':
                         return 'TriNet-Mitarbeitende werden synchronisiert';
                     case 'zenefitsSyncLoadData':
-                        return 'Lade Daten von TriNet';
+                        return 'Daten werden von TriNet geladen';
                     case 'zenefitsSyncProvisioning':
-                        return 'Mitarbeiterbereitstellung in Richtlinie';
+                        return 'Mitarbeitende in der Richtlinie bereitstellen';
                     case 'jobDone':
-                        return 'Warten auf das Laden der importierten Daten';
+                        return 'Warten, bis importierte Daten geladen sind';
                     default: {
                         return `Übersetzung fehlt für Stufe: ${stage}`;
                     }
@@ -7210,6 +7210,7 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
             },
             syncingModalTitle: 'Ihre Verbindung wird synchronisiert',
             syncingModalDescription: 'Die erste Verbindung kann einige Zeit dauern. Sie werden über alle Fehler benachrichtigt.',
+            syncing: 'Mitarbeitende werden synchronisiert',
         },
     },
     getAssistancePage: {
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 95f43143..5c870bca 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -6285,10 +6285,10 @@ ${amount} para ${merchant} - ${date}`,
                 },
                 custom: {label: 'Aprobación personalizada', description: 'Configuraré manualmente los flujos de aprobación en Expensify.'},
             },
-            syncStageName: ({stage}) => {
+            syncStageName: ({stage}: SyncStageNameConnectionsParams) => {
                 switch (stage) {
                     case 'gustoSyncTitle':
-                        return 'Sincronizar empleados de Gusto';
+                        return 'Sincronizando empleados de Gusto';
                     case 'gustoSyncLoadData':
                         return 'Cargando datos desde Gusto';
                     case 'gustoSyncProvisioning':
@@ -6302,7 +6302,7 @@ ${amount} para ${merchant} - ${date}`,
                     case 'jobDone':
                         return 'Esperando a que se carguen los datos importados';
                     default: {
-                        return `Falta la traducción para la etapa: ${stage}`;
+                        return `Falta traducción para la etapa: ${stage}`;
                     }
                 }
             },
@@ -6325,6 +6325,7 @@ ${amount} para ${merchant} - ${date}`,
             },
             syncingModalTitle: 'Tu conexión se está sincronizando',
             syncingModalDescription: 'La primera conexión puede tardar un poco. Se te notificará de cualquier error.',
+            syncing: 'Sincronizando empleados',
         },
         export: {
             notReadyHeading: 'No está listo para exportar',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 2ce170a9..bc476b2b 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -7206,17 +7206,17 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
                     case 'gustoSyncLoadData':
                         return 'Chargement des données depuis Gusto';
                     case 'gustoSyncProvisioning':
-                        return 'Affectation des employés à la politique';
+                        return 'Provisionnement des employés dans la politique';
                     case 'zenefitsSyncTitle':
                         return 'Synchronisation des employés TriNet';
                     case 'zenefitsSyncLoadData':
                         return 'Chargement des données depuis TriNet';
                     case 'zenefitsSyncProvisioning':
-                        return 'Affectation des employés à la politique';
+                        return 'Provisionnement des employés dans la politique';
                     case 'jobDone':
                         return 'En attente du chargement des données importées';
                     default: {
-                        return `Traduction manquante pour l'étape : ${stage}`;
+                        return `Traduction manquante pour l’étape : ${stage}`;
                     }
                 }
             },
@@ -7238,7 +7238,8 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
                 title: 'TriNet',
             },
             syncingModalTitle: 'Votre connexion est en cours de synchronisation',
-            syncingModalDescription: 'La première connexion peut prendre un certain temps. Vous serez informé de toute erreur.',
+            syncingModalDescription: 'La première connexion peut prendre un certain temps. Vous serez averti(e) en cas d’erreur.',
+            syncing: 'Synchronisation des employés',
         },
     },
     getAssistancePage: {
diff --git a/src/languages/it.ts b/src/languages/it.ts
index 4047098b..db12436d 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -6082,7 +6082,7 @@ _Per istruzioni più dettagliate, [visita il nostro sito di assistenza](${CONST.
             approvers: 'Approvatori',
             auditors: 'Revisori',
             emptyRoleFilter: {title: 'Nessun membro corrisponde a questo filtro', subtitle: 'Invita un membro o modifica il filtro qui sopra.'},
-            configureHRSync: (providerName: string) => `Configura la sincronizzazione di ${providerName}.`,
+            configureHRSync: (providerName: string) => `Configura la sincronizzazione con ${providerName}.`,
             syncWithHR: (providerName: string) => `Sincronizza con ${providerName}`,
         },
         card: {
@@ -7160,13 +7160,13 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
             syncStageName: ({stage}: SyncStageNameConnectionsParams) => {
                 switch (stage) {
                     case 'gustoSyncTitle':
-                        return 'Sincronizzazione dei dipendenti Gusto';
+                        return 'Sincronizzazione dipendenti Gusto';
                     case 'gustoSyncLoadData':
-                        return 'Caricamento dei dati da Gusto';
+                        return 'Caricamento dati da Gusto';
                     case 'gustoSyncProvisioning':
                         return 'Provisioning dei dipendenti nella policy';
                     case 'zenefitsSyncTitle':
-                        return 'Sincronizzazione dipendenti TriNet';
+                        return 'Sincronizzazione dei dipendenti TriNet';
                     case 'zenefitsSyncLoadData':
                         return 'Caricamento dei dati da TriNet';
                     case 'zenefitsSyncProvisioning':
@@ -7196,7 +7196,8 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
                 title: 'TriNet',
             },
             syncingModalTitle: 'La tua connessione è in sincronizzazione',
-            syncingModalDescription: "La prima connessione può richiedere un po' di tempo. Ti verrà notificato qualsiasi errore.",
+            syncingModalDescription: "La prima connessione può richiedere un po' di tempo. Ti avviseremo in caso di errori.",
+            syncing: 'Sincronizzazione dipendenti',
         },
     },
     getAssistancePage: {
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index c3f09613..e4e3368f 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -7081,19 +7081,19 @@ ${reportName}
                     case 'gustoSyncTitle':
                         return 'Gusto 従業員を同期中';
                     case 'gustoSyncLoadData':
-                        return 'Gusto からデータを読み込んでいます';
+                        return 'Gusto からデータを読み込み中です';
                     case 'gustoSyncProvisioning':
-                        return 'ポリシー内で従業員をプロビジョニングする';
+                        return 'ポリシー内で従業員をプロビジョニング';
                     case 'zenefitsSyncTitle':
-                        return 'TriNet 従業員を同期しています';
+                        return 'TriNet 従業員を同期中';
                     case 'zenefitsSyncLoadData':
                         return 'TriNet からデータを読み込んでいます';
                     case 'zenefitsSyncProvisioning':
-                        return 'ポリシー内で従業員をプロビジョニングする';
+                        return 'ポリシー内で従業員をプロビジョニング';
                     case 'jobDone':
                         return 'インポートしたデータの読み込みを待機しています';
                     default: {
-                        return `ステージ「${stage}」の翻訳が見つかりません`;
+                        return `ステージの翻訳が見つかりません: ${stage}`;
                     }
                 }
             },
@@ -7116,6 +7116,7 @@ ${reportName}
             },
             syncingModalTitle: '接続を同期しています',
             syncingModalDescription: '最初の接続には時間がかかる場合があります。エラーが発生した場合は通知されます。',
+            syncing: '従業員を同期しています',
         },
     },
     getAssistancePage: {
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index 2601159d..07b7807d 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -6061,7 +6061,7 @@ _Voor meer gedetailleerde instructies, [bezoek onze help-site](${CONST.NETSUITE_
             approvers: 'Fiatteurs',
             auditors: 'Accountants',
             emptyRoleFilter: {title: 'Geen leden komen overeen met dit filter', subtitle: 'Nodig een lid uit of wijzig het filter hierboven.'},
-            configureHRSync: (providerName: string) => `Stel ${providerName}-synchronisatie in.`,
+            configureHRSync: (providerName: string) => `${providerName}-synchronisatie instellen.`,
             syncWithHR: (providerName: string) => `Synchroniseren met ${providerName}`,
         },
         card: {
@@ -7143,11 +7143,11 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
                     case 'zenefitsSyncTitle':
                         return 'TriNet-medewerkers synchroniseren';
                     case 'zenefitsSyncLoadData':
-                        return 'Gegevens laden van TriNet';
+                        return 'Gegevens van TriNet laden';
                     case 'zenefitsSyncProvisioning':
                         return 'Medewerkers toewijzen in beleid';
                     case 'jobDone':
-                        return 'Wachten tot geïmporteerde gegevens worden geladen';
+                        return 'Wachten tot geïmporteerde gegevens zijn geladen';
                     default: {
                         return `Vertaling ontbreekt voor fase: ${stage}`;
                     }
@@ -7172,6 +7172,7 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
             },
             syncingModalTitle: 'Je verbinding wordt gesynchroniseerd',
             syncingModalDescription: 'De eerste verbinding kan even duren. Je krijgt een melding als er fouten optreden.',
+            syncing: 'Werknemers synchroniseren',
         },
     },
     getAssistancePage: {
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index f013ec6b..10fdefd3 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -6055,7 +6055,7 @@ _Aby uzyskać bardziej szczegółowe instrukcje, [odwiedź naszą stronę pomocy
             approvers: 'Osoby zatwierdzające',
             auditors: 'Audytorzy',
             emptyRoleFilter: {title: 'Żadni członkowie nie pasują do tego filtra', subtitle: 'Zaproś członka lub zmień filtr powyżej.'},
-            configureHRSync: (providerName: string) => `Skonfiguruj synchronizację ${providerName}.`,
+            configureHRSync: (providerName: string) => `Skonfiguruj synchronizację z ${providerName}.`,
             syncWithHR: (providerName: string) => `Synchronizuj z ${providerName}`,
         },
         card: {
@@ -7134,15 +7134,15 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
                     case 'gustoSyncLoadData':
                         return 'Wczytywanie danych z Gusto';
                     case 'gustoSyncProvisioning':
-                        return 'Przydzielanie pracowników w polisie';
+                        return 'Przydzielanie pracowników w polityce';
                     case 'zenefitsSyncTitle':
                         return 'Synchronizowanie pracowników TriNet';
                     case 'zenefitsSyncLoadData':
                         return 'Wczytywanie danych z TriNet';
                     case 'zenefitsSyncProvisioning':
-                        return 'Przydzielanie pracowników w polisie';
+                        return 'Przydzielanie pracowników w polityce';
                     case 'jobDone':
-                        return 'Oczekiwanie na załadowanie zaimportowanych danych';
+                        return 'Trwa ładowanie zaimportowanych danych';
                     default: {
                         return `Brak tłumaczenia dla etapu: ${stage}`;
                     }
@@ -7166,7 +7166,8 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
                 title: 'TriNet',
             },
             syncingModalTitle: 'Twoje połączenie jest synchronizowane',
-            syncingModalDescription: 'Pierwsze połączenie może chwilę potrwać. Zostaniesz powiadomiony o wszelkich błędach.',
+            syncingModalDescription: 'Pierwsze połączenie może zająć trochę czasu. O wszelkich błędach zostaniesz powiadomiony.',
+            syncing: 'Synchronizowanie pracowników',
         },
     },
     getAssistancePage: {
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 12336717..60a5ea12 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -6061,7 +6061,7 @@ _Para instruções mais detalhadas, [visite nossa central de ajuda](${CONST.NETS
             approvers: 'Aprovadores',
             auditors: 'Auditores',
             emptyRoleFilter: {title: 'Nenhum membro corresponde a este filtro', subtitle: 'Convide um membro ou altere o filtro acima.'},
-            configureHRSync: (providerName: string) => `Configurar a sincronização do ${providerName}.`,
+            configureHRSync: (providerName: string) => `Configurar a sincronização com ${providerName}.`,
             syncWithHR: (providerName: string) => `Sincronizar com ${providerName}`,
         },
         card: {
@@ -7135,7 +7135,7 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
             syncStageName: ({stage}: SyncStageNameConnectionsParams) => {
                 switch (stage) {
                     case 'gustoSyncTitle':
-                        return 'Sincronizando funcionários do Gusto';
+                        return 'Sincronizando funcionários da Gusto';
                     case 'gustoSyncLoadData':
                         return 'Carregando dados do Gusto';
                     case 'gustoSyncProvisioning':
@@ -7170,8 +7170,9 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
             zenefits: {
                 title: 'TriNet',
             },
-            syncingModalTitle: 'Sua conexão está sincronizando',
-            syncingModalDescription: 'A primeira conexão pode levar algum tempo. Você será notificado sobre quaisquer erros.',
+            syncingModalTitle: 'Sua conexão está sendo sincronizada',
+            syncingModalDescription: 'A primeira conexão pode levar algum tempo. Você será avisado sobre quaisquer erros.',
+            syncing: 'Sincronizando funcionários',
         },
     },
     getAssistancePage: {
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 658795b4..e71b4e40 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -6952,17 +6952,17 @@ ${reportName}
             syncStageName: ({stage}: SyncStageNameConnectionsParams) => {
                 switch (stage) {
                     case 'gustoSyncTitle':
-                        return '同步 Gusto 员工';
+                        return '正在同步 Gusto 员工';
                     case 'gustoSyncLoadData':
                         return '正在从 Gusto 加载数据';
                     case 'gustoSyncProvisioning':
-                        return '在政策中为员工开通账号';
+                        return '在策略中为员工开通账户';
                     case 'zenefitsSyncTitle':
                         return '正在同步 TriNet 员工';
                     case 'zenefitsSyncLoadData':
                         return '正在从 TriNet 加载数据';
                     case 'zenefitsSyncProvisioning':
-                        return '在政策中为员工开通账号';
+                        return '在策略中为员工开通账户';
                     case 'jobDone':
                         return '正在加载导入的数据';
                     default: {
@@ -6988,7 +6988,8 @@ ${reportName}
                 title: 'TriNet',
             },
             syncingModalTitle: '您的连接正在同步',
-            syncingModalDescription: '首次连接可能需要一些时间。若发生任何错误,我们会通知你。',
+            syncingModalDescription: '首次连接可能需要一些时间。若出现任何错误,我们会通知你。',
+            syncing: '正在同步员工',
         },
     },
     getAssistancePage: {

Note

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

View workflow run

Comment thread src/hooks/useMergeHRInitialSyncingModal.ts Outdated
Comment thread src/libs/actions/connections/MergeHR.ts Outdated
@github-actions
Copy link
Copy Markdown
Contributor

🚧 @grgia has triggered a test Expensify/App build. You can view the workflow run here.

@grgia grgia removed the request for review from Eskalifer1 May 22, 2026 12:41
@github-actions
Copy link
Copy Markdown
Contributor

🚧 @grgia has triggered a test Expensify/App build. You can view the workflow run here.

@github-actions
Copy link
Copy Markdown
Contributor

🚧 @grgia has triggered a test Expensify/App build. You can view the workflow run here.

@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

const isInitialSyncInProgress = mergeLastSync?.syncStatus === CONST.MERGE_HR.SYNC_STATUS.SYNCING && mergeLastSync?.syncType === CONST.MERGE_HR.SYNC_TYPE.INITIAL;
if (!isFocused || !isInitialSyncInProgress || !isAppVisible) {
return;
}
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.

[isInitialSyncInProgress, isFocused] @mhawryluk have you tried passing in isInitialSyncInProgress rather than rerender on both changes?

@github-actions
Copy link
Copy Markdown
Contributor

🚧 @grgia has triggered a test Expensify/App build. You can view the workflow run here.

@github-actions
Copy link
Copy Markdown
Contributor

🚧 @grgia has triggered a test Expensify/App build. You can view the workflow run here.

@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

cristipaval
cristipaval previously approved these changes May 22, 2026
Copy link
Copy Markdown
Contributor

@cristipaval cristipaval left a comment

Choose a reason for hiding this comment

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

I've just tested and I have nothing more to add other that @grgia's comments

@grgia
Copy link
Copy Markdown
Contributor

grgia commented May 22, 2026

SKKRRT

Copy link
Copy Markdown
Contributor

@grgia grgia left a comment

Choose a reason for hiding this comment

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

TESTED, WORKS with bamboo

@grgia
Copy link
Copy Markdown
Contributor

grgia commented May 22, 2026

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 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
iOS: mWeb Safari
MacOS: Chrome / Safari

@grgia
Copy link
Copy Markdown
Contributor

grgia commented May 22, 2026

image image

@grgia grgia merged commit 78bb88d into Expensify:main May 22, 2026
42 of 45 checks passed
@github-actions
Copy link
Copy Markdown
Contributor

🚧 @grgia has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify
Copy link
Copy Markdown
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.

@twisterdotcom
Copy link
Copy Markdown
Contributor

LOVE THIS.

https://www.loom.com/share/a90f8c0ea0a244bda4a337af9a896a12

@OSBotify
Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/grgia in version: 9.3.80-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

Bundle Size Analysis (Sentry):

@MelvinBot
Copy link
Copy Markdown
Contributor

No help site changes are required for this PR.

Reasoning:

  • The changes add Merge HR sync features (initial sync modal, Members page sync link/action, syncing spinner) that are behind the mergeHRConnections beta flag and not yet publicly available.
  • The renamed UI strings (configureGustoSyncconfigureHRSync, syncWithGustosyncWithHR) are not referenced in any existing help articles.
  • The existing TriNet article describes the TriNet (Zenefits) integration, which is a separate connection type from Merge HR and doesn't mention the Members page sync experience.
  • There is no existing new-expensify help article for Merge HR connections or Gusto that would need updating.

Once this feature exits beta and becomes generally available, a new help article covering the Merge HR connection flow (including the sync modal and Members page sync options) would be appropriate.

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.

9 participants