[No QA] Fix CP conflict resolution #22724

roryabraham · 2023-07-12T00:01:30Z

Details

We did not have the full git history, so git didn't know that the various commits involved in the cherry-pick share common ancestry. Therefore, it didn't know how to automatically resolve those conflicts.

This PR fixes that by fetching history of all the refs going back to the previous checklist.

Fixed Issues

$ n/a – https://github.com/Expensify/App/pull/22722/files

Tests

Updated automated tests.

Verify that no errors appear in the JS console

Offline tests

None.

QA Steps

None.

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 / Chrome
- iOS / native
- iOS / 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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 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
- If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
- 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(themeColors.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 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.
I have checked off every checkbox in the PR author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

melvin-bot · 2023-07-12T00:02:03Z

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

francoisl · 2023-07-12T00:06:37Z

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 tests pass on all platforms & I tested again on:
- Android / native
- Android / Chrome
- iOS / native
- iOS / Safari
- MacOS / Chrome / Safari
- MacOS / Desktop
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 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
- 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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- 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.js 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(themeColors.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 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.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

roryabraham · 2023-07-12T00:07:31Z

tests/unit/CIGitLogicTest.sh

-  if ! git rev-parse --verify staging 2>/dev/null; then
-    git fetch origin staging --depth=1
-  fi
+  checkout_repo


This was the line that was missing to make this test more like "the real world" – it checks out the repo as actions/checkout does and therefore resets the client repo to have only 1 commit of history on the main branch.

If you want to see the test fail + reproduce the same error we saw in production, change line 134 to:

git fetch origin staging "$VERSION_BUMP_COMMIT" "$PR_MERGE_COMMIT" --no-tags --depth=1

Then you'll see an incorrect conflict in package.json and package-lock.json.

.github/actions/javascript/getPreviousVersion/getPreviousVersion.js

OSBotify · 2023-07-12T01:09:59Z

✋ 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 · 2023-07-13T02:00:03Z

🚀 Deployed to staging by https://github.com/roryabraham in version: 1.3.40-0 🚀

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

Pujan92 · 2023-07-13T14:27:30Z

@roryabraham this PR causes the issue #22750

roryabraham · 2023-07-13T18:37:35Z

src/libs/actions/Report.js

+    const lastVisibleMessage = ReportActionsUtils.getLastVisibleMessage(reportID);
+    let prevVisibleMessageText;
+    if (lastVisibleMessage.lastMessageTranslationKey) {
+        prevVisibleMessageText = Localize.translateLocal(prevVisibleMessageText);


Made a mistake here...

OSBotify · 2023-07-14T14:44:59Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.3.40-5 🚀

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

roryabraham added 4 commits July 11, 2023 16:18

Update tests to more accurately represent real-world CPs

804ebc3

Create getPreviousVersion action

bb2a253

Read version from package.json

a6a37fc

Fetch the correct history in the cherryPick.yml workflow

d13c654

roryabraham requested a review from a team as a code owner July 12, 2023 00:01

roryabraham self-assigned this Jul 12, 2023

melvin-bot bot removed the request for review from a team July 12, 2023 00:02

melvin-bot bot requested a review from AndrewGable July 12, 2023 00:02

Fix incorrect line break

b09df20

roryabraham force-pushed the Rory-FixCPResolveConflicts branch from ca790c8 to b09df20 Compare July 12, 2023 00:03

roryabraham commented Jul 12, 2023

View reviewed changes

roryabraham added 2 commits July 11, 2023 17:13

Merge branch 'main' into Rory-FixCPResolveConflicts

fa3678f

Fix unrelated tests

1a7bbcf

francoisl reviewed Jul 12, 2023

View reviewed changes

.github/actions/javascript/getPreviousVersion/getPreviousVersion.js Outdated Show resolved Hide resolved

Throw error if semverLevel not valid

de52f1f

roryabraham requested review from francoisl July 12, 2023 00:32

francoisl approved these changes Jul 12, 2023

View reviewed changes

roryabraham merged commit 105ba31 into main Jul 12, 2023

roryabraham deleted the Rory-FixCPResolveConflicts branch July 12, 2023 01:05

Pujan92 mentioned this pull request Jul 12, 2023

[HOLD for payment 2023-07-26] [$1000] Attachments not shown for sender, stuck at 'Uploading attachment...' #22750

Closed

2 tasks

roryabraham mentioned this pull request Jul 12, 2023

[No QA] Just fetch main and staging in cherryPick.yml #22758

Merged

58 tasks

OSBotify mentioned this pull request Jul 13, 2023

Deploy Checklist: New Expensify 2023-07-13 #22783

Closed

53 tasks

roryabraham commented Jul 13, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[No QA] Fix CP conflict resolution #22724

[No QA] Fix CP conflict resolution #22724

roryabraham commented Jul 12, 2023

melvin-bot bot commented Jul 12, 2023

francoisl commented Jul 12, 2023 •

edited

Loading

roryabraham Jul 12, 2023

OSBotify commented Jul 12, 2023

OSBotify commented Jul 13, 2023

Pujan92 commented Jul 13, 2023

roryabraham Jul 13, 2023

OSBotify commented Jul 14, 2023

[No QA] Fix CP conflict resolution #22724

[No QA] Fix CP conflict resolution #22724

Conversation

roryabraham commented Jul 12, 2023

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jul 12, 2023

francoisl commented Jul 12, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

roryabraham Jul 12, 2023

Choose a reason for hiding this comment

OSBotify commented Jul 12, 2023

OSBotify commented Jul 13, 2023

Pujan92 commented Jul 13, 2023

roryabraham Jul 13, 2023

Choose a reason for hiding this comment

OSBotify commented Jul 14, 2023

francoisl commented Jul 12, 2023 •

edited

Loading