Skip to content

Commit

Permalink
Merge pull request #36111 from bernhardoj/fix/35777-avatar-error-msg-…
Browse files Browse the repository at this point in the history
…styling
  • Loading branch information
francoisl authored Feb 8, 2024
2 parents 8cbbf3d + 310941b commit 10efcfe
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions src/pages/settings/InitialSettingsPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ function InitialSettingsPage(props) {
<>
<OfflineWithFeedback
pendingAction={lodashGet(props.currentUserPersonalDetails, 'pendingFields.avatar', null)}
style={styles.mb3}
style={[styles.mb3, styles.w100]}
>
<AvatarWithImagePicker
isUsingDefaultAvatar={UserUtils.isDefaultAvatar(lodashGet(currentUserDetails, 'avatar', ''))}
Expand All @@ -344,7 +344,6 @@ function InitialSettingsPage(props) {
previewSource={UserUtils.getFullSizeAvatar(avatarURL, accountID)}
originalFileName={currentUserDetails.originalFileName}
headerTitle={props.translate('profilePage.profileAvatar')}
style={[styles.mh5]}
fallbackIcon={lodashGet(currentUserDetails, 'fallbackIcon')}
/>
</OfflineWithFeedback>
Expand Down
2 changes: 1 addition & 1 deletion src/pages/workspace/WorkspaceOverviewPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ function WorkspaceOverviewPage({policy, currencyList, route}) {
)}
type={CONST.ICON_TYPE_WORKSPACE}
fallbackIcon={Expensicons.FallbackWorkspaceAvatar}
style={[styles.mb3, styles.mt5]}
style={[styles.mb3, styles.mt5, styles.mh5]}
isUsingDefaultAvatar={!lodashGet(policy, 'avatar', null)}
onImageSelected={(file) => Policy.updateWorkspaceAvatar(lodashGet(policy, 'id', ''), file)}
onImageRemoved={() => Policy.deleteWorkspaceAvatar(lodashGet(policy, 'id', ''))}
Expand Down

0 comments on commit 10efcfe

Please sign in to comment.