Skip to content

fix: Workspace Avatar Error is impossible to dismiss #37874

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.

Sign up for GitHub

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

Merged
grgia merged 8 commits into from
Mar 21, 2024
Merged

fix: Workspace Avatar Error is impossible to dismiss #37874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
33a0c3e
fix: Workspace Avatar Error is impossible to dismiss
dukenv0307 Mar 7, 2024
0636836
feat: add margin top error
dukenv0307 Mar 7, 2024
f806160
fix margin bottom workspace detail
dukenv0307 Mar 7, 2024
800c99c
fix lint
dukenv0307 Mar 7, 2024
af8e55a
Merge branch 'main' into fix/37819
dukenv0307 Mar 11, 2024
9aaad39
fix: error style in workspace detail
dukenv0307 Mar 11, 2024
57f164f
fix: style avatar with picker
dukenv0307 Mar 12, 2024
fa1cedc
Merge branch 'main' into fix/37819
dukenv0307 Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/components/AvatarWithImagePicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,11 +287,12 @@ function AvatarWithImagePicker({

return (
<View style={StyleSheet.flatten([styles.alignItemsCenter, style])}>
<View style={[styles.pRelative, avatarStyle]}>
<View style={styles.w100}>

@grgia grgia Mar 18, 2024

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.

Have you QA'd this change on both the Initial Settings Page and the Workspace Profile Page?

@dukenv0307 dukenv0307 Mar 18, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Yes, we also reviewed and tested Initial Settings Page.

<OfflineWithFeedback
pendingAction={pendingAction}
errors={errors}
errorRowStyles={errorRowStyles}
style={type === CONST.ICON_TYPE_AVATAR && styles.alignItemsCenter}
onClose={onErrorClose}
>
<Tooltip
Expand All @@ -310,6 +311,7 @@ function AvatarWithImagePicker({
accessibilityLabel={translate('avatarWithImagePicker.editImage')}
disabled={isAvatarCropModalOpen || (disabled && !enablePreview)}
disabledStyle={disabledStyle}
style={[styles.pRelative, avatarStyle]}
ref={anchorRef}
>
<View>
Expand Down
4 changes: 2 additions & 2 deletions src/pages/workspace/WorkspaceProfilePage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ function WorkspaceProfilePage({policy, currencyList = {}, route}: WorkSpaceProfi
type={CONST.ICON_TYPE_WORKSPACE}
fallbackIcon={Expensicons.FallbackWorkspaceAvatar}
style={[
isSmallScreenWidth ? styles.mb1 : styles.mb3,
policy?.errorFields?.avatar ?? isSmallScreenWidth ? styles.mb1 : styles.mb3,

@grgia grgia Mar 18, 2024

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.

Should we only be evalutating isSmallScreenWidth ? styles.mb1 : styles.mb3 if there's an error? Before we always hit this check

@dukenv0307 dukenv0307 Mar 18, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

We should apply style mb1 if there's an error or the device is small screen width.

isSmallScreenWidth ? styles.mtn17 : styles.mtn20,
styles.alignItemsStart,
styles.sectionMenuItemTopDescription,
Expand All @@ -146,7 +146,7 @@ function WorkspaceProfilePage({policy, currencyList = {}, route}: WorkSpaceProfi
originalFileName={policy?.originalFileName}
disabled={readOnly}
disabledStyle={styles.cursorDefault}
errorRowStyles={undefined}
errorRowStyles={styles.mt3}
/>
<OfflineWithFeedback pendingAction={policy?.pendingFields?.generalSettings}>
<MenuItemWithTopDescription
Expand Down