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

Fix patch for new rnmapbox-maps version #41556

Merged
merged 1 commit into from
May 3, 2024

Conversation

francoisl
Copy link
Contributor

@aldo-expensify for context- can you review please? I'm not super clear on the test steps we need for this, I reused the tests from this PR but I don't see how they apply to rnmapbox.

Details

This fixes the following warning when you run npm i on main:

Warning: patch-package detected a patch file version mismatch

  Don't worry! This is probably fine. The patch was still applied
  successfully. Here's the deets:

  Patch file created for

    @rnmapbox/[email protected]

  applied to

    @rnmapbox/[email protected]

  At path

    node_modules/@rnmapbox/maps

  This warning is just to give you a heads-up. There is a small chance of
  breakage even though the patch was applied successfully. Make sure the package
  still behaves like you expect (you wrote tests, right?) and then run

    patch-package @rnmapbox/maps

  to update the version in the patch file name and make this warning go away.

because this PR bumped the version of rnmapbox, without changing the patch that was introduced in #41023.

I generated the new patch with npx patch-package @rnmapbox/maps, it's identical as the existing one.

Fixed Issues

N/A - explained above

Tests

  1. Run npm i
  2. Make sure you don't see any warning from patch-package
  3. Perform the tests from the QA steps section below
  • Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

  1. Create NewDot account (must be in beta accountingOnNewExpensify)
  2. Create Workspace
  3. Go to the Workspace's Settings > More Features
  4. Enable "Accounting"
  5. Go to Workspace's Settings > Accounting
  6. Click "Set Up" in the quickbooks online menu entry
    image
  7. Verify a browser tabs open with the quickbooks authentication page
  8. Close the tab
  9. Verify that NewDot is still working and no crash happened
  • 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
    • 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/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
MacOS: Desktop

@francoisl francoisl self-assigned this May 3, 2024
@francoisl francoisl requested a review from a team as a code owner May 3, 2024 05:44
@melvin-bot melvin-bot bot removed the request for review from a team May 3, 2024 05:44
Copy link

melvin-bot bot commented May 3, 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]

Copy link
Contributor

@aldo-expensify aldo-expensify left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@francoisl I think the testing steps don't make sense to test this change because those steps are for testing the patch fixing a crash in the WebView (not the map). I would say the testing steps should be something like:

  • Remove node_modules
  • Run npm i and make sure that the warning is gone
  • Create a Distance money request and check that the map works fine.

Regarding the patch fix, I'm pretty new in this, my way to verify that just renaming is enough would be to look at what the patch is doing and see if something doesn't apply anymore considering the code changes from version 10.1.11 to 10.1.12:

rnmapbox/maps@v10.1.11...v10.1.12

android/src/main/java/com/rnmapbox/rnmbx/components/camera/RNMBXCamera.kt is the only file the patch is changing that had a difference between versions 10.1.11 to 10.1.12, but the file kept the same number of lines and the patch is modifying something below the changes, so it should be fine.

I removed node_modules and ran npm i, I didn't get the warning:

> [email protected] postinstall
> scripts/postInstall.sh

patch-package 8.0.0
Applying patches...
@onfido/[email protected] ✔
@react-native/[email protected] ✔
@react-native/[email protected] ✔
@react-native/[email protected] (1 onStartReched) ✔
@react-native/[email protected] (2 osr-improvement) ✔
@react-native-camera-roll/[email protected] ✔
@react-native-community/[email protected] ✔
@react-native-community/[email protected] ✔
@react-native-community/[email protected] (1 initial) ✔
@react-native-community/[email protected] (2 turbomodule) ✔
@react-native-firebase/[email protected] ✔
@react-native-firebase/[email protected] ✔
@react-native-firebase/[email protected] ✔
@react-native-firebase/[email protected] ✔
@react-navigation/[email protected] ✔
@react-navigation/[email protected] ✔
@react-navigation/[email protected] (1 initial) ✔
@react-navigation/[email protected] (2 dontDetachScreen) ✔
@rnmapbox/[email protected] ✔
@shopify/flash-list/[email protected] ✔
@shopify/[email protected][email protected][email protected][email protected][email protected][email protected] (1 initial) ✔
[email protected] (2 disableViewRecycling) ✔
[email protected][email protected][email protected] (1 initial) ✔
[email protected] (2 SuspenseFix) ✔
[email protected] (3 iOSFontResolution) ✔
[email protected] (4 AndroidModalSize) ✔
[email protected] (5 TextInputs) ✔
[email protected] (6 Codegen) ✔
[email protected] (7 disableTextInputRecycling) ✔
[email protected] (8 checkForHashMap) ✔
[email protected] (9 properEventDispatchOrder) ✔
[email protected] (10 resetAutoresizingOnView) ✔
[email protected] (11 optionalViewRecycling) ✔
[email protected] (12 disableNonTranslucentStatusBar) ✔
[email protected] (13 exposePrefabs) ✔
[email protected] (14 fix-inverted-flatlist) ✔
[email protected] (14 fixPath) ✔
[email protected] (14 iOSCoreAnimationBorderRendering) ✔
[email protected] (15 fixIOSWebViewCrash) ✔
[email protected][email protected] (1 initial) ✔
[email protected] (2 turbomodule) ✔
[email protected] (1 allowedMimeTypes) ✔
[email protected][email protected][email protected] (1 initial) ✔
[email protected] (2 turbomodule) ✔
[email protected][email protected] (1 fix-boost-dependency) ✔
[email protected] (2 copy-state) ✔
[email protected] (1 fix-screen-type) ✔
[email protected][email protected][email protected][email protected] (1 initial) ✔
[email protected] (2 measureInWindow) ✔
[email protected] (4 fixLastSpacer) ✔
[email protected] (5 image-header-support) ✔
[email protected] (6 fixPointerEventDown) ✔
[email protected] (7 osr-improvement) ✔
[email protected][email protected] ✔

up to date, audited 47 packages in 338ms

5 packages are looking for funding
  run `npm fund` for details

found 0 vulnerabilities

added 3502 packages, changed 2 packages, and audited 3505 packages in 1m

396 packages are looking for funding
  run `npm fund` for details

33 vulnerabilities (20 moderate, 7 high, 6 critical)

To address issues that do not require attention, run:
  npm audit fix

To address all issues possible (including breaking changes), run:
  npm audit fix --force

Some issues need review, and may require choosing
a different dependency.

Run `npm audit` for details.

The map seems to be working fine:

image

@aldo-expensify aldo-expensify merged commit 387ab0e into main May 3, 2024
7 of 8 checks passed
@aldo-expensify aldo-expensify deleted the francois-fix-rnmapbox-patch branch May 3, 2024 17:30
@OSBotify
Copy link
Contributor

OSBotify commented May 3, 2024

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

OSBotify commented May 9, 2024

🚀 Deployed to production by https://github.com/marcaaron in version: 1.4.71-6 🚀

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

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.

3 participants