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

Update react-native to Expensify fork #9841

Merged
merged 2 commits into from
Aug 5, 2022

Conversation

janicduplessis
Copy link
Contributor

@janicduplessis janicduplessis commented Jul 12, 2022

Details

This updates the RN files to 0.69 and to our fork. Some changes:

  • Min iOS version is now 12.4 as per RN
  • Android compile sdk is 31

Other libraries updated:

  • @react-native-async-storage/async-storage, urbanairship-react-native: Android sdk 31 build issue
  • react-native-gesture-handler, react-native-reanimated: General RN 0.69 compat
  • react-native-pdf: Fix for removed ViewPropTypes
  • rn-fetch-blob -> react-native-blob-util: react-native-pdf requires installing react-native-blob-util now, which is actually a fork of rn-fetch-blob so it is impossible to use both at the same time. react-native-blob-util is supposed to have the same api as rn-fetch-blob, but might want to double check features that use this. This also avoids having to patch rn-fetch-blob.
  • react-native-keyboard-spacer: Removed and vendored code with removed ViewPropTypes usage. Could also be possible to patch, but library is only 1 simple file and hasn't been updated in years.

Note that this also fixes M1 mac compatibility issues I've had.

Fixed Issues

$ GH_LINK

Tests

  • Verify that no errors appear in the JS console

Tested that the app builds and open a few screens on iOS and Android

TODO: Test something that uses react-native-blob-util

PR Review Checklist

Contributor (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 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 included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • iOS / native
    • Android / native
    • iOS / Safari
    • Android / Chrome
    • MacOS / Chrome
    • 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 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 was added in all src/languages/* files
    • I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team 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)
  • [ x 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 */
    • Any functional components have the displayName property
    • 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 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 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.
  • I have checked off every checkbox in the PR author checklist, including those that don't apply to this PR.

PR Reviewer Checklist

The Contributor+ will copy/paste it into a new comment and complete it after the author checklist is completed

  • 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 verified tests pass on all platforms & I tested again on:
    • iOS / native
    • Android / native
    • iOS / Safari
    • Android / Chrome
    • MacOS / Chrome
    • 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 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 was added in all src/languages/* files
    • I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team 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 */
    • Any functional components have the displayName property
    • 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 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 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.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

QA Steps

This is a significant PR that affects the whole app, but it does not really have specific QA steps.

That said, this PR coincidentally includes the remaining changes that were needed to complete #7962, so please retest that issue and post the results in the issue. Thank you.

  • Verify that no errors appear in the JS console

Screenshots

Web

Mobile Web

Desktop

iOS

Android

@github-actions
Copy link
Contributor

github-actions bot commented Jul 12, 2022

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

@janicduplessis
Copy link
Contributor Author

I have read the CLA Document and I hereby sign the CLA

@janicduplessis
Copy link
Contributor Author

CLA link is broken btw :)

@janicduplessis janicduplessis changed the title Update react-native to 0.69 and build from source on Android Update react-native to Expensify fork Aug 5, 2022
@roryabraham
Copy link
Contributor

Getting this error locally:

image

Going to try running what it says

@janicduplessis
Copy link
Contributor Author

That happens when running pod install?

@roryabraham
Copy link
Contributor

roryabraham commented Aug 5, 2022

That happens when running pod install?

Yes. Also cleaned everything and tried again w/o success.

@janicduplessis
Copy link
Contributor Author

Ok I get the error too if I delete my ios/Pods folder

@roryabraham
Copy link
Contributor

Running pod update hermes-engine --no-repo-update fixed it and resulted in a diff in Podfile.lock to bump hermes-engine to 0.69.3. So we should commit that.

@janicduplessis janicduplessis marked this pull request as ready for review August 5, 2022 06:12
@janicduplessis janicduplessis requested a review from a team as a code owner August 5, 2022 06:12
@melvin-bot melvin-bot bot requested review from Justicea83 and removed request for a team August 5, 2022 06:13
@janicduplessis
Copy link
Contributor Author

Ok podfile should be good now

Copy link
Contributor

@roryabraham roryabraham left a comment

Choose a reason for hiding this comment

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

Overall code changes look good. Still needs more thorough testing

