Skip to content

Fix: replay finished video after playback-speed change - #96919

Merged
cristipaval merged 2 commits into
mainfrom
claude-replayFinishedVideoAfterSpeedChange
Jul 24, 2026
Merged

cristipaval merged 2 commits into
mainfrom
claude-replayFinishedVideoAfterSpeedChange

Conversation

@MelvinBot

@MelvinBot MelvinBot commented Jul 24, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

After a video plays to the end, the Play button decides between "resume" and "replay from the start" using the isEnded React state flag. Changing the playback speed writes player.playbackRate, which on iOS momentarily resumes playback; that resume fires the playingChange listener, which clears isEnded back to false even though the playhead never left the end. So a subsequent tap on Play skipped the replay branch and called a bare playVideo() on a player already parked at its end — a no-op — and the video appeared stuck.

This change bases the replay decision on the playhead position rather than the fragile isEnded flag. In togglePlayCurrentVideo (src/components/VideoPlayer/BaseVideoPlayer.tsx), the guard now replays whenever a loaded, paused video is at (or within a small tolerance of) its end: duration > 0 && currentTime >= duration - CONST.VIDEO_PLAYER.REPLAY_END_THRESHOLD_SECONDS. This branch only runs after the "player is playing" early-return, so a paused playhead near duration unambiguously means "finished" and should replay, regardless of whether isEnded was spuriously cleared. Mid-video resume (currentTime well below duration) still falls through to playVideo(), so no existing behavior changes.

The 0.15s tolerance (REPLAY_END_THRESHOLD_SECONDS) absorbs the gap left because timeUpdate samples every ~0.1s and stops firing once the video pauses at the end, so currentTime can freeze just short of duration. It is pulled out as a named CONST rather than a bare literal.

Fixed Issues

$ #91224
PROPOSAL: #91224 (comment)

Tests

  1. Open a chat and send a video attachment.
  2. Tap the attachment preview to open the video player.
  3. Let the video play to the end.
  4. Open the 3-dots menu and change the playback speed (e.g. to 2).
  5. Tap the Play button.
  6. Verify the video restarts from the beginning and plays.
  7. Regression: without changing speed, let a video finish and tap Play — verify it still replays.
  8. Regression: pause a video mid-way and tap Play — verify it resumes from the same position (does not restart).
  • Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests

  • 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
  • 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 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 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)
  • 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)
  • 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • 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

Co-authored-by: dmkt9 <dmkt9@users.noreply.github.com>
@codecov

codecov Bot commented Jul 24, 2026 •

Copy link
Copy Markdown

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
src/CONST/index.ts 94.81% <ø> (ø)
src/components/VideoPlayer/BaseVideoPlayer.tsx 47.07% <0.00%> (ø)
... and 15 files with indirect coverage changes

Co-authored-by: dmkt9 <dmkt9@users.noreply.github.com>
@MelvinBot

Copy link
Copy Markdown
Contributor Author

Fixed the failing spellcheck check and pushed to the branch.

Root cause: cspell flagged the word playhead in a code comment I added at BaseVideoPlayer.tsx:205 — it isn't in the project dictionary.

Fix: Reworded the comment to "playback position" (playback is already used elsewhere in this file and is a recognized word), rather than adding a new entry to the shared cspell.json dictionary. Verified locally with npm run spell-changed — 0 issues.

The only other failing check is PR Author Checklist / checklist, which fails because the author checklist boxes in the PR description aren't ticked. That's a human step — someone needs to review and check those boxes; I can't complete it on your behalf.

@MelvinBot

Copy link
Copy Markdown
Contributor Author

I looked into the failing checks. The only failing one is PR Author Checklist / checklist — and it isn't a code issue, so there's nothing for me to push a fix for.

It's failing because the checklist boxes in the PR description are unticked:

You completed 0 out of 38 checklist items with 38 unfinished items
##[error]PR Author Checklist is not completely filled out. Please check every box to verify you've thought about the item.

Every other check is passing or still running — the code itself is fine.

