Fix Opened offline attachment directed to conversation page on online #49832

wildan-m · 2024-09-27T07:14:02Z

Details

Fix offline attachment opening directly to online conversation page. New dismissal behavior confirmed here: #48173 (comment)

Fixed Issues

$ #48173
PROPOSAL: #48173 (comment) (Alternative 3)

Tests

Login
Open a chat
Go offline
Upload an image
Open the image
Go online
Verify that image preview modal not dismissed

Verify that no errors appear in the JS console

Note

There is a known issue in the native platform where the attachment index incorrectly switches even after setting it correctly #49832 (comment). This is a known upstream issue that should be addressed separately #49832 (comment).

Offline tests

Same as test

QA Steps

Same as test

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Kapture.2024-09-27.at.14.02.17.mp4

Android: mWeb Chrome

Kapture.2024-09-27.at.14.05.10.mp4

iOS: Native

Kapture.2024-09-27.at.11.02.28.mp4

iOS: mWeb Safari

Kapture.2024-09-27.at.13.31.57.mp4

MacOS: Chrome / Safari

Kapture.2024-09-27.at.10.41.52.mp4

MacOS: Desktop

Kapture.2024-09-27.at.14.06.18.mp4

…tachment replaced / deleted

… index is similar

…x/48173-dismiss-when-no-attachment-with-same-page-index

melvin-bot · 2024-09-27T07:14:07Z

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

src/components/Attachments/AttachmentCarousel/index.tsx

Co-authored-by: Abdelhafidh Belalia <[email protected]>

s77rt

+Run prettier

s77rt · 2024-09-28T20:34:41Z

src/components/Attachments/AttachmentCarousel/index.tsx

+        let initialPage = targetAttachments.findIndex(compareImage);
+        const prevInitialPage = attachments.findIndex(compareImage);
+
+        // If no matching attachment is found in targetAttachments but found in attachments, update initialPage


This comment is explaining the what not the why. Let's remove it

s77rt · 2024-09-28T20:34:48Z

src/components/Attachments/AttachmentCarousel/index.tsx