@Override
public ReactNativeHost getReactNativeHost() {
// if (BuildConfig.IS_NEW_ARCHITECTURE_ENABLED) {
Copy link
Contributor

Choose a reason for hiding this comment

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

Should uncomment this because it will end up being the same with the current BuildConfig anyways

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I wanted to avoid creating 2 ReactNativeHost instances by removing this https://github.com/Expensify/App/pull/9841/files#diff-bc1549da6355f7f82f324af9c667b78ff60672b6b80219062629fe4184e8fa93R60, then it won't compile if that doesn't exist.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I could also just remove that code completely, but wanted to stay close to template

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Other option could be to do private final ReactNativeHost mNewArchitectureNativeHost = null

@roryabraham

This comment was marked as outdated.

@janicduplessis
Copy link
Contributor Author

Yea I saw, I was able to fix a couple ones, but Network tests are still failing. I actually tried updating jest thinking it might be the cause of failures, so might not be related.

Copy link
Contributor

@Justicea83 Justicea83 left a comment

Choose a reason for hiding this comment

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

Can we add these changes to the build.gradle file

configurations.all {
        resolutionStrategy {
            force 'org.xerial:sqlite-jdbc:3.34.0'
        }
    }

Coming from this slack thead

@roryabraham
Copy link
Contributor

@kidroca if you have any spare cycles could you help us investigate why the network tests are failing on this PR? I know you helped write a lot of them so might have some more ideas?

@roryabraham
Copy link
Contributor

@janicduplessis
Copy link
Contributor Author

@Justicea83 I don't have access to this slack convo, but will add. This is in root build.gradle right? I know using allprojects make sure it will apply to everything.

@roryabraham
Copy link
Contributor

[Justice's change request] is in root build.gradle right? I know using allprojects make sure it will apply to everything.

Yes! Looks like it should go in android/build.gradle not android/app/build.gradle

Copy link
Contributor

@Justicea83 Justicea83 left a comment

Choose a reason for hiding this comment

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

Looks great!

@roryabraham
Copy link
Contributor

Not sure if we really care right now, but I'm seeing a ton of these log lines in XCode:

image

@roryabraham
Copy link
Contributor

iOS app seems to be working perfectly as far as I can tell (including push notification tests) 🎉

Android up next...

@roryabraham
Copy link
Contributor

Okay, Android seems to be working as expected as well (though it's very, very slow, I don't think that's related to this PR)

@roryabraham roryabraham dismissed Justicea83’s stale review August 5, 2022 23:34

Dismissing because he said "Looks great!" above and his change request was met

@roryabraham roryabraham merged commit 97eb8bb into Expensify:main Aug 5, 2022
@OSBotify
Copy link
Contributor

OSBotify commented Aug 5, 2022

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@roryabraham
Copy link
Contributor

I was also testing on web + desktop all the way through by sending messages back and forth between the mobile and web/desktop apps

@kidroca
Copy link
Contributor

kidroca commented Aug 6, 2022

@roryabraham

@kidroca if you have any spare cycles could you help us investigate why the network tests are failing on this PR? I know you helped write a lot of them so might have some more ideas?

Seems you figured it out already 👍

@roryabraham
Copy link
Contributor

Yep, thanks! Why the changes were necessary on this PR, I have no idea 🙃

Comment on lines +79 to 82
"react": "18.0.0",
"react-collapse": "^5.1.0",
"react-content-loader": "^6.1.0",
"react-dom": "^17.0.2",
Copy link
Contributor

Choose a reason for hiding this comment

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

@janicduplessis @roryabraham
Any reason for react-dom to stay on 17 while React is updated to 18?
Usually they have to be the same (major) version

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I wanted to avoid updating it as I'm not sure react-native-web is compatible yet. From our testing it works just fine. The react package doesn't really include much code, it is basically just a facade for react-dom / react-native renderers.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updating to react-dom 18 would be really nice to do in a follow up tho :)

Copy link
Contributor

Choose a reason for hiding this comment

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

I'm going to continue working on updating our react-native-web fork, and we can update react-dom when we update NewDot to point at the updated react-native-web fork?

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.

6 participants