Skip to content
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

🍒 Cherry pick PR #40824 to staging 🍒 #40825

Closed
wants to merge 16 commits into from

Conversation

os-botify[bot]
Copy link

@os-botify os-botify bot commented Apr 23, 2024

🍒 Cherry pick #40824 to staging 🍒

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
    • MacOS: Desktop
  • 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • 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 verified the translation was requested/reviewed 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.js 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 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.
  • 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/Videosundefined

OSBotify and others added 10 commits April 22, 2024 16:55
(cherry picked from commit ad68a46)
Fix: Correct Footer Display in MoneyRequestConfirmationList Component
(cherry picked from commit 4b0e4ee)
(cherry picked from commit 5c6a99d)
[CP Staging] Revert "Block edit assignee and mark as complete simultaneously"

(cherry picked from commit 51f1c2a)
(cherry picked from commit 63affdb)
…is-ur-magic-code-shows-briefly

[CP Staging] Revert "Fix here is your magic code shows briefly when login with magic link"

(cherry picked from commit 767367b)
(cherry picked from commit bebeed1)
…d-followups

[CP Staging] Feat/36985 create new rate field followups

(cherry picked from commit 7e5b436)
(cherry picked from commit 6b18ee9)
[CP Staging] Fix: Android - Workspace list - Workspace name and email address are truncated

(cherry picked from commit 109d0f0)
@os-botify os-botify bot requested a review from a team as a code owner April 23, 2024 20:04
@os-botify
Copy link
Author

os-botify bot commented Apr 23, 2024

This pull request has merge conflicts and can not be automatically merged. 😞
Please manually resolve the conflicts, push your changes, and then request another reviewer to review and merge.
Important: There may be conflicts that GitHub is not able to detect, so please carefully review this pull request before approving.

@melvin-bot melvin-bot bot requested review from marcochavezf and removed request for a team April 23, 2024 20:04
Copy link

melvin-bot bot commented Apr 23, 2024

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

@marcochavezf
Copy link
Contributor

marcochavezf commented Apr 23, 2024

Ok the difference was in ThreeDotMenuOrPendingIcon

- style={[styles.workspaceThreeDotMenu]}
+ style={[!isSmallScreenWidth && styles.workspaceThreeDotMenu]}

@marcochavezf marcochavezf requested a review from a team April 23, 2024 20:42
@melvin-bot melvin-bot bot removed the request for review from a team April 23, 2024 20:42
Copy link

melvin-bot bot commented Apr 23, 2024

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

@marcochavezf marcochavezf requested a review from a team April 23, 2024 20:42
@melvin-bot melvin-bot bot removed the request for review from a team April 23, 2024 20:42
Copy link

melvin-bot bot commented Apr 23, 2024

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

@marcochavezf marcochavezf requested review from a team and removed request for marcochavezf April 23, 2024 20:43
@melvin-bot melvin-bot bot removed the request for review from a team April 23, 2024 20:44
Copy link

melvin-bot bot commented Apr 23, 2024

@nkuoch 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 requested a review from nkuoch April 23, 2024 20:44
@marcochavezf marcochavezf self-assigned this Apr 23, 2024
amyevans and others added 4 commits April 23, 2024 16:47
…-40711-1

🍒 Cherry pick PR #40711 to staging 🍒
(cherry picked from commit b386889)
[CP Staging] Chat is not scrolled to the new message on a newly created WS chat after whisper message

(cherry picked from commit 39841b8)
@os-botify os-botify bot requested a review from a team as a code owner April 23, 2024 22:43
@marcochavezf marcochavezf force-pushed the mountiny-cherry-pick-staging-40824-1 branch from d1b44b0 to eb6331c Compare April 23, 2024 22:50
@mountiny
Copy link
Contributor

Well this fell through the cracks, we need to improve the actions to inform people in Slack as I was not checking all the github notification 😡

this is already in staging so we can close it

@mountiny mountiny closed this Apr 24, 2024
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.

8 participants