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

Revert "replace onModalHide with onDismiss for the web" #15563

Merged
merged 1 commit into from
Feb 28, 2023

Conversation

cristipaval
Copy link
Contributor

@cristipaval cristipaval commented Feb 28, 2023

The PR which we revert PR introduced a regression. We want to revert it because this has an impact on all modals, since the changes apply to BaseModal component.

Reverts #15298

Fixed Issues

$ #15559

@cristipaval cristipaval requested a review from a team as a code owner February 28, 2023 16:32
@cristipaval cristipaval self-assigned this Feb 28, 2023
@melvin-bot melvin-bot bot requested review from eVoloshchak and removed request for a team February 28, 2023 16:32
@MelvinBot
Copy link

@flodnv @eVoloshchak One of you needs to 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]

@mollfpr
Copy link
Contributor

mollfpr commented Feb 28, 2023

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 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 correct English and 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 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

@cristipaval cristipaval removed the request for review from eVoloshchak February 28, 2023 16:51
@flodnv flodnv merged commit 0962a8c into main Feb 28, 2023
@flodnv flodnv deleted the revert-15298-fix-issue-14848 branch February 28, 2023 17:33
@melvin-bot melvin-bot bot added the Emergency label Feb 28, 2023
@MelvinBot
Copy link

@flodnv looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@flodnv
Copy link
Contributor

flodnv commented Feb 28, 2023

Straight revert, no need for checks to pass.

@github-actions
Copy link
Contributor

Performance Comparison Report 📊

Significant Changes To Duration

There are no entries

Meaningless Changes To Duration

Show entries
Name Duration
Open Search Page TTI 609.653 ms → 658.405 ms (+48.753 ms, +8.0%)
App start TTI 703.226 ms → 712.734 ms (+9.509 ms, +1.4%)
App start nativeLaunch 19.033 ms → 20.125 ms (+1.092 ms, +5.7%)
App start regularAppStart 0.014 ms → 0.014 ms (+0.001 ms, +4.2%)
App start runJsBundle 188.375 ms → 185.750 ms (-2.625 ms, -1.4%)
Show details
Name Duration
Open Search Page TTI Baseline
Mean: 609.653 ms
Stdev: 25.534 ms (4.2%)
Runs: 570.4394940002821 578.191284999717 582.3362229997292 585.2411299999803 585.7609870000742 586.9606119999662 587.9270020001568 588.005900000222 589.6792399999686 591.45544399973 592.5898449998349 595.1455900003202 596.6801760001108 598.3327630003914 605.1341149997897 608.5200199997053 609.2926849997602 609.4044599998742 609.675414999947 611.9497079998255 612.4167080000043 614.2043049996719 616.7769380002283 623.0401209997945 623.1794030000456 623.759561999701 635.0183520000428 636.312826000154 637.9355869996361 655.54634599993 663.1658120001666 684.8070479999296

Current
Mean: 658.405 ms
Stdev: 16.679 ms (2.5%)
Runs: 618.1450199997053 622.4651289996691 625.9871020000428 633.9864099998958 649.3017990002409 649.6175130000338 649.9773360001855 650.8259689998813 651.8830570001155 654.1209720000625 654.4641110002995 655.3621820001863 655.5010579996742 656.0836600000039 656.907105000224 659.4591479999945 660.1216639997438 660.8466799999587 661.2154950001277 661.2521970001981 665.9792889999226 666.4847009996884 666.7171640000306 667.8610839997418 672.631876999978 674.2742920001037 675.0347909997217 677.6865639998578 680.1636560000479 684.4428310003132 691.7650960003957
App start TTI Baseline
Mean: 703.226 ms
Stdev: 19.763 ms (2.8%)
Runs: 664.5113909998909 667.2413189997897 670.685531000141 671.087404999882 679.7449839999899 683.0539509998634 685.0922190002166 686.2076110001653 687.565955999773 691.5206090002321 693.6993120000698 695.6556569999084 700.7582189999521 702.4151650001295 705.4510719999671 709.5097730001435 711.8274059998803 712.5220630001277 713.6543430001475 713.7411170001142 714.5807230002247 714.9721300001256 719.7731759999879 719.9813569998369 722.9250070000999 722.9433499998413 723.209635999985 723.7967940000817 727.8016690001823 731.7321150000207 732.3362590000033

