Skip to content

[Payment due @bernhardoj] [HR Import] Add remaining hr providers to merge - #93580

Merged
cristipaval merged 12 commits into
Expensify:mainfrom
software-mansion-labs:feat/add-remaining-hris-providers-to-merge
Aug 21, 2026
Merged

[Payment due @bernhardoj] [HR Import] Add remaining hr providers to merge#93580
cristipaval merged 12 commits into
Expensify:mainfrom
software-mansion-labs:feat/add-remaining-hris-providers-to-merge

Conversation

@jmusial

@jmusial jmusial commented Jun 15, 2026

Copy link
Copy Markdown
Contributor

Explanation of Change

Expands the Merge HR provider list from 3 entries to 23 enabled providers - with 15 further providers included but commented out for now.

Adds an option to search the list by connection name.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/648089
PROPOSAL:

Tests

  1. Open app
  2. Have a workspace
  3. Enable HR integrations
  4. Verify that there are 26 integrations to choose from
  5. Start typing integration name into the search input
  6. Verify that the list is narrowing down

Offline tests

QA Steps

Same as tests +
7. Click each new integration and verify that a setup dialog opens.

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
    • 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

MacOS: Chrome / Safari
Screen.Recording.2026-08-20.at.14.55.16.mov

@jmusial jmusial mentioned this pull request Jun 15, 2026
51 tasks
@cristipaval
cristipaval self-requested a review August 13, 2026 18:40
cristipaval
cristipaval previously approved these changes Aug 13, 2026

@roryabraham roryabraham 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.

Since the integration list has >15 items, it should be searchable

@roryabraham

Copy link
Copy Markdown
Contributor

(I also wonder if we should surface the most popular ones to the top)

@jmusial

jmusial commented Aug 14, 2026

Copy link
Copy Markdown
Contributor Author

@roryabraham search was implemented #93581, but now I see that the issue has been closed waiting for new design I think

@cristipaval
cristipaval requested a review from grgia August 14, 2026 15:15
@cristipaval

Copy link
Copy Markdown
Contributor

@jmusial I think you have access to this issue to see this comment, do you?

@grgia grgia 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.

Piggybacking @roryabraham, should this merge after #93581 so the list never ships without search?

@jmusial

jmusial commented Aug 18, 2026

Copy link
Copy Markdown
Contributor Author

@codex review

@jmusial
jmusial marked this pull request as ready for review August 18, 2026 10:12
@jmusial
jmusial requested review from a team as code owners August 18, 2026 10:12
@melvin-bot
melvin-bot Bot requested review from flaviadefaria and thelullabyy and removed request for a team August 18, 2026 10:12
@melvin-bot

melvin-bot Bot commented Aug 18, 2026

Copy link
Copy Markdown

@thelullabyy 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]

@melvin-bot
melvin-bot Bot removed the request for review from a team August 18, 2026 10:12
@jmusial
jmusial requested review from cristipaval and grgia August 18, 2026 10:12
Comment thread src/CONST/MERGE_HR_PROVIDERS.ts
@cristipaval
cristipaval removed the request for review from thelullabyy August 18, 2026 10:27
@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 c1bd8cea..9958fa42 100644
--- a/src/languages/de.ts
+++ b/src/languages/de.ts
@@ -8240,6 +8240,7 @@ Fügen Sie weitere Ausgabelimits hinzu, um den Cashflow Ihres Unternehmens zu sc
             authenticationError: (providerName: string) => `Verbindung mit ${providerName} aufgrund einer abgelaufenen Verknüpfung nicht möglich.`,
             reconnect: 'Erneut verbinden',
             reconnectLink: 'Erneut verbinden.',
+            findIntegration: 'Integration finden',
         },
         emptyDomain: {
             title: 'Stärken Sie Ihre Sicherheit mit Domains',
diff --git a/src/languages/el.ts b/src/languages/el.ts
index b2e70b99..a02d7162 100644
--- a/src/languages/el.ts
+++ b/src/languages/el.ts
@@ -7331,6 +7331,7 @@ _Για πιο αναλυτικές οδηγίες, [επισκεφθείτε τ
                     prompt: 'Έχετε φτάσει το όριο συγχρονισμών σας για σήμερα.',
                 },
             },
