Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F3409079
D8280.id27978.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
3 KB
Referenced Files
None
Subscribers
None
D8280.id27978.diff
View Options
diff --git a/web/avatars/emoji-avatar-selection-modal.css b/web/avatars/emoji-avatar-selection-modal.css
--- a/web/avatars/emoji-avatar-selection-modal.css
+++ b/web/avatars/emoji-avatar-selection-modal.css
@@ -31,4 +31,5 @@
justify-content: center;
align-items: center;
min-height: 24px;
+ gap: 4px;
}
diff --git a/web/avatars/emoji-avatar-selection-modal.react.js b/web/avatars/emoji-avatar-selection-modal.react.js
--- a/web/avatars/emoji-avatar-selection-modal.react.js
+++ b/web/avatars/emoji-avatar-selection-modal.react.js
@@ -7,6 +7,7 @@
import { EditUserAvatarContext } from 'lib/components/base-edit-user-avatar-provider.react.js';
import { useModalContext } from 'lib/components/modal-provider.react.js';
+import SWMansionIcon from 'lib/components/SWMansionIcon.react.js';
import {
defaultAnonymousUserEmojiAvatar,
getAvatarForUser,
@@ -33,6 +34,8 @@
const { setUserAvatar, userAvatarSaveInProgress } = editUserAvatarContext;
+ const [errorMessage, setErrorMessage] = React.useState<?string>();
+
const currentUserInfo = useSelector(state => state.currentUserInfo);
const currentUserAvatar: ClientAvatar = getAvatarForUser(currentUserInfo);
const defaultUserAvatar: ClientEmojiAvatar = currentUserInfo?.username
@@ -62,17 +65,33 @@
);
const onEmojiSelect = React.useCallback(selection => {
+ setErrorMessage();
setPendingAvatarEmoji(selection.native);
}, []);
- const onSaveAvatar = React.useCallback(
- () => setUserAvatar(pendingEmojiAvatar),
- [pendingEmojiAvatar, setUserAvatar],
- );
+ const onColorSelection = React.useCallback((hex: string) => {
+ setErrorMessage();
+ setPendingAvatarColor(hex);
+ }, []);
+
+ const onSaveAvatar = React.useCallback(async () => {
+ try {
+ await setUserAvatar(pendingEmojiAvatar);
+ } catch {
+ setErrorMessage('Avatar update failed. Please try again.');
+ }
+ }, [pendingEmojiAvatar, setUserAvatar]);
let saveButtonContent;
if (userAvatarSaveInProgress) {
saveButtonContent = <LoadingIndicator status="loading" size="medium" />;
+ } else if (errorMessage) {
+ saveButtonContent = (
+ <>
+ <SWMansionIcon icon="warning-circle" size={24} />
+ {errorMessage}
+ </>
+ );
} else {
saveButtonContent = 'Save Avatar';
}
@@ -93,18 +112,21 @@
<div className={css.colorSelectorContainer}>
<ColorSelector
currentColor={pendingAvatarColor}
- onColorSelection={setPendingAvatarColor}
+ onColorSelection={onColorSelection}
/>
</div>
<div className={css.saveButtonContainer}>
<Button
variant="filled"
- buttonColor={buttonThemes.standard}
+ buttonColor={
+ errorMessage ? buttonThemes.danger : buttonThemes.standard
+ }
onClick={onSaveAvatar}
disabled={userAvatarSaveInProgress}
>
- <div className={css.saveAvatarButtonContent}></div>
- {saveButtonContent}
+ <div className={css.saveAvatarButtonContent}>
+ {saveButtonContent}
+ </div>
</Button>
</div>
</div>
diff --git a/web/avatars/web-edit-user-avatar-provider.react.js b/web/avatars/web-edit-user-avatar-provider.react.js
--- a/web/avatars/web-edit-user-avatar-provider.react.js
+++ b/web/avatars/web-edit-user-avatar-provider.react.js
@@ -4,8 +4,7 @@
import { BaseEditUserAvatarProvider } from 'lib/components/base-edit-user-avatar-provider.react.js';
-const displayAvatarUpdateFailureAlert = () =>
- alert('Couldn’t save avatar. Please try again later.');
+const displayAvatarUpdateFailureAlert = () => null;
// TODO: Implement `selectFromGallery(...)` for `web`.
const selectFromGallery = async () => null;
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Thu, Dec 5, 2:53 PM (2 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2617308
Default Alt Text
D8280.id27978.diff (3 KB)
Attached To
Mode
D8280: [web] Display `errorMessage` in `saveAvatarButton` on failure
Attached
Detach File
Event Timeline
Log In to Comment