Page MenuHomePhorge
Files F32556129

D12593.1767215818.diff
No OneTemporary
Actions

Size
5 KB
Referenced Files
None
Subscribers
None

D12593.1767215818.diff
View Options

diff --git a/lib/hooks/relationship-prompt.js b/lib/hooks/relationship-prompt.js
--- a/lib/hooks/relationship-prompt.js
+++ b/lib/hooks/relationship-prompt.js
@@ -25,9 +25,17 @@
+unfriendUser: () => void,
};
+type RelationshipLoadingState = {
+ +isLoadingBlockUser: boolean,
+ +isLoadingUnblockUser: boolean,
+ +isLoadingFriendUser: boolean,
+ +isLoadingUnfriendUser: boolean,
+};
+
type RelationshipPromptData = {
+otherUserInfo: ?UserInfo,
+callbacks: RelationshipCallbacks,
+ +loadingState: RelationshipLoadingState,
};
function useRelationshipPrompt(
@@ -48,7 +56,7 @@
: pendingPersonalThreadUserInfo;
});
- const callbacks = useRelationshipCallbacks(
+ const { callbacks, loadingState } = useRelationshipCallbacks(
otherUserInfo?.id,
onErrorCallback,
);
@@ -57,20 +65,33 @@
() => ({
otherUserInfo,
callbacks,
+ loadingState,
}),
- [callbacks, otherUserInfo],
+ [callbacks, loadingState, otherUserInfo],
);
}
function useRelationshipCallbacks(
otherUserID?: string,
onErrorCallback?: () => void,
-): RelationshipCallbacks {
+): {
+ +callbacks: RelationshipCallbacks,
+ +loadingState: RelationshipLoadingState,
+} {
+ const [isLoadingBlockUser, setIsLoadingBlockUser] = React.useState(false);
+ const [isLoadingUnblockUser, setIsLoadingUnblockUser] = React.useState(false);
+ const [isLoadingFriendUser, setIsLoadingFriendUser] = React.useState(false);
+ const [isLoadingUnfriendUser, setIsLoadingUnfriendUser] =
+ React.useState(false);
+
const callUpdateRelationships = useLegacyAshoatKeyserverCall(
serverUpdateRelationships,
);
const updateRelationship = React.useCallback(
- async (action: TraditionalRelationshipAction) => {
+ async (
+ action: TraditionalRelationshipAction,
+ setInProgress: boolean => mixed,
+ ) => {
try {
invariant(otherUserID, 'Other user info id should be present');
return await callUpdateRelationships({
@@ -80,6 +101,8 @@
} catch (e) {
onErrorCallback?.();
throw e;
+ } finally {
+ setInProgress(false);
}
},
[callUpdateRelationships, onErrorCallback, otherUserID],
@@ -87,40 +110,60 @@
const dispatchActionPromise = useDispatchActionPromise();
const onButtonPress = React.useCallback(
- (action: TraditionalRelationshipAction) => {
+ (
+ action: TraditionalRelationshipAction,
+ setInProgress: boolean => mixed,
+ ) => {
void dispatchActionPromise(
updateRelationshipsActionTypes,
- updateRelationship(action),
+ updateRelationship(action, setInProgress),
);
},
[dispatchActionPromise, updateRelationship],
);
- const blockUser = React.useCallback(
- () => onButtonPress(relationshipActions.BLOCK),
- [onButtonPress],
- );
- const unblockUser = React.useCallback(
- () => onButtonPress(relationshipActions.UNBLOCK),
- [onButtonPress],
- );
- const friendUser = React.useCallback(
- () => onButtonPress(relationshipActions.FRIEND),
- [onButtonPress],
- );
- const unfriendUser = React.useCallback(
- () => onButtonPress(relationshipActions.UNFRIEND),
- [onButtonPress],
- );
+ const blockUser = React.useCallback(() => {
+ setIsLoadingBlockUser(true);
+ onButtonPress(relationshipActions.BLOCK, setIsLoadingBlockUser);
+ }, [onButtonPress]);
+ const unblockUser = React.useCallback(() => {
+ setIsLoadingUnblockUser(true);
+ onButtonPress(relationshipActions.UNBLOCK, setIsLoadingUnblockUser);
+ }, [onButtonPress]);
+ const friendUser = React.useCallback(() => {
+ setIsLoadingFriendUser(true);
+ onButtonPress(relationshipActions.FRIEND, setIsLoadingFriendUser);
+ }, [onButtonPress]);
+ const unfriendUser = React.useCallback(() => {
+ setIsLoadingUnfriendUser(true);
+ onButtonPress(relationshipActions.UNFRIEND, setIsLoadingUnfriendUser);
+ }, [onButtonPress]);
return React.useMemo(
() => ({
+ callbacks: {
+ blockUser,
+ unblockUser,
+ friendUser,
+ unfriendUser,
+ },
+ loadingState: {
+ isLoadingBlockUser,
+ isLoadingUnblockUser,
+ isLoadingFriendUser,
+ isLoadingUnfriendUser,
+ },
+ }),
+ [
blockUser,
- unblockUser,
friendUser,
+ isLoadingBlockUser,
+ isLoadingFriendUser,
+ isLoadingUnblockUser,
+ isLoadingUnfriendUser,
+ unblockUser,
unfriendUser,
- }),
- [blockUser, friendUser, unblockUser, unfriendUser],
+ ],
);
}
diff --git a/web/settings/relationship/block-list-row.react.js b/web/settings/relationship/block-list-row.react.js
--- a/web/settings/relationship/block-list-row.react.js
+++ b/web/settings/relationship/block-list-row.react.js
@@ -14,7 +14,9 @@
function BlockListRow(props: UserRowProps): React.Node {
const { userInfo, onMenuVisibilityChange } = props;
- const { unblockUser } = useRelationshipCallbacks(userInfo.id);
+ const {
+ callbacks: { unblockUser },
+ } = useRelationshipCallbacks(userInfo.id);
const editIcon = <SWMansionIcon icon="edit-1" size={22} />;
const pushUserProfileModal = usePushUserProfileModal(userInfo.id);
diff --git a/web/settings/relationship/friend-list-row.react.js b/web/settings/relationship/friend-list-row.react.js
--- a/web/settings/relationship/friend-list-row.react.js
+++ b/web/settings/relationship/friend-list-row.react.js
@@ -21,7 +21,9 @@
function FriendListRow(props: UserRowProps): React.Node {
const { userInfo, onMenuVisibilityChange } = props;
- const { friendUser, unfriendUser } = useRelationshipCallbacks(userInfo.id);
+ const {
+ callbacks: { friendUser, unfriendUser },
+ } = useRelationshipCallbacks(userInfo.id);
const friendUserCallback = React.useCallback(
(event: SyntheticEvent<HTMLElement>) => {

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 31, 9:16 PM (1 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5874473
Default Alt Text
D12593.1767215818.diff (5 KB)

Event Timeline