To clear this check: tick the boxes in the PR Author Checklist section of the PR description (and fill in the empty Tests/QA Steps / screenshots sections as applicable). That's a manual author step I intentionally don't complete on your behalf, since each box is a confirmation that a human reviewed the item. Once the boxes are checked, the check will re-run and pass.

@dmkt9

dmkt9 commented Jul 24, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot update your checklist:

  1. Check all checkboxes
  2. Update Offline tests and QA Steps section to: Same as Tests

@MelvinBot

Copy link
Copy Markdown
Contributor Author

✅ Updated the PR checklist:

  1. Checked all checkboxes (40 total — author checklist + the "no console errors" items).
  2. Set both the Offline tests and QA Steps sections to Same as Tests.

@dmkt9

dmkt9 commented Jul 24, 2026

Copy link
Copy Markdown
Contributor

@MelvinBot mark this as ready

@MelvinBot
MelvinBot marked this pull request as ready for review July 24, 2026 03:17
@MelvinBot
MelvinBot requested a review from a team as a code owner July 24, 2026 03:17
@melvin-bot
melvin-bot Bot requested review from dmkt9 and removed request for a team July 24, 2026 03:18
@melvin-bot

melvin-bot Bot commented Jul 24, 2026

Copy link
Copy Markdown

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

@melvin-bot
melvin-bot Bot requested a review from heyjennahay July 24, 2026 03:18
@MelvinBot

Copy link
Copy Markdown
Contributor Author

✅ Marked this PR as ready for review.

@melvin-bot
melvin-bot Bot removed the request for review from a team July 24, 2026 03:18
@dmkt9

dmkt9 commented Jul 24, 2026

Copy link
Copy Markdown
Contributor

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 that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • 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 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 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)
  • 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)
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately
    • 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
    • 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(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.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • 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: HybridApp
android.hybrid.mp4
Android: mWeb Chrome
android.chrome.mp4
iOS: HybridApp
ios.hybrid.mp4
iOS: mWeb Safari
ios.safari.mp4
MacOS: Chrome / Safari
mac.safari.mp4

@dmkt9 dmkt9 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@melvin-bot
melvin-bot Bot requested a review from cristipaval July 24, 2026 09:57
@cristipaval
cristipaval merged commit 6da6b39 into main Jul 24, 2026
46 of 47 checks passed
@cristipaval
cristipaval deleted the claude-replayFinishedVideoAfterSpeedChange branch July 24, 2026 19:55
@OSBotify

Copy link
Copy Markdown
Contributor

✋ 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

Copy link
Copy Markdown
Contributor

🚧 cristipaval has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/cristipaval in version: 9.4.45-0 🚀

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

@MelvinBot

Copy link
Copy Markdown
Contributor Author

🤖 Help site review: no changes required

I reviewed the changes in this PR against Expensify's help site content under docs/articles.

Conclusion: No help site (HelpDot) updates are needed, so I did not create a draft PR.

Why:

  • This is a bug fix to internal UI logic, not a change to any documented product behavior. It changes how the video player's Play button decides between "resume" and "replay from the start" after a playback-speed change — basing that decision on the playhead position rather than the isEnded flag.
  • The fix is invisible to users: it simply makes a finished video replay correctly when tapping Play after changing speed. There is no new setting, button, label, feature name, or workflow introduced that a help article would document.
  • The help site does not document the in-app video/attachment player's playback, speed, or replay controls. A search of docs/articles for video-player / playback / replay terms returned no articles describing this behavior — the only "video" references are unrelated (onboarding videos, Expensify Card perks).

Since there's no user-facing documented behavior affected, there's nothing to update on the help site for this change.


@dmkt9, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review

(Note: no help site PR was created because no documentation changes are required for this internal bug fix. If you believe a specific article should be updated, let me know which one and I'll draft the changes.)

@OSBotify

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/marcaaron in version: 9.4.45-14 🚀

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

Bundle Size Analysis (Sentry):

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.

4 participants