-
Notifications
You must be signed in to change notification settings - Fork 3.9k
[NoQA] [HR Import] Add MERGE_HR consts, types, and provider map #90949
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
cristipaval
merged 14 commits into
Expensify:main
from
software-mansion-labs:merge-hr/foundations
May 18, 2026
+74
−22
Merged
Changes from all commits
Commits
Show all changes
14 commits
Select commit
Hold shift + click to select a range
cc1c280
[HR Import] Add MERGE_HR consts, types, and provider map
mhawryluk 39ed5b6
Fix type for mergeProviderSlug
mhawryluk 58ccec1
Remove fake icon urls
mhawryluk ca0e56c
Small fix
mhawryluk aa9aede
Update cspell
mhawryluk 4120358
Small change to comment
mhawryluk 54e670f
Move merge_hr_ to a constant
mhawryluk 7c83415
Add iconUrls for merge hr providers
mhawryluk cc8c120
Add MergeHRConnectionData type alias
mhawryluk 4ed0c3b
Rename CONST.GUSTO.APPROVAL_MODE to CONST.HR.APPROVAL_MODE
mhawryluk 2814f91
Merge branch 'main' into merge-hr/foundations
mhawryluk ff04d75
Separate GUSTO.APPROVAL_MODE and MERGE_HR.APPROVAL_MODE
mhawryluk ec5fd17
Replace multiple merge hr integrations with a single one
mhawryluk 9a135fa
Fix AccountingUtils
mhawryluk File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| type MergeHRProviderEntry = { | ||
| /** Human-readable label used in the UI */ | ||
| displayName: string; | ||
|
|
||
| /** Provider logo served from the Merge CDN */ | ||
| iconUrl: string; | ||
| }; | ||
|
|
||
| const MERGE_HR_PROVIDERS = { | ||
| workday: { | ||
| displayName: 'Workday', | ||
| iconUrl: 'https://merge-api-public.s3.amazonaws.com/media/PlatformWorkday.png', | ||
| }, | ||
| bamboohr: { | ||
| displayName: 'BambooHR', | ||
| iconUrl: 'https://merge-api-public.s3.amazonaws.com/media/BambooHR_Square_Logo.jpg', | ||
| }, | ||
| hibob: { | ||
| displayName: 'HiBob', | ||
| iconUrl: 'https://merge-api-public.s3.amazonaws.com/media/PlatformHibob.png', | ||
| }, | ||
| } as const satisfies Record<string, MergeHRProviderEntry>; | ||
|
|
||
| type MergeHRProviderSlug = keyof typeof MERGE_HR_PROVIDERS; | ||
|
|
||
| export type {MergeHRProviderSlug}; | ||
| export default MERGE_HR_PROVIDERS; | ||
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should these be saved and served locally?
NAB, we can deal with this when we start serving them in app
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think we settled on using the merge's url in the design doc to not increase the bundle
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agree. We have this internal issue to eventually cache these too but that's for R2: https://github.com/orgs/Expensify/projects/285/views/7?sliceBy%5BcolumnId%5D=348841703&sliceBy%5Bvalue%5D=R2%3A+60%2B+connections&pane=issue&itemId=188836197&issue=Expensify%7CExpensify%7C636853