+            findIntegration: 'Βρείτε ενοποίηση',
         },
         export: {
             notReadyHeading: 'Μη έτοιμο για εξαγωγή',
diff --git a/src/languages/es.ts b/src/languages/es.ts
index 693a7c70..d6a96348 100644
--- a/src/languages/es.ts
+++ b/src/languages/es.ts
@@ -7049,6 +7049,7 @@ El plan Controlar empieza en 9 $ por miembro activo al mes.`,
             authenticationError: (providerName: string) => `No se puede conectar a ${providerName} porque la conexión ha caducado.`,
             reconnect: 'Volver a conectar',
             reconnectLink: 'Volver a conectar.',
+            findIntegration: 'Buscar integración',
         },
         export: {
             notReadyHeading: 'No está listo para exportar',
diff --git a/src/languages/fr.ts b/src/languages/fr.ts
index 0aefec5e..aff18c53 100644
--- a/src/languages/fr.ts
+++ b/src/languages/fr.ts
@@ -8271,6 +8271,7 @@ Ajoutez davantage de règles de dépenses pour protéger la trésorerie de l’e
             authenticationError: (providerName: string) => `Connexion à ${providerName} impossible en raison d'une connexion expirée.`,
             reconnect: 'Reconnect',
             reconnectLink: 'Reconnectez-vous.',
+            findIntegration: 'Rechercher une intégration',
         },
         emptyDomain: {
             title: 'Renforcez votre sécurité avec des domaines',
diff --git a/src/languages/it.ts b/src/languages/it.ts
index f8a7f637..90f6a4b4 100644
--- a/src/languages/it.ts
+++ b/src/languages/it.ts
@@ -8205,6 +8205,7 @@ Aggiungi altre regole di spesa per proteggere il flusso di cassa aziendale.`,
             authenticationError: (providerName: string) => `Impossibile connettersi a ${providerName} a causa di una connessione scaduta.`,
             reconnect: 'Riconnetti',
             reconnectLink: 'Riconnetti.',
+            findIntegration: 'Trova integrazione',
         },
         emptyDomain: {
             title: 'Migliora la tua sicurezza con i domini',
diff --git a/src/languages/ja.ts b/src/languages/ja.ts
index 97648190..bd38c03a 100644
--- a/src/languages/ja.ts
+++ b/src/languages/ja.ts
@@ -8105,6 +8105,7 @@ ${reportName}`,
             authenticationError: (providerName: string) => `有効期限が切れた接続のため、${providerName} に接続できません。`,
             reconnect: '再接続',
             reconnectLink: '再接続する',
+            findIntegration: '連携を検索',
         },
         emptyDomain: {
             title: 'ドメインでセキュリティを強化しましょう',
diff --git a/src/languages/nl.ts b/src/languages/nl.ts
index b016bea9..05a31bec 100644
--- a/src/languages/nl.ts
+++ b/src/languages/nl.ts
@@ -8183,6 +8183,7 @@ er bestedingsregels toe om de kasstroom van het bedrijf te beschermen.`,
             authenticationError: (providerName: string) => `Kan geen verbinding maken met ${providerName} vanwege een verlopen koppeling.`,
             reconnect: 'Opnieuw verbinden',
             reconnectLink: 'Opnieuw verbinden.',
+            findIntegration: 'Integratie zoeken',
         },
         emptyDomain: {title: 'Verbeter je beveiliging met domeinen', subtitle: 'Vereis dat leden op je domein inloggen via single sign-on, beperk het aanmaken van werkruimtes en meer.'},
     },
diff --git a/src/languages/pl.ts b/src/languages/pl.ts
index 5de5d559..ca063822 100644
--- a/src/languages/pl.ts
+++ b/src/languages/pl.ts
@@ -8164,6 +8164,7 @@ Dodaj więcej zasad wydatków, żeby chronić płynność finansową firmy.`,
             authenticationError: (providerName: string) => `Nie można połączyć z ${providerName} z powodu wygasłego połączenia.`,
             reconnect: 'Połącz ponownie',
             reconnectLink: 'Połącz ponownie.',
+            findIntegration: 'Znajdź integrację',
         },
         emptyDomain: {
             title: 'Zwiększ swoje bezpieczeństwo dzięki domenom',
diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts
index 40f5a92b..d0113287 100644
--- a/src/languages/pt-BR.ts
+++ b/src/languages/pt-BR.ts
@@ -8185,6 +8185,7 @@ Adicione mais regras de gasto para proteger o fluxo de caixa da empresa.`,
             authenticationError: (providerName: string) => `Não é possível conectar a ${providerName} devido a uma conexão expirada.`,
             reconnect: 'Reconectar',
             reconnectLink: 'Reconectar.',
+            findIntegration: 'Encontrar integração',
         },
         emptyDomain: {
             title: 'Aumente sua segurança com domínios',
diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts
index 87868905..3e20717b 100644
--- a/src/languages/zh-hans.ts
+++ b/src/languages/zh-hans.ts
@@ -7896,6 +7896,7 @@ ${reportName}`,
             authenticationError: (providerName: string) => `由于连接已过期,无法连接到 ${providerName}。`,
             reconnect: '重新连接',
             reconnectLink: '重新连接。',
+            findIntegration: '查找集成',
         },
         emptyDomain: {title: '通过域名提升安全性', subtitle: '要求您域中的成员通过单点登录登录、限制工作区创建等。'},
     },

Note

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

View workflow run

@jmusial

jmusial commented Aug 20, 2026

Copy link
Copy Markdown
Contributor Author

All updated @dubielzyk-expensify @cristipaval @bernhardoj

Screen.Recording.2026-08-20.at.14.55.16.mov

