fix: disabled download button when downloading by nkdengineer · Pull Request #44760 · Expensify/App

nkdengineer · 2024-07-03T05:14:06Z

Details

Fixed Issues

$ #43546
PROPOSAL: #43546 (comment)

Tests

Open any conversation have attachment
Click on download
Verify that: download option is disable and show loading spinner

Verify that no errors appear in the JS console

Offline tests

QA Steps

Open any conversation have attachment
Click on download
Verify that: download option is disable and show loading spinner

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android.mov

Android: mWeb Chrome

android.mov

iOS: Native

ios.mov

iOS: mWeb Safari

ios-mweb.mov

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

desktop.mov

melvin-bot · 2024-07-04T04:44:39Z

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

situchan · 2024-07-04T05:41:21Z

@Expensify/design does this look good?

345698348-82a0143a-c7d8-446b-9ba9-549f17b80deb.mov

shawnborton · 2024-07-04T07:04:49Z

I think that looks good to me!

dannymcclain · 2024-07-04T13:49:10Z

Yeah I like it!

nkdengineer · 2024-07-08T03:36:05Z

@situchan friendly bump

situchan · 2024-07-10T20:48:34Z

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

android1.mp4

android2.mp4

Android: mWeb Chrome

iOS: Native

ios.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

situchan · 2024-07-10T21:05:20Z

src/pages/home/report/ContextMenu/BaseReportActionContextMenu.tsx

+    const message = Array.isArray(reportAction?.message) ? reportAction?.message?.at(-1) ?? null : reportAction?.message ?? null;
+    const html = message?.html ?? '';
+    const {sourceURL} = getAttachmentDetails(html);
+    const sourceID = (sourceURL?.match(CONST.REGEX.ATTACHMENT_ID) ?? [])[1];


NAB: Can we make util for this?

I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)

situchan · 2024-07-10T21:40:56Z

Please pull main as 2k+ commits are behind

situchan · 2024-07-11T20:07:51Z

@nkdengineer there's conflict

situchan · 2024-07-11T20:12:42Z

src/libs/ReportUtils.ts

 }

+function getSourceIDFromReportAction(reportAction: OnyxEntry<ReportAction>): string {
+    const message = Array.isArray(reportAction?.message) ? reportAction?.message?.at(-1) ?? null : reportAction?.message ?? null;


There's still duplicated code in ContextMenuActions

App/src/pages/home/report/ContextMenu/ContextMenuActions.tsx

Lines 40 to 43 in 3fd1644

function getActionHtml(reportAction: OnyxInputOrEntry<ReportAction>): string {

const message = Array.isArray(reportAction?.message) ? reportAction?.message?.at(-1) ?? null : reportAction?.message ?? null;

return message?.html ?? '';

}

App/src/pages/home/report/ContextMenu/ContextMenuActions.tsx

Lines 518 to 521 in 3fd1644

const html = getActionHtml(reportAction);

const {originalFileName, sourceURL} = getAttachmentDetails(html);

const sourceURLWithAuth = addEncryptedAuthTokenToURL(sourceURL ?? '');

const sourceID = (sourceURL?.match(CONST.REGEX.ATTACHMENT_ID) ?? [])[1];

@situchan I think using the utils function in the onPress function does not bring much benefit because variables like originalFileName, sourceURL, sourceURLWithAuth, etc., are all reused below.

situchan · 2024-07-17T05:37:23Z

Please resolve conflict

nkdengineer · 2024-07-17T06:59:49Z

@situchan resolved, please check again

situchan

Looks good

madmax330 · 2024-07-24T19:11:55Z

Looks like there's conflicts to resolve

nkdengineer · 2024-07-25T03:05:02Z

@madmax330 resolved, please check again

OSBotify · 2024-07-25T17: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.

OSBotify · 2024-07-26T05:36:14Z

🚀 Deployed to staging by https://github.com/madmax330 in version: 9.0.13-0 🚀

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

OSBotify · 2024-07-29T18:39:26Z

🚀 Deployed to production by https://github.com/luacmartins in version: 9.0.13-4 🚀

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

nkdengineer added 2 commits July 3, 2024 10:36

fix: disabled download button when downloading

2465982

fix: add loading spinner

4687fc6

nkdengineer marked this pull request as ready for review July 4, 2024 04:44

nkdengineer requested a review from a team as a code owner July 4, 2024 04:44

melvin-bot bot requested review from situchan and removed request for a team July 4, 2024 04:44

nkdengineer mentioned this pull request Jul 4, 2024

[HOLD for payment 2024-08-05] [$250] Web - Attachment - Downloads can be requested continuously while the file is still loading #43546

Closed

6 tasks

situchan reviewed Jul 10, 2024

View reviewed changes

nkdengineer added 3 commits July 11, 2024 10:47

Merge branch 'main' into fix/43546

922dd8c

Merge branch 'main' into fix/43546

bc084aa

create new utils func

7dc244b

situchan reviewed Jul 11, 2024

View reviewed changes

resolve conflict

386ab86

resolved conflict

4eec89b

situchan reviewed Jul 18, 2024

View reviewed changes

Merge branch 'main' into fix/43546

e6183ad

situchan approved these changes Jul 24, 2024

View reviewed changes

melvin-bot bot requested a review from madmax330 July 24, 2024 05:57

fix conflict

01b8fce

madmax330 approved these changes Jul 25, 2024

View reviewed changes

madmax330 merged commit 2bd9f0e into Expensify:main Jul 25, 2024

github-actions bot mentioned this pull request Jul 26, 2024

Deploy Checklist: New Expensify 2024-07-26 #46264

Closed

48 tasks

	function getActionHtml(reportAction: OnyxInputOrEntry<ReportAction>): string {
	const message = Array.isArray(reportAction?.message) ? reportAction?.message?.at(-1) ?? null : reportAction?.message ?? null;
	return message?.html ?? '';
	}

	const html = getActionHtml(reportAction);
	const {originalFileName, sourceURL} = getAttachmentDetails(html);
	const sourceURLWithAuth = addEncryptedAuthTokenToURL(sourceURL ?? '');
	const sourceID = (sourceURL?.match(CONST.REGEX.ATTACHMENT_ID) ?? [])[1];

Conversation

nkdengineer commented Jul 3, 2024 • 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 Jul 4, 2024

Uh oh!

situchan commented Jul 4, 2024

Uh oh!

shawnborton commented Jul 4, 2024

Uh oh!

dannymcclain commented Jul 4, 2024

Uh oh!

nkdengineer commented Jul 8, 2024

Uh oh!

situchan commented Jul 10, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

situchan Jul 10, 2024

Choose a reason for hiding this comment

Uh oh!

nkdengineer Jul 11, 2024

Choose a reason for hiding this comment

Uh oh!

situchan commented Jul 10, 2024

Uh oh!

situchan commented Jul 11, 2024

Uh oh!

situchan Jul 11, 2024

Choose a reason for hiding this comment

Uh oh!

nkdengineer Jul 15, 2024

Choose a reason for hiding this comment

Uh oh!

situchan commented Jul 17, 2024

Uh oh!

nkdengineer commented Jul 17, 2024

Uh oh!

situchan left a comment

Choose a reason for hiding this comment

Uh oh!

madmax330 commented Jul 24, 2024

Uh oh!

nkdengineer commented Jul 25, 2024

Uh oh!

OSBotify commented Jul 25, 2024

Uh oh!

OSBotify commented Jul 26, 2024

Uh oh!

OSBotify commented Jul 29, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

nkdengineer commented Jul 3, 2024 •

edited

Loading

situchan commented Jul 10, 2024 •

edited

Loading