-
Notifications
You must be signed in to change notification settings - Fork 2.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Room settings-Members added/deleted in a room in offline mode are not grayed out/crossed #35355
Conversation
@alitoshmatov 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] |
@alitoshmatov any updates? |
Will take a look today |
Sorry This one went under my radar, @tienifr I don't have access to expensifail account, is this required? |
Bump @tienifr |
@alitoshmatov Sorry for this delay. I'm back from holiday. Yah, we don't need expensifail account. I just removed it in steps |
src/languages/en.ts
Outdated
people: { | ||
error: { | ||
genericAdd: 'There was a problem adding this room member.', | ||
genericRemove: 'There was a problem removing that room member.', |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This sounds a little bit of, especially that room member
part. Did someone confirm this texts?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think what you have here is fine.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually, let's add the Waiting for copy
label and get official @Expensify/marketing sign-off.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah, I don't think the "Waiting for copy" label works on pull requests! It looks like this is for a generic error message and we can't drill down into more specific reasoning?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Also, where will these messages show up exactly and how will they look?
Not knowing much else, I'd suggest slight tweaks:
- There was a problem adding this member to the room.
- There was a problem removing this member from the room.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@jamesdeanexpensify Thanks for your suggestion. What about Spanish?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Getting a check here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@alitoshmatov I want to hear your feedbacks first, then I'll ask the translated text on Slack. Should we need to update the translation first? |
@tienifr Yes, I mean we need to confirm text for both languages |
@alitoshmatov Raised to Slack conversation: https://expensify.slack.com/archives/C01GTK53T8Q/p1708421757460889 |
@tienifr Just a heads up that you've got merge conflicts. Not sure if it's better to resolve them now wait till after marketing reviews the error copy. |
@deetergp Fixed the conflicts |
@tienifr @alitoshmatov Should we get an ES re-translation of the updated EN text? Also, there appear to be failing TypeScript checks. |
@jamesdeanexpensify Can you help check the ES translation? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
@tienifr Looks like you've collected a few merge conflicts. Once you sort those out, we'll get a final review in and ship this puppy 🚀 |
@deetergp @alitoshmatov This PR introduced other solution to fix the bug, so I need more time to resolve the conflict and re-test |
@alitoshmatov I think the added/deleted room is fixed in this PR: #35883, we can revert these changes and just keep the fix for strike though bug. Wdyt? |
@tienifr I agree we should still apply strikethrough on delete because it is part of the main issue |
It looks to me like strikethrough is already a part of #35883. Is there anything more to do here? |
@deetergp The strikethrough bug still happens on main web-resize.mp4 |
@deetergp wdyt about my comment above ^? Thanks |
@alitoshmatov I just resolved the conflicts, can you help take a look at it? Thanks |
@tienifr It is still not working on me. Can you recheck Screen.Recording.2024-03-17.at.3.41.54.PM.mov |
@alitoshmatov we're removing the deleting member in web-resize.mp4 |
I am just confused now with expected behavior here, are we 100% sure that strikethrough is expected behavior at this point? @deetergp Can you confirm? |
@alitoshmatov I believe it's the expected behavior since we have that logic in |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, code looks good to me, we can finally merge it. cc: @deetergp
Screen.Recording.2024-03-20.at.10.57.42.PM.mov
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code looks good and tested well for me on web. Thanks for seeing it through 👍
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
🚀 Deployed to staging by https://github.com/deetergp in version: 1.4.56-0 🚀
|
🚀 Deployed to production by https://github.com/yuwenmemon in version: 1.4.56-8 🚀
|
Details
Fixed Issues
$ #31764
PROPOSAL: #31764 (comment)
Tests
Offline tests
Same as above
QA Steps
PR Author Checklist
### Fixed Issues
section aboveTests
sectionOffline steps
sectionQA steps
sectiontoggleReport
and notonIconClick
)myBool && <MyComponent />
.src/languages/*
files and using the translation methodWaiting for Copy
label for a copy review on the original GH to get the correct copy.STYLE.md
) were followedAvatar
, I verified the components usingAvatar
are working as expected)/** comment above it */
this
are necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);
ifthis.submit
is never passed to a component event handler likeonClick
)StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)ScrollView
component to make it scrollable when more elements are added to the page.main
branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to theTest
steps.Screenshots/Videos
Android: Native
Screen.Recording.2024-01-30.at.11.36.22.mov
Android: mWeb Chrome
Screen.Recording.2024-01-30.at.11.40.42.mov
iOS: Native
Screen.Recording.2024-01-30.at.11.22.02.mov
iOS: mWeb Safari
Screen.Recording.2024-01-30.at.11.04.08.mov
MacOS: Chrome / Safari
Screen.Recording.2024-01-30.at.10.54.04.mov
MacOS: Desktop
Screen.Recording.2024-01-30.at.11.09.12.mp4