Page MenuHomePhabricator
Files F3520518

D8348.id29216.diff
No OneTemporary
Actions

D8348.id29216.diff
View Options

diff --git a/lib/components/base-edit-user-avatar-provider.react.js b/lib/components/edit-user-avatar-provider.react.js
rename from lib/components/base-edit-user-avatar-provider.react.js
rename to lib/components/edit-user-avatar-provider.react.js
--- a/lib/components/base-edit-user-avatar-provider.react.js
+++ b/lib/components/edit-user-avatar-provider.react.js
@@ -53,7 +53,7 @@
type Props = {
+children: React.Node,
};
-function BaseEditUserAvatarProvider(props: Props): React.Node {
+function EditUserAvatarProvider(props: Props): React.Node {
const { children } = props;
const registrationModeRef =
@@ -139,4 +139,4 @@
);
}
-export { EditUserAvatarContext, BaseEditUserAvatarProvider };
+export { EditUserAvatarContext, EditUserAvatarProvider };
diff --git a/native/account/registration/avatar-selection.react.js b/native/account/registration/avatar-selection.react.js
--- a/native/account/registration/avatar-selection.react.js
+++ b/native/account/registration/avatar-selection.react.js
@@ -7,7 +7,7 @@
import {
EditUserAvatarContext,
type UserAvatarSelection,
-} from 'lib/components/base-edit-user-avatar-provider.react.js';
+} from 'lib/components/edit-user-avatar-provider.react.js';
import RegistrationButtonContainer from './registration-button-container.react.js';
import RegistrationButton from './registration-button.react.js';
diff --git a/native/account/registration/emoji-avatar-selection.react.js b/native/account/registration/emoji-avatar-selection.react.js
--- a/native/account/registration/emoji-avatar-selection.react.js
+++ b/native/account/registration/emoji-avatar-selection.react.js
@@ -4,7 +4,7 @@
import * as React from 'react';
import { Text } from 'react-native';
-import { EditUserAvatarContext } from 'lib/components/base-edit-user-avatar-provider.react.js';
+import { EditUserAvatarContext } from 'lib/components/edit-user-avatar-provider.react.js';
import { getDefaultAvatar } from 'lib/shared/avatar-utils.js';
import RegistrationContainer from './registration-container.react.js';
diff --git a/native/avatars/avatar-hooks.js b/native/avatars/avatar-hooks.js
--- a/native/avatars/avatar-hooks.js
+++ b/native/avatars/avatar-hooks.js
@@ -10,7 +10,7 @@
import { useSafeAreaInsets } from 'react-native-safe-area-context';
import { uploadMultimedia } from 'lib/actions/upload-actions.js';
-import { EditUserAvatarContext } from 'lib/components/base-edit-user-avatar-provider.react.js';
+import { EditUserAvatarContext } from 'lib/components/edit-user-avatar-provider.react.js';
import {
extensionFromFilename,
filenameFromPathOrURI,
diff --git a/native/avatars/edit-user-avatar.react.js b/native/avatars/edit-user-avatar.react.js
--- a/native/avatars/edit-user-avatar.react.js
+++ b/native/avatars/edit-user-avatar.react.js
@@ -5,7 +5,7 @@
import * as React from 'react';
import { ActivityIndicator, TouchableOpacity, View } from 'react-native';
-import { EditUserAvatarContext } from 'lib/components/base-edit-user-avatar-provider.react.js';
+import { EditUserAvatarContext } from 'lib/components/edit-user-avatar-provider.react.js';
import { useENSAvatar } from 'lib/hooks/ens-cache.js';
import { getETHAddressForUserInfo } from 'lib/shared/account-utils.js';
import type { GenericUserInfoWithAvatar } from 'lib/types/avatar-types.js';
diff --git a/native/profile/emoji-user-avatar-creation.react.js b/native/profile/emoji-user-avatar-creation.react.js
--- a/native/profile/emoji-user-avatar-creation.react.js
+++ b/native/profile/emoji-user-avatar-creation.react.js
@@ -3,7 +3,7 @@
import invariant from 'invariant';
import * as React from 'react';
-import { EditUserAvatarContext } from 'lib/components/base-edit-user-avatar-provider.react.js';
+import { EditUserAvatarContext } from 'lib/components/edit-user-avatar-provider.react.js';
import { savedEmojiAvatarSelectorForCurrentUser } from 'lib/selectors/user-selectors.js';
import { useNativeSetUserAvatar } from '../avatars/avatar-hooks.js';
diff --git a/native/root.react.js b/native/root.react.js
--- a/native/root.react.js
+++ b/native/root.react.js
@@ -18,7 +18,7 @@
import { Provider } from 'react-redux';
import { PersistGate as ReduxPersistGate } from 'redux-persist/es/integration/react.js';
-import { BaseEditUserAvatarProvider } from 'lib/components/base-edit-user-avatar-provider.react.js';
+import { EditUserAvatarProvider } from 'lib/components/edit-user-avatar-provider.react.js';
import { ENSCacheProvider } from 'lib/components/ens-cache-provider.react.js';
import { MediaCacheProvider } from 'lib/components/media-cache-provider.react.js';
import { actionLogger } from 'lib/utils/action-logger.js';
@@ -269,7 +269,7 @@
<ActionSheetProvider>
<ENSCacheProvider provider={provider}>
<MediaCacheProvider persistence={filesystemMediaCache}>
- <BaseEditUserAvatarProvider>
+ <EditUserAvatarProvider>
<NativeEditThreadAvatarProvider>
<MarkdownContextProvider>
<ChatContextProvider>
@@ -295,7 +295,7 @@
</ChatContextProvider>
</MarkdownContextProvider>
</NativeEditThreadAvatarProvider>
- </BaseEditUserAvatarProvider>
+ </EditUserAvatarProvider>
</MediaCacheProvider>
</ENSCacheProvider>
</ActionSheetProvider>
diff --git a/web/app.react.js b/web/app.react.js
--- a/web/app.react.js
+++ b/web/app.react.js
@@ -15,7 +15,7 @@
fetchEntriesActionTypes,
updateCalendarQueryActionTypes,
} from 'lib/actions/entry-actions.js';
-import { BaseEditUserAvatarProvider } from 'lib/components/base-edit-user-avatar-provider.react.js';
+import { EditUserAvatarProvider } from 'lib/components/edit-user-avatar-provider.react.js';
import {
ModalProvider,
useModalContext,
@@ -167,10 +167,10 @@
if (this.props.loggedIn) {
content = (
<>
- <BaseEditUserAvatarProvider>
+ <EditUserAvatarProvider>
{this.renderMainContent()}
{this.props.modals}
- </BaseEditUserAvatarProvider>
+ </EditUserAvatarProvider>
</>
);
} else {
diff --git a/web/avatars/edit-user-avatar-menu.react.js b/web/avatars/edit-user-avatar-menu.react.js
--- a/web/avatars/edit-user-avatar-menu.react.js
+++ b/web/avatars/edit-user-avatar-menu.react.js
@@ -3,7 +3,7 @@
import invariant from 'invariant';
import * as React from 'react';
-import { EditUserAvatarContext } from 'lib/components/base-edit-user-avatar-provider.react.js';
+import { EditUserAvatarContext } from 'lib/components/edit-user-avatar-provider.react.js';
import { useModalContext } from 'lib/components/modal-provider.react.js';
import SWMansionIcon from 'lib/components/SWMansionIcon.react.js';
diff --git a/web/avatars/edit-user-avatar.react.js b/web/avatars/edit-user-avatar.react.js
--- a/web/avatars/edit-user-avatar.react.js
+++ b/web/avatars/edit-user-avatar.react.js
@@ -3,7 +3,7 @@
import invariant from 'invariant';
import * as React from 'react';
-import { EditUserAvatarContext } from 'lib/components/base-edit-user-avatar-provider.react.js';
+import { EditUserAvatarContext } from 'lib/components/edit-user-avatar-provider.react.js';
import EditUserAvatarMenu from './edit-user-avatar-menu.react.js';
import css from './edit-user-avatar.css';
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
@@ -5,7 +5,7 @@
import invariant from 'invariant';
import * as React from 'react';
-import { EditUserAvatarContext } from 'lib/components/base-edit-user-avatar-provider.react.js';
+import { EditUserAvatarContext } from 'lib/components/edit-user-avatar-provider.react.js';
import { useModalContext } from 'lib/components/modal-provider.react.js';
import SWMansionIcon from 'lib/components/SWMansionIcon.react.js';
import {

File Metadata

Mime Type
text/plain
Expires
Tue, Dec 24, 12:40 AM (16 h, 48 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2697493
Default Alt Text
D8348.id29216.diff (8 KB)

Event Timeline