-        // Dismiss the modal when deleting an attachment during its display in preview.
-        if (initialPage === -1 && attachments.find(compareImage)) {
+        // If no matching attachment with the same index, dismiss the modal


s77rt · 2024-09-28T20:41:29Z

src/components/Attachments/AttachmentCarousel/index.tsx

+        let initialPage = targetAttachments.findIndex(compareImage);
+        const prevInitialPage = attachments.findIndex(compareImage);


Suggested change

let initialPage = targetAttachments.findIndex(compareImage);

const prevInitialPage = attachments.findIndex(compareImage);

let attachmentIndex = targetAttachments.findIndex(compareImage);

const prevAttachmentIndex = attachments.findIndex(compareImage);

I feel that this naming is more correct. findIndex returns an index and not a page. The index is used as the page id.

s77rt · 2024-09-28T20:47:47Z

src/components/Attachments/AttachmentCarousel/index.tsx

+        const prevInitialPage = attachments.findIndex(compareImage);
+
+        // If no matching attachment is found in targetAttachments but found in attachments, update initialPage
+        if (initialPage === -1 && prevInitialPage !== -1 && targetAttachments[prevInitialPage]) {


Can we avoid comparing with -1 and instead just access the attachment array directly

if (!targetAttachments[attachmentIndex] && targetAttachments[prevAttachmentIndex])

…x/48173-dismiss-when-no-attachment-with-same-page-index

s77rt · 2024-09-29T18:44:10Z

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

+        let attachmentIndex = targetAttachments.findIndex(compareImage);
+        const prevAttachmentIndex = attachments.findIndex(compareImage);


NAB. Another naming clarity. targetAttachments is confusing.

targetAttachments -> newAttachments

attachmentIndex -> newIndex

prevAttachmentIndex -> index

s77rt · 2024-09-29T19:16:04Z

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 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

android.mov

Android: mWeb Chrome

mweb-chrome.mov

iOS: Native

ios.mov

iOS: mWeb Safari

mweb-safari.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

s77rt · 2024-09-29T19:18:50Z

@wildan-m Can you check why on native the attachment changes after getting online?

ios.mov

android.mov

…x/48173-dismiss-when-no-attachment-with-same-page-index

wildan-m · 2024-09-30T02:37:54Z

Can you check why on native the attachment changes after getting online?

that's pretty weird.

@s77rt do you know how to make metro keep logging the log after re-connect?

…x/48173-dismiss-when-no-attachment-with-same-page-index

wildan-m · 2024-10-01T03:44:34Z

@s77rt I've created this simple reproduction step, even without scrolling from reanimated, the pager view itself can't properly work if we replace the pager items without re-mounting.

Kapture.2024-10-01.at.10.31.56.mp4

I think we don't need to report the issue as there are similar issues open.
callstack/react-native-pager-view#597
callstack/react-native-pager-view#791

Minimum reproducible code

import React from 'react';
import { useState } from 'react';
import { Button, SafeAreaView, Text, View, StyleSheet } from 'react-native';
import PagerView from 'react-native-pager-view';

const ids = ['1', '2', '3'];

function getNewArray() {
  const newArray = [...ids];
  newArray[2] = Math.random().toString(36).substring(7); // Generate a random string
  return newArray;
}
export const BasicPagerViewExample = () => {

  const [pagesContent, setPagesContent] = useState<string[]>(getNewArray());
  const [page, setPage] = useState<number>(2);

  console.log(pagesContent);

  return (
    <SafeAreaView style={{ flex: 1 }}>
      <Text style={{ textAlign: 'center' }}>{pagesContent.length}</Text>
      <PagerView orientation="horizontal" style={{ flex: 1, backgroundColor: 'yellow' }} initialPage={page}
        onPageSelected={(e) => {
          console.log('onPageSelected ~ e.nativeEvent.position:', e.nativeEvent.position);
        }}
      >
        {pagesContent.map((content) => (
          <View key={content} style={{ flex: 1,backgroundColor: 'green' }}>
            <View style={{ flex: 1, justifyContent: 'center', alignItems: 'center' , backgroundColor:'red'}}>
              <Text style={{ fontSize: 30 }}>{content}</Text>
            </View>
          </View>
        ))}
      </PagerView>
      <Button
        title={'Replace third page content'}
        onPress={() => {
          setPagesContent(getNewArray());
          setPage(2);
        }}
      />
    </SafeAreaView>
  );
};

export default BasicPagerViewExample

s77rt · 2024-10-01T13:29:03Z

@wildan-m In main if we follow the same steps in native, the attachment will get dismissed, but now it will change to another one? Is that correct? If so I think we should fix the other bug separately since it's not a true regression (the flow is already broken on main)

wildan-m · 2024-10-01T14:06:18Z

In main if we follow the same steps in native, the attachment will get dismissed, but now it will change to another one? Is that correct?

correct

I think we should fix the other bug separately since it's not a true regression (the flow is already broken on main)

@s77rt that's ok, another option is to temporarily implement the component's key solution until upstream fix resolved. I believe the upstream issue is not a simple fix since many people experience it and the mentioned similar issues is open for a long time.

s77rt · 2024-10-01T18:23:06Z

@wildan-m We should not go with workarounds. Fixing this upstream should be the way to go. For now can yoo please revert the recent changed and fix conflicts?

…x/48173-dismiss-when-no-attachment-with-same-page-index

wildan-m · 2024-10-02T02:44:09Z

Can we avoid comparing with -1 and instead just access the attachment array directly

@s77rt I think we can't avoid comparing to -1 after this new eslint rule applied, access array using at(-1) will get the last array item

s77rt · 2024-10-02T11:59:07Z

src/components/Attachments/AttachmentCarousel/index.tsx

+        const index = attachments.findIndex(compareImage);
+
+        // If no matching attachment with the same index, dismiss the modal
+        if (newIndex === -1 && newAttachments.at(index)) {


We need to check if index is not -1 too otherwise newAttachments.at(index) may be truthy (please fix same in other places)

…x/48173-dismiss-when-no-attachment-with-same-page-index

rlinoz

This is looking good, I just have a couple of questions

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

src/components/Attachments/AttachmentCarousel/index.tsx

rlinoz

Works well, thanks!

OSBotify · 2024-10-03T14:29:56Z

✋ 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-10-04T21:16:56Z

🚀 Deployed to staging by https://github.com/rlinoz in version: 9.0.45-1 🚀

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

github-actions · 2024-10-07T22:33:34Z

🚀 Deployed to production by https://github.com/thienlnam in version: 9.0.45-4 🚀

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

wildan-m added 9 commits September 23, 2024 13:37

change attachment target to prevInitialPageRef when current viewed at…

48af2f2

…tachment replaced / deleted

don't dismiss only when the prev attachment with the same initialPage…

6ece814

… index is similar

Merge branch 'main' of https://github.com/wildan-m/App into wildan/fi…

19db64e

…x/48173-dismiss-when-no-attachment-with-same-page-index

Merge branch 'main' of https://github.com/wildan-m/App into wildan/fi…

34ba2c7

…x/48173-dismiss-when-no-attachment-with-same-page-index

remove unnecessary code

2f21ca5

adjust comment

67c1f2b

fix lint, replace deprecated withOnyx

f95d459

implement for native

de935c4

lint fix, replace deprecate withOnyx

ce69418

wildan-m requested a review from a team as a code owner September 27, 2024 07:14

melvin-bot bot requested review from s77rt and removed request for a team September 27, 2024 07:14

wildan-m mentioned this pull request Sep 27, 2024

[HOLD for payment 2024-10-14] [$250] mWeb - Attachment - Opened offline attachment directed to conversation page on online #48173

Closed

6 tasks

wildan-m added 2 commits September 27, 2024 14:51

typecheck fix

613d8f3

remove unused code

f458e85

s77rt suggested changes Sep 27, 2024

View reviewed changes

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

wildan-m and others added 3 commits September 28, 2024 20:40

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

15ac1ed

Co-authored-by: Abdelhafidh Belalia <[email protected]>

refactor

b42d3cd

refactor for native

8ef2085

s77rt suggested changes Sep 28, 2024

View reviewed changes

wildan-m added 4 commits September 29, 2024 20:38

Merge branch 'main' of https://github.com/wildan-m/App into wildan/fi…

e30a878

…x/48173-dismiss-when-no-attachment-with-same-page-index

remove unnecessary comment

ed960b1

access the array directly instead of checking -1 in index

ca1e6d5

adjust comment position

4167773

s77rt suggested changes Sep 29, 2024

View reviewed changes

Merge branch 'main' of https://github.com/wildan-m/App into wildan/fi…

6741ab6

…x/48173-dismiss-when-no-attachment-with-same-page-index

wildan-m added 2 commits October 1, 2024 08:37

Merge branch 'main' of https://github.com/wildan-m/App into wildan/fi…

aaea3ba

…x/48173-dismiss-when-no-attachment-with-same-page-index

Refactor

04d8e9f

wildan-m added 4 commits October 2, 2024 09:02

Merge branch 'main' of https://github.com/wildan-m/App into wildan/fi…

78a920e

…x/48173-dismiss-when-no-attachment-with-same-page-index

revert pager key solution

d76d54d

fix lint

aebb27f

fix lint

8e34c56

wildan-m added 2 commits October 2, 2024 09:50

revert compare with -1 after new eslint rule

7bb7bb2

sync web code with native

eb33707

s77rt suggested changes Oct 2, 2024

View reviewed changes

wildan-m added 2 commits October 2, 2024 22:08

-1 check for array access using .at

2f7068a

Merge branch 'main' of https://github.com/wildan-m/App into wildan/fi…

f104033

…x/48173-dismiss-when-no-attachment-with-same-page-index

s77rt approved these changes Oct 2, 2024

View reviewed changes

melvin-bot bot requested a review from rlinoz October 2, 2024 18:21

rlinoz reviewed Oct 2, 2024

View reviewed changes

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

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

Refine comment, add why point

33cd212

rlinoz approved these changes Oct 3, 2024

View reviewed changes

rlinoz merged commit 90fc8fb into Expensify:main Oct 3, 2024
19 checks passed

github-actions bot mentioned this pull request Oct 4, 2024

Deploy Checklist: New Expensify 2024-10-04 #50274

Closed

53 tasks

lanitochka17 mentioned this pull request Oct 5, 2024

[HOLD #50349] Chat - Opened offline image preview switches to previously uploaded image online #50296

Open

6 tasks

thienlnam mentioned this pull request Oct 7, 2024

[HOLD for payment 2024-11-22] [$250] Fix upstream [react-native-pager-view] - PagerView displays incorrect pages when content changes dynamically without re-mounting #50349

Open

s77rt mentioned this pull request Oct 15, 2024

Fix: Find solution to low resolution large images on Android, and the Canvas crash #20798

Merged

57 tasks

MrRefactor mentioned this pull request Nov 7, 2024

Upgrade react-native-pager-view to 6.5.0 #52166

Merged

49 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix Opened offline attachment directed to conversation page on online #49832

Fix Opened offline attachment directed to conversation page on online #49832

wildan-m commented Sep 27, 2024 •

edited

Loading

melvin-bot bot commented Sep 27, 2024

s77rt left a comment

s77rt Sep 28, 2024

wildan-m Sep 29, 2024

s77rt Sep 28, 2024

wildan-m Sep 29, 2024

s77rt Sep 28, 2024

wildan-m Sep 29, 2024

s77rt Sep 28, 2024

wildan-m Sep 29, 2024

s77rt Sep 29, 2024

wildan-m Sep 30, 2024

s77rt commented Sep 29, 2024 •

edited

Loading

s77rt commented Sep 29, 2024

wildan-m commented Sep 30, 2024

wildan-m commented Oct 1, 2024

s77rt commented Oct 1, 2024

wildan-m commented Oct 1, 2024

s77rt commented Oct 1, 2024

wildan-m commented Oct 2, 2024 •

edited

Loading

s77rt Oct 2, 2024

wildan-m Oct 2, 2024

rlinoz left a comment

rlinoz left a comment

OSBotify commented Oct 3, 2024

github-actions bot commented Oct 4, 2024

github-actions bot commented Oct 7, 2024

		let initialPage = targetAttachments.findIndex(compareImage);
		const prevInitialPage = attachments.findIndex(compareImage);

		let attachmentIndex = targetAttachments.findIndex(compareImage);
		const prevAttachmentIndex = attachments.findIndex(compareImage);

Fix Opened offline attachment directed to conversation page on online #49832

Fix Opened offline attachment directed to conversation page on online #49832

Conversation

wildan-m commented Sep 27, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Sep 27, 2024

s77rt left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

s77rt commented Sep 29, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

s77rt commented Sep 29, 2024

wildan-m commented Sep 30, 2024

wildan-m commented Oct 1, 2024

s77rt commented Oct 1, 2024

wildan-m commented Oct 1, 2024

s77rt commented Oct 1, 2024

wildan-m commented Oct 2, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rlinoz left a comment

Choose a reason for hiding this comment

rlinoz left a comment

Choose a reason for hiding this comment

OSBotify commented Oct 3, 2024

github-actions bot commented Oct 4, 2024

github-actions bot commented Oct 7, 2024

wildan-m commented Sep 27, 2024 •

edited

Loading

s77rt commented Sep 29, 2024 •

edited

Loading

wildan-m commented Oct 2, 2024 •

edited

Loading