@shawnborton

Copy link
Copy Markdown
Contributor

Where are we getting all of the logos from? Just wondering if we have better versions to use instead of a small logo on white BG. For instance, Humaans uses this for their X profile:
CleanShot 2026-08-20 at 09 11 05@2x

@bernhardoj bernhardoj 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.

LGTM! The icons are not from the FE, so approving.

@melvin-bot melvin-bot Bot changed the title [HR Import] Add remaining hr providers to merge [Payment due @bernhardoj] [HR Import] Add remaining hr providers to merge Aug 20, 2026
@melvin-bot

melvin-bot Bot commented Aug 20, 2026

Copy link
Copy Markdown

🎯 @bernhardoj, thanks for reviewing and testing this PR! 🎉

A payment issue will be created for your review once this PR is deployed to production.
E/E issue linked to the PR - https://www.github.com/Expensify/Expensify/issues/648089.

If payment is not needed (e.g., regression PR review fix etc), react with 👎 to this comment to prevent the payment issue from being created.

@jmusial

jmusial commented Aug 20, 2026

Copy link
Copy Markdown
Contributor Author

Where are we getting all of the logos from? Just wondering if we have better versions to use instead of a small logo on white BG. For instance, Humaans uses this for their X ...

Were getting them from merge.dev assets. But not sure if we have any control over what logo is there @twisterdotcom ?

@twisterdotcom

Copy link
Copy Markdown
Contributor

not sure if we have any control over what logo is there @twisterdotcom ?

No, we're relying on Merge's metadata to provide us the logos: https://docs.merge.dev/merge-unified/platform-and-account-metadata/integration-metadata

@shawnborton

Copy link
Copy Markdown
Contributor

Got it. I think that's fine for now but we might want to revisit that later. Basically it seems like all logos from merge are on a white background, whereas logos we manually upload typically have full bleed backgrounds. I would like to standardize on something.

@cristipaval cristipaval 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.

on you now, @roryabraham @grgia

@roryabraham roryabraham 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.

LGTM 👍🏼

@grgia grgia 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.

@jmusial should it be 26 not 28 in QA steps?

@cristipaval
cristipaval merged commit 2ba23b0 into Expensify:main Aug 21, 2026
44 of 46 checks passed
@cristipaval

Copy link
Copy Markdown
Contributor

@jmusial should it be 26 not 28 in QA steps?

yes, it should be 26 now that we commented out to more. Updated

@github-actions

Copy link
Copy Markdown
Contributor

🚧 cristipaval 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.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/cristipaval in version: 9.4.59-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor

Help site review — changes required ✅

Yes, this PR needs a help site update. It expands the workspace HR page from 3 Merge-based providers (BambooHR, HiBob, Workday) to 24 enabled providers and adds a Find integration search field, but the help site only documented BambooHR, HiBob, and Workday individually — the 21 new providers and the search field had no coverage.

Draft PR created: #99234

Rather than creating 21 near-duplicate per-provider stubs, I added one new article that documents the shared connection flow (identical across all Merge providers), lists the currently supported providers, and covers the new Find integration search:

  • docs/articles/new-expensify/connections/Connect-an-HR-integration-to-Expensify.md

It cross-links to the existing detailed BambooHR/HiBob/Workday guides and notes that Gusto and TriNet use a separate setup flow.

What I checked and how
  • Reviewed the diff: src/CONST/MERGE_HR_PROVIDERS.ts (3 → 24 enabled providers, 15 more commented out) and src/languages/en.ts (new hr.findIntegration: 'Find integration' string).
  • Confirmed the HR page renders 2 static providers (Gusto, TriNet) plus every enabled Merge provider (src/pages/workspace/hr/utils.tsgetHRCards), which matches the "26 integrations" in your test plan.
  • All UI labels in the article (HR, More features, Find integration, Connect, Complete setup, Cannot connect to multiple HR platforms, and the provider display names) were taken from the app source strings, and the article was written to follow docs/HELPSITE_NAMING_CONVENTIONS.md, docs/HELP_AUTHORING_GUIDELINES.md, and docs/TEMPLATE.md (single # title, task-based ## headings, exact UI casing, cross-links after prose).
  • cspell passes on the new file.

⚠️ I could not verify against the live UI — the test environment's dev app was stuck on the boot splash (0 rendered DOM nodes despite all assets returning HTTP 200), so I relied on the app source strings (which are what the UI renders). Please double-check the labels against the live product.

@jmusial, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review


view run

@mitarachim

Copy link
Copy Markdown

Deploy Blocker #99250 was identified to be related to this PR.

@unzig21

unzig21 commented Aug 24, 2026

Copy link
Copy Markdown

Deploy Blocker #99284 was identified to be related to this PR.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.4.59-5 🚀

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

Bundle Size Analysis (Sentry):

@melvin-bot

melvin-bot Bot commented Aug 24, 2026

Copy link
Copy Markdown

🤖 Payment issue created: #99361

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.