fix: show video control when video ended #51218

nkdengineer · 2024-10-22T04:08:59Z

Details

Fixed Issues

$ #50179
PROPOSAL: #50179 (comment)

Tests

Create a new account in ND
On the onboarding menu, tap on "Get paid back from my employer"
Input any name and tap on the "Continue" button
Tap on "Concierge"
Tap on the video
Wait until the video ends
Verify that: video control is displayed

Verify that no errors appear in the JS console

Offline tests

same as above

QA Steps

same as 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
- 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.mov

Android: mWeb Chrome

android-mweb.mov

iOS: Native

ios.mov

iOS: mWeb Safari

ios-mweb.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

melvin-bot · 2024-10-30T16:54:29Z

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

ishpaul777 · 2024-10-31T21:23:55Z

On my radar will review tomorrow!

ishpaul777 · 2024-11-01T17:29:32Z

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 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 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 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 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.
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-11-17.at.8.55.07.PM.mov

Android: mWeb Chrome

Screen.Recording.2024-11-17.at.8.58.28.PM.mov

iOS: Native

Screen.Recording.2024-11-11.at.11.28.44.PM.mov

iOS: mWeb Safari

Screen.Recording.2024-11-11.at.11.19.13.PM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-11-11.at.11.11.37.PM.mov

MacOS: Desktop

Screen.Recording.2024-11-17.at.9.04.30.PM-1.mov

ishpaul777 · 2024-11-01T18:09:36Z

bug: when hover out, the video control not hiding when video is played second time

Screen.Recording.2024-11-01.at.11.40.06.PM.mov

nkdengineer · 2024-11-05T09:42:08Z

@ishpaul777 i fixed, please check again

ishpaul777 · 2024-11-05T20:28:01Z

@ishpaul777 i fixed, please check again

still same behaviour, seems not fixed:

Screen.Recording.2024-11-06.at.1.55.19.AM.mov

nkdengineer · 2024-11-08T03:29:04Z

I'll give an update soon

nkdengineer · 2024-11-11T09:16:54Z

Screen.Recording.2024-11-11.at.16.14.49.mov

@ishpaul777 i fixed, please check again

ishpaul777 · 2024-11-11T18:24:10Z

@nkdengineer Thanks, that issue seems fixed but i have notice that on Android app, the video keeps looping after ended, it restart this does not seem to be the case on other platforms and on main

Screen.Recording.2024-11-11.at.11.30.42.PM.mov

nkdengineer · 2024-11-14T04:22:24Z

I'm investigating

nkdengineer · 2024-11-14T10:35:45Z

@ishpaul777 i fixed, please check again 🙏

neil-marcellini · 2024-11-19T22:31:47Z

src/components/VideoPlayer/BaseVideoPlayer.tsx

@@ -213,7 +225,7 @@ function BaseVideoPlayer({
            const currentDuration = status.durationMillis || videoDuration * 1000;
            const currentPositon = status.positionMillis || 0;

-            if (shouldReplayVideo(status, isVideoPlaying, currentDuration, currentPositon)) {
+            if (shouldReplayVideo(status, isVideoPlaying, currentDuration, currentPositon) && !isEnded) {


NAB: I think it's ok, but why do we need to check !isEnded here? If it's needed, can we make it part of shouldReplayVideo? I'm going to trust all the testing you guys did so you can explain and fix after I merge it.

this is added because on android spefically, when the video is just ended it starts replaying as we auto the control ui bar, i think yes we can make it part of shouldReplayVideo @nkdengineer

OSBotify · 2024-11-19T22:51:04Z

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

github-actions · 2024-11-21T01:43:53Z

🚀 Deployed to staging by https://github.com/neil-marcellini in version: 9.0.65-0 🚀

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

github-actions · 2024-11-22T19:47:53Z

🚀 Deployed to production by https://github.com/chiragsalian in version: 9.0.65-5 🚀

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

nkdengineer added 4 commits October 22, 2024 11:08

fix: show video control when video ended

eee882c

Merge branch 'main' into fix/50179

b314c86

merge main

3918a74

fix show video controler in native

4d20eaa

nkdengineer marked this pull request as ready for review October 30, 2024 16:54

nkdengineer requested a review from a team as a code owner October 30, 2024 16:54

melvin-bot bot requested review from ishpaul777 and removed request for a team October 30, 2024 16:54

nkdengineer mentioned this pull request Oct 30, 2024

[HOLD for payment 2024-11-29] [$250] Onboarding tasks - Blank attachment screen is displayed after onboarding video ends #50179

Open

6 tasks

nkdengineer added 4 commits November 4, 2024 16:55

Merge branch 'main' into fix/50179

9edcd63

Merge branch 'main' into fix/50179

451fdf3

update isEnd to false when the video is playing

d5490b8

remove log

4acf40c

Merge branch 'main' into fix/50179

ada188d

fix: add dependency

19759cb

nkdengineer added 2 commits November 14, 2024 16:16

Merge branch 'main' into fix/50179

9cd9a6b

fix: looping in android

a674901

ishpaul777 approved these changes Nov 17, 2024

View reviewed changes

melvin-bot bot requested a review from neil-marcellini November 17, 2024 15:49

Merge branch 'main' into fix/50179

93b3f60

neil-marcellini approved these changes Nov 19, 2024

View reviewed changes

neil-marcellini merged commit 3c906a1 into Expensify:main Nov 19, 2024
16 checks passed

github-actions bot mentioned this pull request Nov 21, 2024

Deploy Checklist: New Expensify 2024-11-21 #52862

Closed

65 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: show video control when video ended #51218

fix: show video control when video ended #51218

nkdengineer commented Oct 22, 2024 •

edited

Loading

melvin-bot bot commented Oct 30, 2024

ishpaul777 commented Oct 31, 2024

ishpaul777 commented Nov 1, 2024 •

edited

Loading

ishpaul777 commented Nov 1, 2024 •

edited

Loading

nkdengineer commented Nov 5, 2024

ishpaul777 commented Nov 5, 2024

nkdengineer commented Nov 8, 2024

nkdengineer commented Nov 11, 2024

ishpaul777 commented Nov 11, 2024

nkdengineer commented Nov 14, 2024

nkdengineer commented Nov 14, 2024

neil-marcellini Nov 19, 2024

ishpaul777 Nov 21, 2024

OSBotify commented Nov 19, 2024

github-actions bot commented Nov 21, 2024

github-actions bot commented Nov 22, 2024

fix: show video control when video ended #51218

fix: show video control when video ended #51218

Conversation

nkdengineer commented Oct 22, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Oct 30, 2024

ishpaul777 commented Oct 31, 2024

ishpaul777 commented Nov 1, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

ishpaul777 commented Nov 1, 2024 • edited Loading

nkdengineer commented Nov 5, 2024

ishpaul777 commented Nov 5, 2024

nkdengineer commented Nov 8, 2024

nkdengineer commented Nov 11, 2024

ishpaul777 commented Nov 11, 2024

nkdengineer commented Nov 14, 2024

nkdengineer commented Nov 14, 2024

neil-marcellini Nov 19, 2024

Choose a reason for hiding this comment

ishpaul777 Nov 21, 2024

Choose a reason for hiding this comment

OSBotify commented Nov 19, 2024

github-actions bot commented Nov 21, 2024

github-actions bot commented Nov 22, 2024

nkdengineer commented Oct 22, 2024 •

edited

Loading

ishpaul777 commented Nov 1, 2024 •

edited

Loading

ishpaul777 commented Nov 1, 2024 •

edited

Loading