Fix - Attachment - When opening the last one, the first added Public Image is opened by FitseTLT · Pull Request #55901 · Expensify/App

FitseTLT · 2025-01-28T21:38:33Z

Details

This PR will allow the identification of identical attachments (attachments with the same source url) in report actions. So we add attachment-id to all attachments inside report action message which is the report action id concatenated with the specific order index the attachment appears in the report action then we use this attachment id to correctly navigate between attachments in attachment carousel.

Fixed Issues

$ #53690
PROPOSAL: #53690 (comment)

Tests

Go to any conversation
Send an attachment
Send this image markdown text as a message ![off](https://images.unsplash.com/photo-1709983723739-d72ea88434dd?q=80&w=2940&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D)
Send another attachment than in step (2)
Send the text in Step 3 again
Open the image from the Image markdown text in step 5
Click on the left arrow
Verify you are navigated to the image in step 4

Test 2:

Send this message

A. Good morning B. Good afternoon

C. ![off](https://images.unsplash.com/photo-1709983723739-d72ea88434dd?q=80&w=2940&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D)

F. ![hi](https://letsenhance.io/static/73136da51c245e80edc6ccfe44888a99/1015f/MainBefore.jpg)

G. ![off](https://images.unsplash.com/photo-1709983723739-d72ea88434dd?q=80&w=2940&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D)

H. ![hi](https://letsenhance.io/static/73136da51c245e80edc6ccfe44888a99/1015f/MainBefore.jpg)

Press any of the inline image and verify that navigation between the attachments in the attachment carousel works as expected by pressing previous and next buttons.

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

Screenshots/Videos

Android: Native

a.IM.mp4

Android: mWeb Chrome

aw.imd.mp4

iOS: Native

i.MD.mp4

iOS: mWeb Safari

iw.IMD.mp4

MacOS: Chrome / Safari

w.IMD.mp4

MacOS: Desktop

d.IMD.mp4

melvin-bot · 2025-01-28T21:38:38Z

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

…n-report-actions

dominictb · 2025-02-16T14:53:12Z

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.ts 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.
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: Native

Screen.Recording.2025-03-05.at.16.06.19.mov

Android: mWeb Chrome

Screen.Recording.2025-03-05.at.16.01.05.mov

iOS: Native

Screen.Recording.2025-03-05.at.15.47.37.mov

iOS: mWeb Safari

Screen.Recording.2025-03-05.at.15.53.30.mov

MacOS: Chrome / Safari

Screen.Recording.2025-03-05.at.15.43.40.mov

MacOS: Desktop

Screen.Recording.2025-03-05.at.15.46.44-compressed.mov

dominictb · 2025-02-16T14:53:29Z

@roryabraham Please assign this PR to me as well.

src/components/Attachments/AttachmentCarousel/Pager/index.tsx

src/components/Attachments/AttachmentCarousel/index.native.tsx

src/pages/home/report/ReportAttachments.tsx

…n-report-actions

dominictb · 2025-03-05T08:50:16Z

@FitseTLT Please pull main.

dominictb · 2025-03-05T09:03:49Z

@FitseTLT BUG: Press any inline image within the same message always opens the first inline image:

Send this message:

C. ![off](https://images.unsplash.com/photo-1709983723739-d72ea88434dd?q=80&w=2940&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D)

F. ![hi](https://letsenhance.io/static/73136da51c245e80edc6ccfe44888a99/1015f/MainBefore.jpg)

G. ![off](https://images.unsplash.com/photo-1709983723739-d72ea88434dd?q=80&w=2940&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D)

H. ![hi](https://letsenhance.io/static/73136da51c245e80edc6ccfe44888a99/1015f/MainBefore.jpg)

Press any inline image in the above message
It always opens the first image

Screen.Recording.2025-03-05.at.15.59.25.mov

dominictb · 2025-03-05T09:06:29Z

@FitseTLT BUG: Not found modal opens when pressing any inline image within the same message with preceding text

Send this message (same inline images above, just with some preceding text):

A. Good morning B. Good afternoon

C. ![off](https://images.unsplash.com/photo-1709983723739-d72ea88434dd?q=80&w=2940&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D)

F. ![hi](https://letsenhance.io/static/73136da51c245e80edc6ccfe44888a99/1015f/MainBefore.jpg)

G. ![off](https://images.unsplash.com/photo-1709983723739-d72ea88434dd?q=80&w=2940&auto=format&fit=crop&ixlib=rb-4.0.3&ixid=M3wxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8fA%3D%3D)

H. ![hi](https://letsenhance.io/static/73136da51c245e80edc6ccfe44888a99/1015f/MainBefore.jpg)

Press any inline image
Verify it opens not found modal

Screen.Recording.2025-03-05.at.16.00.46.mov

…n-report-actions

FitseTLT · 2025-03-05T16:40:47Z

Wow, What a catch! 👏 Appreciate it BTW @dominictb I will ping as soon as I reach a fix Thx

…n-report-actions

FitseTLT · 2025-03-11T16:38:26Z

Problem fixed 👍 @dominictb

dominictb · 2025-03-11T16:39:44Z

Can you summarize the root cause and your solution? @FitseTLT

FitseTLT · 2025-03-11T18:03:04Z

Can you summarize the root cause and your solution? @FitseTLT

@dominictb my previous approach was based on identifying an attachment with its report action id but u came up with a tricky test case where multiple attachments can exist in a report action so now I have implemented an attachment-id approach which is the report action id concatenated with its attachment index inside the report action. Moreover, I initially didn't consider video attachments but I have included it now because videos can still exist in a markdown format (for e.g. if you comment a text and add a video attachment)

…n-report-actions

dominictb · 2025-03-20T19:48:12Z

So far I cannot find any other issues but as this is a substantial amount of changes, I need more time to proof test this.

Screen.Recording.2025-03-21.at.02.46.34.mov

FitseTLT · 2025-03-20T19:53:03Z

Appreciate that Thx take ur time 👍

…n-report-actions

src/components/Attachments/AttachmentCarousel/Pager/index.tsx

dominictb · 2025-03-26T08:53:59Z

src/components/Attachments/AttachmentCarousel/extractAttachments.ts

        const hasBeenFlagged = decision === CONST.MODERATION.MODERATOR_DECISION_PENDING_HIDE || decision === CONST.MODERATION.MODERATOR_DECISION_HIDDEN;
-        const html = getReportActionHtml(action).replace('/>', `data-flagged="${hasBeenFlagged}" data-id="${action.reportActionID}"/>`);
-        htmlParser.write(html);
+        const html = getReportActionHtml(action).replaceAll('/>', `data-flagged="${hasBeenFlagged}" data-id="${action.reportActionID}"/>`);


Why do we replaceAll here?

WE need to add hasBeenFlagged and data-id for the case where we will have multiple attachments inside a report action.

src/components/Attachments/AttachmentCarousel/index.native.tsx

src/components/Attachments/AttachmentCarousel/index.tsx

dominictb · 2025-03-26T11:50:11Z

src/components/Attachments/types.ts

    /** Report action ID of the attachment */
    reportActionID?: string;

+    /** The attachment id, which is the id of the report action it is in appended with its attachment index. */


Suggested change

/** The attachment id, which is the id of the report action it is in appended with its attachment index. */

/** The attachment id, which is the concatenation of the report action id it is in and its order within that report action, starting from 1. */

I wonder if "order" here makes sense?

order makes sense but starting form 1 is too much detail WDYT

src/components/Attachments/AttachmentCarousel/types.ts

src/libs/ReportActionsUtils.ts

src/components/Attachments/AttachmentCarousel/extractAttachments.ts

src/libs/ReportActionsUtils.ts

dominictb · 2025-03-26T12:49:01Z

@FitseTLT Also update the Details section to describe the changes in this PR.

…n-report-actions

FitseTLT · 2025-03-26T17:18:42Z

@FitseTLT Also update the Details section to describe the changes in this PR.

Done

dominictb

@FitseTLT Minor updates. And we're good to go.

src/libs/ReportActionsUtils.ts

dominictb · 2025-03-26T20:37:09Z

@FitseTLT Also please update the Tests to include the identical inline images test case.

FitseTLT · 2025-03-26T20:55:17Z

@FitseTLT Also please update the Tests to include the identical inline images test case.

Updated

…n-report-actions

dominictb

OSBotify · 2025-03-31T21:41:57Z

✋ 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 · 2025-04-01T15:38:07Z

🚀 Deployed to staging by https://github.com/roryabraham in version: 9.1.22-0 🚀

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

github-actions · 2025-04-03T11:39:29Z

🚀 Deployed to production by https://github.com/grgia in version: 9.1.22-10 🚀

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

add reportActionID in image markdown link

8b79181

FitseTLT requested a review from a team as a code owner January 28, 2025 21:38

melvin-bot bot requested review from abdulrahuman5196 and removed request for a team January 28, 2025 21:38

FitseTLT added 2 commits January 29, 2025 01:01

fix lint

b901c99

Merge branch 'main' into fix-unable-to-uniquely-link-to-image-markdow…

26ccb1f

…n-report-actions

dominictb suggested changes Mar 3, 2025

View reviewed changes

src/components/Attachments/AttachmentCarousel/Pager/index.tsx Outdated Show resolved Hide resolved

src/components/Attachments/AttachmentCarousel/index.native.tsx Outdated Show resolved Hide resolved

dominictb reviewed Mar 3, 2025

View reviewed changes

src/pages/home/report/ReportAttachments.tsx Show resolved Hide resolved

FitseTLT added 3 commits March 3, 2025 17:56

Merge branch 'main' into fix-unable-to-uniquely-link-to-image-markdow…

107d4ef

…n-report-actions

minor revert

0305da2

update variable names

4103510

Merge branch 'main' into fix-unable-to-uniquely-link-to-image-markdow…

23ec417

…n-report-actions

roryabraham assigned FitseTLT, roryabraham and dominictb Mar 8, 2025

FitseTLT added 5 commits March 10, 2025 17:20

Merge branch 'main' into fix-unable-to-uniquely-link-to-image-markdow…

b5dab49

…n-report-actions

add report action id on video route

4c2b419

implement attachmentID approach

b1d9d7a

Merge branch 'main' into fix-unable-to-uniquely-link-to-image-markdow…

fba9f2f

…n-report-actions

lint fix

1819a69

roryabraham unassigned dominictb Mar 11, 2025

FitseTLT added 3 commits March 13, 2025 21:57

Merge branch 'main' into fix-unable-to-uniquely-link-to-image-markdow…

25ef409

…n-report-actions

refactor code

a52d41c

minor fix

805681e

FitseTLT requested a review from dominictb March 13, 2025 20:11

FitseTLT added 2 commits March 21, 2025 15:48

Merge branch 'main' into fix-unable-to-uniquely-link-to-image-markdow…

27d060f

…n-report-actions

add flag to all attachments in a report action

4529fa1

dominictb suggested changes Mar 26, 2025

View reviewed changes

FitseTLT added 2 commits March 26, 2025 19:42

Merge branch 'main' into fix-unable-to-uniquely-link-to-image-markdow…

aea585f

…n-report-actions

update on the comments

c74a7db

update the regex

8d47d6f

dominictb suggested changes Mar 26, 2025

View reviewed changes

src/libs/ReportActionsUtils.ts Outdated Show resolved Hide resolved

src/libs/ReportActionsUtils.ts Outdated Show resolved Hide resolved

FitseTLT added 2 commits March 26, 2025 23:58

Merge branch 'main' into fix-unable-to-uniquely-link-to-image-markdow…

d15ac85

…n-report-actions

minor update

450f5f8

FitseTLT requested a review from dominictb March 26, 2025 21:01

dominictb approved these changes Mar 26, 2025

View reviewed changes

melvin-bot bot requested a review from roryabraham March 26, 2025 21:20

roryabraham approved these changes Mar 31, 2025

View reviewed changes

roryabraham merged commit 958a7f4 into Expensify:main Mar 31, 2025
17 checks passed

github-actions bot mentioned this pull request Apr 1, 2025

Deploy Checklist: New Expensify 2025-04-01 #59448

Closed

60 tasks

melvin-bot bot mentioned this pull request Apr 3, 2025

[Due for payment 2025-04-10] [$250] Attachment - When opening the last one, the first added Public Image is opened #53690

Closed

8 tasks

	/** The attachment id, which is the id of the report action it is in appended with its attachment index. */
	/** The attachment id, which is the concatenation of the report action id it is in and its order within that report action, starting from 1. */

Conversation

FitseTLT commented Jan 28, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Jan 28, 2025

Uh oh!

dominictb commented Feb 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

dominictb commented Feb 16, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dominictb commented Mar 5, 2025

Uh oh!

dominictb commented Mar 5, 2025

Uh oh!

dominictb commented Mar 5, 2025

Uh oh!

FitseTLT commented Mar 5, 2025

Uh oh!

FitseTLT commented Mar 11, 2025

Uh oh!

dominictb commented Mar 11, 2025

Uh oh!

FitseTLT commented Mar 11, 2025

Uh oh!

dominictb commented Mar 20, 2025

Uh oh!

FitseTLT commented Mar 20, 2025

Uh oh!

Uh oh!

dominictb Mar 26, 2025

Choose a reason for hiding this comment

Uh oh!

FitseTLT Mar 26, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

dominictb Mar 26, 2025

Choose a reason for hiding this comment

Uh oh!

FitseTLT Mar 26, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dominictb commented Mar 26, 2025

Uh oh!

FitseTLT commented Mar 26, 2025

Uh oh!

dominictb left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

dominictb commented Mar 26, 2025

Uh oh!

FitseTLT commented Mar 26, 2025

Uh oh!

dominictb left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Mar 31, 2025

Uh oh!

github-actions bot commented Apr 1, 2025

FitseTLT commented Jan 28, 2025 •

edited

Loading

dominictb commented Feb 16, 2025 •

edited

Loading