Current
Mean: 712.734 ms
Stdev: 23.996 ms (3.4%)
Runs: 665.8572599999607 671.2870930000208 677.0858559999615 683.6210509999655 685.1940640001558 688.8950149999 693.4605479999445 695.6443289997987 699.7773460000753 700.2431970001198 700.6801970000379 707.5696550002322 709.8105859998614 711.4020750001073 711.6739730001427 712.1959199998528 714.2709289998747 718.9589479998685 719.9312939997762 722.24561299989 722.4136049998924 722.9414519998245 726.2502939999104 727.3100669998676 727.9353289999999 730.6908840001561 731.2548710000701 734.4773760000244 747.2434999998659 762.476590000093 771.9642389998771
App start nativeLaunch Baseline
Mean: 19.033 ms
Stdev: 1.354 ms (7.1%)
Runs: 17 17 18 18 18 18 18 18 18 18 18 19 19 19 19 19 19 19 19 19 19 19 20 20 20 20 20 20 23 23

Current
Mean: 20.125 ms
Stdev: 2.792 ms (13.9%)
Runs: 17 17 17 18 18 18 18 18 18 18 18 19 19 19 19 19 19 19 20 20 20 20 20 21 21 23 23 24 25 25 27 27
App start regularAppStart Baseline
Mean: 0.014 ms
Stdev: 0.001 ms (5.4%)
Runs: 0.012329000048339367 0.012409999966621399 0.012614000122994184 0.012736000120639801 0.012979999650269747 0.012980000115931034 0.013061999808996916 0.01310200011357665 0.013304999563843012 0.013305999804288149 0.013345999643206596 0.013549999799579382 0.013631000183522701 0.013631999958306551 0.013671999797224998 0.013712000101804733 0.013712999876588583 0.013753000181168318 0.013793000020086765 0.01383400009945035 0.0138349998742342 0.013916000258177519 0.014037999790161848 0.014038000255823135 0.014241999946534634 0.014486000407487154 0.014526000246405602 0.014566999860107899 0.014648000244051218 0.015015000011771917 0.01570700015872717

Current
Mean: 0.014 ms
Stdev: 0.001 ms (5.6%)
Runs: 0.01293900003656745 0.012980000115931034 0.013183999806642532 0.0134680001065135 0.01346899988129735 0.013590999878942966 0.013671999797224998 0.013671999797224998 0.013753000181168318 0.013753000181168318 0.013793999794870615 0.013793999794870615 0.013874999713152647 0.013996999710798264 0.014119000174105167 0.014159999787807465 0.014200999867171049 0.014281999785453081 0.014444999862462282 0.01448499970138073 0.014525999780744314 0.01460800040513277 0.014812000095844269 0.014851999934762716 0.0148930000141263 0.014934000093489885 0.014973999932408333 0.015137000009417534 0.015705999918282032 0.015910000074654818 0.016276000067591667
App start runJsBundle Baseline
Mean: 188.375 ms
Stdev: 13.580 ms (7.2%)
Runs: 158 163 163 168 168 172 177 178 178 184 184 186 191 191 192 192 193 194 195 195 195 196 197 198 198 198 199 201 201 204 209 210

Current
Mean: 185.750 ms
Stdev: 11.739 ms (6.3%)
Runs: 163 163 169 169 174 177 178 178 178 179 180 182 183 183 183 185 185 186 187 188 188 192 192 194 194 194 195 200 201 207 208 209

@OSBotify
Copy link
Contributor

🚀 Cherry-picked to staging by https://github.com/yuwenmemon in version: 1.2.77-3 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

@OSBotify
Copy link
Contributor

OSBotify commented Mar 2, 2023

🚀 Deployed to production by https://github.com/yuwenmemon in version: 1.2.77-4 🚀

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

@OSBotify
Copy link
Contributor

🚀 Cherry-picked to staging by https://github.com/AndrewGable in version: 1.3.28-2 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/AndrewGable in version: 1.3.28-5 🚀

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.

5 participants