Page MenuHomePhorge
Files F32512558

D7403.1767116324.diff
No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

D7403.1767116324.diff
View Options

diff --git a/native/navigation/route-names.js b/native/navigation/route-names.js
--- a/native/navigation/route-names.js
+++ b/native/navigation/route-names.js
@@ -25,7 +25,6 @@
import type { ImageModalParams } from '../media/image-modal.react.js';
import type { VideoPlaybackModalParams } from '../media/video-playback-modal.react.js';
import type { CustomServerModalParams } from '../profile/custom-server-modal.react.js';
-import type { EmojiAvatarCreationParams } from '../profile/emoji-avatar-creation.react.js';
import type { RelationshipListItemTooltipModalParams } from '../profile/relationship-list-item-tooltip-modal.react.js';
export const ActionResultModalRouteName = 'ActionResultModal';
@@ -140,7 +139,7 @@
export type ProfileParamList = {
+ProfileScreen: void,
- +EmojiAvatarCreation: EmojiAvatarCreationParams,
+ +EmojiAvatarCreation: void,
+EditPassword: void,
+DeleteAccount: void,
+BuildInfo: void,
diff --git a/native/profile/emoji-avatar-creation.react.js b/native/profile/emoji-avatar-creation.react.js
--- a/native/profile/emoji-avatar-creation.react.js
+++ b/native/profile/emoji-avatar-creation.react.js
@@ -4,30 +4,26 @@
import { View, Text, TouchableWithoutFeedback } from 'react-native';
import EmojiPicker from 'rn-emoji-keyboard';
+import { savedEmojiAvatarSelectorForCurrentUser } from 'lib/selectors/user-selectors.js';
import type { ClientEmojiAvatar } from 'lib/types/avatar-types.js';
-import type { ProfileNavigationProp } from './profile.react.js';
import Avatar from '../components/avatar.react.js';
import Button from '../components/button.react.js';
import ColorRows from '../components/color-rows.react.js';
-import type { NavigationRoute } from '../navigation/route-names.js';
+import { useSelector } from '../redux/redux-utils.js';
import { useStyles } from '../themes/colors.js';
-export type EmojiAvatarCreationParams = {
- +emojiAvatarInfo: ClientEmojiAvatar,
-};
-
-type Props = {
- +navigation: ProfileNavigationProp<'EmojiAvatarCreation'>,
- +route: NavigationRoute<'EmojiAvatarCreation'>,
-};
-
-function EmojiAvatarCreation(props: Props): React.Node {
- const { emoji: initalEmoji, color: initialColor } =
- props.route.params.emojiAvatarInfo;
+function EmojiAvatarCreation(): React.Node {
+ const savedEmojiAvatarFunc = useSelector(
+ savedEmojiAvatarSelectorForCurrentUser,
+ );
- const [pendingEmoji, setPendingEmoji] = React.useState<string>(initalEmoji);
- const [pendingColor, setPendingColor] = React.useState<string>(initialColor);
+ const [pendingEmoji, setPendingEmoji] = React.useState<string>(
+ () => savedEmojiAvatarFunc().emoji,
+ );
+ const [pendingColor, setPendingColor] = React.useState<string>(
+ () => savedEmojiAvatarFunc().color,
+ );
const [emojiKeyboardOpen, setEmojiKeyboardOpen] =
React.useState<boolean>(false);
@@ -42,9 +38,11 @@
}, []);
const onPressReset = React.useCallback(() => {
- setPendingEmoji(initalEmoji);
- setPendingColor(initialColor);
- }, [initalEmoji, initialColor]);
+ const resetEmojiAvatar = savedEmojiAvatarFunc();
+
+ setPendingEmoji(resetEmojiAvatar.emoji);
+ setPendingColor(resetEmojiAvatar.color);
+ }, [savedEmojiAvatarFunc]);
const onEmojiSelected = React.useCallback(emoji => {
setPendingEmoji(emoji.emoji);

File Metadata

Mime Type
text/plain
Expires
Tue, Dec 30, 5:38 PM (1 h, 29 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5868516
Default Alt Text
D7403.1767116324.diff (3 KB)

Event Timeline