diff --git a/native/profile/profile-screen.react.js b/native/profile/profile-screen.react.js --- a/native/profile/profile-screen.react.js +++ b/native/profile/profile-screen.react.js @@ -20,12 +20,14 @@ dmOperationSpecificationTypes, } from 'lib/shared/dm-ops/dm-op-types.js'; import { useProcessAndSendDMOperation } from 'lib/shared/dm-ops/process-dm-ops.js'; -import { useFarcasterConversationsSync } from 'lib/shared/farcaster/farcaster-hooks.js'; import type { LogOutResult } from 'lib/types/account-types.js'; import type { DMCreateThreadOperation } from 'lib/types/dm-ops'; import { thickThreadTypes } from 'lib/types/thread-types-enum.js'; import { type CurrentUserInfo } from 'lib/types/user-types.js'; -import { useCurrentUserFID } from 'lib/utils/farcaster-utils.js'; +import { + useCurrentUserFID, + useSetFarcasterDCsLoaded, +} from 'lib/utils/farcaster-utils.js'; import { useDispatchActionPromise, type DispatchActionPromise, @@ -186,7 +188,7 @@ +onCreateDMThread: () => Promise, +currentUserFID: ?string, +usingRestoreFlow: boolean, - +farcasterConversationsSync: (limit: number) => Promise, + +farcasterConversationsSync: () => void, +supportsFarcasterDCs: boolean, }; @@ -286,11 +288,11 @@ ); } let farcaster; - if (staffCanSee && this.props.supportsFarcasterDCs) { + if (this.props.supportsFarcasterDCs) { farcaster = ( <> @@ -563,7 +565,7 @@ }; onPressFarcasterConversationsSync = () => { - void this.props.farcasterConversationsSync(Number.POSITIVE_INFINITY); + void this.props.farcasterConversationsSync(); }; onPressDebugLogs = () => { @@ -638,7 +640,10 @@ }, [checkIfPrimaryDevice]); const usingRestoreFlow = useIsRestoreFlowEnabled(); - const syncFarcasterConversations = useFarcasterConversationsSync(); + const setDCsLoaded = useSetFarcasterDCsLoaded(); + const syncFarcasterConversations = React.useCallback(() => { + setDCsLoaded(false); + }, [setDCsLoaded]); const supportsFarcasterDCs = useIsFarcasterDCsIntegrationEnabled(); return ( diff --git a/web/settings/account-settings.react.js b/web/settings/account-settings.react.js --- a/web/settings/account-settings.react.js +++ b/web/settings/account-settings.react.js @@ -18,7 +18,6 @@ type OutboundDMOperationSpecification, } from 'lib/shared/dm-ops/dm-op-types.js'; import { useProcessAndSendDMOperation } from 'lib/shared/dm-ops/process-dm-ops.js'; -import { useFarcasterConversationsSync } from 'lib/shared/farcaster/farcaster-hooks.js'; import { IdentityClientContext } from 'lib/shared/identity-client-context.js'; import { useTunnelbroker } from 'lib/tunnelbroker/tunnelbroker-context.js'; import type { DMCreateThreadOperation } from 'lib/types/dm-ops.js'; @@ -27,6 +26,7 @@ createOlmSessionsWithOwnDevices, getContentSigningKey, } from 'lib/utils/crypto-utils.js'; +import { useSetFarcasterDCsLoaded } from 'lib/utils/farcaster-utils.js'; import { useDispatchActionPromise } from 'lib/utils/redux-promise-utils.js'; import { useIsFarcasterDCsIntegrationEnabled, @@ -183,10 +183,10 @@ [pushModal], ); - const syncFarcasterConversations = useFarcasterConversationsSync(); - const syncConversations = React.useCallback(() => { - return syncFarcasterConversations(Number.POSITIVE_INFINITY); - }, [syncFarcasterConversations]); + const setDCsLoaded = useSetFarcasterDCsLoaded(); + const syncFarcasterConversations = React.useCallback(() => { + setDCsLoaded(false); + }, [setDCsLoaded]); if (!currentUserInfo || currentUserInfo.anonymous) { return null; @@ -287,16 +287,16 @@ } let farcaster; - if (staffCanSee && supportsFarcasterDCs) { + if (supportsFarcasterDCs) { farcaster = (
-

Farcaster menu

+

Farcaster

  • - Farcaster DCs integration -