Skip to content

[NO QA] Tag individual Slack users in cherry-pick conflict notifications - #83512

Merged
Julesssss merged 6 commits into
mainfrom
claude-improveCherryPickNotification
Feb 26, 2026
Merged

Julesssss merged 6 commits into
mainfrom
claude-improveCherryPickNotification

Conversation

@MelvinBot

@MelvinBot MelvinBot commented Feb 26, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

When an App cherry pick fails we tag the whole app deployer team. This is noisy and annoying. This change tries to locate the PR merger, to be less annoying. We'll fallback to the whole team if we can't locate that person though.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/604463

Tests

We'll need to test properly on next CP failure.

QA Steps

This is a GitHub Actions workflow change that only affects Slack notification targeting in the cherry-pick workflow. No user-facing product behavior is changed.

  • 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

N/A — CI workflow change only

Android: mWeb Chrome

N/A — CI workflow change only

iOS: Native

N/A — CI workflow change only

iOS: mWeb Safari

N/A — CI workflow change only

MacOS: Chrome / Safari

N/A — CI workflow change only

Instead of pinging the entire @appdeployers Slack group when a
cherry-pick has conflicts, resolve the merge actor's GitHub username
to their individual Slack member ID by fetching the employee whitelist
from the Salt repo. Falls back to mentioning the GitHub username if
the whitelist lookup fails. The failure notification still pings the
full team since the resolve step may not have completed.

Co-authored-by: Jules <Julesssss@users.noreply.github.com>

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

@MelvinBot instead of falling back to github user we can tag the whole team, like we do currently

@MelvinBot

Copy link
Copy Markdown
Contributor Author

The only failing check is PR Reviewer Checklist / checklist — this fails because no reviewer has posted the reviewer checklist comment yet. This is not a code issue and can't be fixed by pushing commits. It will pass automatically once a reviewer posts their checklist on the PR.

All other checks (verifySignedCommits, CLA, dryRun, spellcheck, verify, etc.) are passing.

@MelvinBot

Copy link
Copy Markdown
Contributor Author

Good point — falling back to the GitHub username doesn't actually notify anyone in Slack. Updated the fallback to tag the whole @appdeployers team (<!subteam^S4TJJ3PSL>) instead, which preserves the current behavior when the whitelist lookup fails.

The change is in the else branch at line 175:

          else
-            # Fallback: mention by GitHub username if whitelist lookup fails
-            echo "SLACK_MENTION=$GITHUB_USER (GitHub)" >> "$GITHUB_OUTPUT"
+            # Fallback: tag the whole team if whitelist lookup fails
+            echo "SLACK_MENTION=<!subteam^S4TJJ3PSL>" >> "$GITHUB_OUTPUT"

However, I wasn't able to push this commit because the token lacks the workflow scope needed to update .github/workflows/ files. The PR author will need to push this change manually, or the token permissions need to be updated.

@Julesssss Julesssss changed the title Tag individual Slack users in cherry-pick conflict notifications [NO QA] Tag individual Slack users in cherry-pick conflict notifications Feb 26, 2026
@Julesssss
Julesssss marked this pull request as ready for review February 26, 2026 18:41
@melvin-bot
melvin-bot Bot requested review from DylanDylann and removed request for a team February 26, 2026 18:42
@melvin-bot

This comment was marked as spam.

@Julesssss
Julesssss requested review from a team and removed request for DylanDylann February 26, 2026 18:42
@melvin-bot
melvin-bot Bot requested review from Valforte and removed request for a team February 26, 2026 18:43
@melvin-bot

melvin-bot Bot commented Feb 26, 2026

Copy link
Copy Markdown

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

Comment thread .github/workflows/cherryPick.yml Resolved
Comment thread .github/workflows/cherryPick.yml Resolved
@francoisl

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

@MelvinBot

Copy link
Copy Markdown
Contributor Author

The only failing check is PR Reviewer Checklist / checklist, which fails because no reviewer has posted the reviewer checklist comment yet. This is not a code or CI issue — it will resolve once a reviewer copies and completes the reviewer checklist on this PR. No code fix is needed.

@Julesssss
Julesssss requested a review from a team as a code owner February 26, 2026 18:58
@melvin-bot
melvin-bot Bot requested a review from hungvu193 February 26, 2026 18:58
@melvin-bot

melvin-bot Bot commented Feb 26, 2026

Copy link
Copy Markdown

@hungvu193 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 February 26, 2026 18:58
@Julesssss
Julesssss requested a review from francoisl February 26, 2026 19:02
@MelvinBot

This comment was marked as outdated.

@MelvinBot

Copy link
Copy Markdown
Contributor Author

All checks on this PR are now passing. The previously failing check was PR Reviewer Checklist / checklist, which resolved after francoisl posted the reviewer checklist. The only remaining pending checks are the external Snyk security/license scans, which are still running — no code fix is needed.

@francoisl
francoisl removed the request for review from hungvu193 February 26, 2026 19:17
Comment on lines +272 to +273
echo "$WHITELIST" \
| grep -F -A 10 "'github' => '$github_user'" \

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.

Just noting that this will only work if the slack handle is defined after the github key in the whitelist (which it is now), but it could easily break if someone changes the whitelist.
I don't think there's any plan to though, and it would be an easy fix anyway.

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.

Ah good spot.

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.

The fix for this is to change grep -F -A 10 to grep -F -B 10 -A 10 so it searches both before and after the github key match. This makes the lookup order-independent. I've posted the diff in a PR comment — I can't push it directly due to the workflow scope limitation on the token.

@Julesssss
Julesssss merged commit fdb8910 into main Feb 26, 2026
14 checks passed
@Julesssss
Julesssss deleted the claude-improveCherryPickNotification branch February 26, 2026 19:47
@MelvinBot

Copy link
Copy Markdown
Contributor Author

I reviewed all the review threads on this PR:

  • Thread 1 (resolved): Unnecessary head -1 step — addressed with grep -oP -m 1
  • Thread 2 (resolved): || vs && for fallback logic — addressed with the loop-based approach

Thread 3 (unresolved): francoisl noted the Slack ID lookup depends on the slack key appearing after the github key in the whitelist, since we use grep -A 10 (look 10 lines after). If the ordering changes, the lookup breaks.

Fix: Change -A 10 to -B 10 -A 10 so the lookup searches both before and after the github match:

              echo "$WHITELIST" \
-               | grep -F -A 10 "'github' => '$github_user'" \
+               | grep -F -B 10 -A 10 "'github' => '$github_user'" \
                | grep -oP -m 1 "'slack'\s*=>\s*'\K[^']+" || true

I can't push this change because the token lacks the workflow scope required for .github/workflows/ files. Julesssss — you can apply this one-line change directly on main or let me know if you'd like to handle it differently.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/Julesssss in version: 9.3.27-0 🚀

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

@OSBotify

OSBotify commented Mar 2, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/blimpich in version: 9.3.27-8 🚀

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

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants