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

Allow users to permanently dismiss the referral banners #34842

Merged
merged 28 commits into from
Feb 2, 2024

Conversation

tgolen
Copy link
Contributor

@tgolen tgolen commented Jan 19, 2024

Details

This PR allows users to permanently dismiss the referral banners. It was based off #33925

Fixed Issues

$ #34387

Tests

There are four banners to test. For each banner, you should:

  1. Log in with a brand new account
  2. View the banner
  3. Click the X on the banner
  4. Close whatever view has the banner (it's usually in a modal)
  5. Reopen the view that had the banner
  6. Verify that the banner does is no longer visible

The four banners to test are:

  1. Main search window in the footer
  2. The New Chat page from global create
  3. Select participant page when requesting money
  4. Select participant page when sending money
  • Verify that no errors appear in the JS console

Offline tests

  1. Go offline
  2. Dismiss a banner
  3. Verify the banner doesn't display again
  4. Go back online
  5. Verify the banner still doesn't display

QA Steps

Same as the tests above

  • 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 Unable to test due to broken dev emulator
    • 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 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 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 form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label 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

image

Android: mWeb Chrome
iOS: Native

image

iOS: mWeb Safari

image

MacOS: Chrome / Safari

image

MacOS: Desktop

image

@tgolen tgolen self-assigned this Jan 19, 2024
@tgolen tgolen changed the title Tgolen perma dismiss banners [HOLD] Allow users to permanently dismiss the referral banners Jan 19, 2024
package.json Outdated
@@ -58,7 +58,7 @@
"setup-https": "mkcert -install && mkcert -cert-file config/webpack/certificate.pem -key-file config/webpack/key.pem dev.new.expensify.com localhost 127.0.0.1"
},
"dependencies": {
"@dotlottie/react-player": "^1.6.3",
"@dotlottie/react-player": "^1.6.15",
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Note: The changes to this file and the lockfile aren't strictly related to this PR, but it was something that we found and discussed on Slack and it was easy to add the update to my current PR (ref).

@tgolen tgolen changed the title [HOLD] Allow users to permanently dismiss the referral banners Allow users to permanently dismiss the referral banners Jan 25, 2024
@tgolen tgolen marked this pull request as ready for review January 25, 2024 14:48
@tgolen tgolen requested a review from a team as a code owner January 25, 2024 14:48
@melvin-bot melvin-bot bot requested review from hoangzinh and removed request for a team January 25, 2024 14:48
Copy link

melvin-bot bot commented Jan 25, 2024

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

@dylanexpensify
Copy link
Contributor

bump @hoangzinh for review!

@@ -2,19 +2,25 @@ import React, {useState} from 'react';
import {View} from 'react-native';
import ReferralProgramCTA from '@components/ReferralProgramCTA';
import useThemeStyles from '@hooks/useThemeStyles';
import * as User from '@userActions/User';
import CONST from '@src/CONST';

function SearchPageFooter() {
Copy link
Contributor

Choose a reason for hiding this comment

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

Do you think this + its parent redundant components? I found that there are 2 SearchPage components:

  • src/pages/SearchPage.js
  • src/pages/SearchPage/index.js

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is confusing, but yes... this change is mostly redundant because the parent component is being removed in another PR. This was discussed over here.

src/pages/SearchPage.js Outdated Show resolved Hide resolved
src/pages/NewChatPage.js Outdated Show resolved Hide resolved
@hoangzinh
Copy link
Contributor

@tgolen there are some failed on the checklist:

  • perf-tests
  • license/snyk
  • security/snyk

For perf-tests, I think you can merge latest main to fix. 2 others might be related to PR changes on the package.json file.

tgolen and others added 3 commits January 29, 2024 10:10
Co-authored-by: Vinh Hoang <hoangzinhvn@gmail.com>
Co-authored-by: Vinh Hoang <hoangzinhvn@gmail.com>
@tgolen
Copy link
Contributor Author

tgolen commented Jan 29, 2024

I've reverted the package.json change from this PR. Now I'm fixing some of the TS issues. Sorry for pinging you for a review earlier when it wasn't quite ready.

@tgolen
Copy link
Contributor Author

tgolen commented Jan 29, 2024

OK, this is ready for review now. I reverted the change to SearchPage.tsx and SearchPageFooter.js since those files are being removed elsewhere and that's what was causing the performance tests to fail.

@tgolen
Copy link
Contributor Author

tgolen commented Jan 29, 2024

Oops, I still need SearchPageFooter.js 🤦 putting that back...

@tgolen
Copy link
Contributor Author

tgolen commented Jan 29, 2024

OK, I've updated this with the changes necessary for SearchPageFooter and also removed SearchPage.js file completely (or else webpack was confusing it with SearchPage/index.js and not including the proper file).

@hoangzinh
Copy link
Contributor

hoangzinh commented Jan 30, 2024

OK, I've updated this with the changes necessary for SearchPageFooter and also removed SearchPage.js file completely (or else webpack was confusing it with SearchPage/index.js and not including the proper file).

According to the commit histories of SearchPage/index.js, I have same thoughts that we moved SearchPage.js to SearchPage/index.js
Screenshot 2024-01-30 at 08 18 31

But somehow (maybe resolve conflict) the SearchPage.js till there. Unluckily, when I compare the commit histories of SearchPage.js there are some recent commits into this component. That means if we just remove this component, we might lose some code. I think we have 2 options:

  • Option 1: Check and move recent changes from SearchPage.js to SearchPage/index.js in this PR
  • Option 2: Create another GH issue to check & remove SearchPage.js

@tgolen
Copy link
Contributor Author

tgolen commented Jan 30, 2024

OK, considering that I can't get this to work without removing SearchPage.js (due to webpack module resolution preference), I'll look into the first option of copying the few changes over. I'll be able to do that today.

@tgolen
Copy link
Contributor Author

tgolen commented Jan 30, 2024

@hoangzinh I looked at the history of SearchPage.js and I found these two PRs that changed the file significantly.

  • (perf) Implement debounce in OptionList search #33347 implemented a debounced search for the option list. In SearchPage/index.js I see it's using useDebouncedState('') here which should cover the changes from this PR (from how I understand it).
  • [NoQA] [Reassure] SearchPage perf tests #33872 added performance tests to the page, nothing functional. Considering that the performance tests work with SearchPage/index.js, I believe that everything is good here. The one thing to note though is that in [NoQA] [Reassure] SearchPage perf tests #33872 there was a navigation prop that was added, supposedly because This is required because transitionEnd event doesn't trigger in the automated testing environment.. The navigation prop does not exist on SearchPage/index.js and the tests still pass. So that tells me that the navigation prop wasn't necessary or the tests were written in a way that doesn't utilize it.

Conclusion

I think it's fine to remove SearchPage.js in favor of keeping SearchPage/index.js and there are no changes that need to be copied over.

cc @rinej @TMisiukiewicz

@situchan
Copy link
Contributor

I think it's fine to remove SearchPage.js in favor of keeping SearchPage/index.js and there are no changes that need to be copied over.

It will be removed in #35058

@hoangzinh
Copy link
Contributor

sweet. Thanks for checking @tgolen @situchan. I will complete review checklist today

@hoangzinh
Copy link
Contributor

hoangzinh commented Jan 31, 2024

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: mWeb Chrome
    • iOS: Native
    • iOS: mWeb 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(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 form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label 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.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native
Screen.Recording.2024-01-31.at.22.47.31.android.mov
Android: mWeb Chrome
Screen.Recording.2024-01-31.at.22.30.26.android.chrome.mov
iOS: Native
Screen.Recording.2024-01-31.at.22.59.07.ios.mov
iOS: mWeb Safari
Screen.Recording.2024-01-31.at.22.55.09.ios.safari.mov
MacOS: Chrome / Safari
Screen.Recording.2024-01-31.at.22.18.26.web.mov
MacOS: Desktop
Screen.Recording.2024-01-31.at.22.22.41.desktop.mov

Copy link
Contributor

@hoangzinh hoangzinh left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link

melvin-bot bot commented Jan 31, 2024

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

@tgolen
Copy link
Contributor Author

tgolen commented Feb 2, 2024

I resolved conflicts and this is ready for review @tylerkaraszewski

@tylerkaraszewski tylerkaraszewski merged commit bdc554f into main Feb 2, 2024
15 checks passed
@tylerkaraszewski tylerkaraszewski deleted the tgolen-perma-dismiss-banners branch February 2, 2024 16:59
@OSBotify
Copy link
Contributor

OSBotify commented Feb 2, 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 Feb 5, 2024

🚀 Cherry-picked to staging by https://github.com/thienlnam in version: 1.4.36-5 🚀

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

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

1 similar comment
@OSBotify
Copy link
Contributor

OSBotify commented Feb 5, 2024

🚀 Cherry-picked to staging by https://github.com/thienlnam in version: 1.4.36-5 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 failure ❌
🕸 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 Feb 7, 2024

🚀 Deployed to production by https://github.com/Julesssss in version: 1.4.37-7 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 failure ❌
🕸 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.

6 participants