Page MenuHomePhorge
Files F33362942

D14063.1768945254.diff
No OneTemporary
Actions

Size
3 KB
Referenced Files
None
Subscribers
None

D14063.1768945254.diff
View Options

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
@@ -12,8 +12,8 @@
useSecondaryDeviceLogOut,
} from 'lib/actions/user-actions.js';
import { useStringForUser } from 'lib/hooks/ens-cache.js';
+import { useCheckIfPrimaryDevice } from 'lib/hooks/primary-device-hooks.js';
import { createLoadingStatusSelector } from 'lib/selectors/loading-selectors.js';
-import { getOwnPrimaryDeviceID } from 'lib/selectors/user-selectors.js';
import { accountHasPassword } from 'lib/shared/account-utils.js';
import {
type OutboundDMOperationSpecification,
@@ -24,7 +24,6 @@
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 { getContentSigningKey } from 'lib/utils/crypto-utils.js';
import { useCurrentUserFID } from 'lib/utils/farcaster-utils.js';
import {
useDispatchActionPromise,
@@ -168,7 +167,7 @@
type Props = {
...BaseProps,
+currentUserInfo: ?CurrentUserInfo,
- +primaryDeviceID: ?string,
+ +isPrimaryDevice: boolean,
+logOutLoading: boolean,
+colors: Colors,
+styles: $ReadOnly<typeof unboundStyles>,
@@ -233,7 +232,10 @@
}
let passwordEditionUI;
- if (accountHasPassword(this.props.currentUserInfo)) {
+ if (
+ accountHasPassword(this.props.currentUserInfo) &&
+ this.props.isPrimaryDevice
+ ) {
passwordEditionUI = (
<Action.Row>
<Text style={this.props.styles.label}>Password</Text>
@@ -412,12 +414,9 @@
if (this.loggedOutOrLoggingOut) {
return;
}
- const { primaryDeviceID } = this.props;
- const currentDeviceID = await getContentSigningKey();
- const isPrimaryDevice = currentDeviceID === primaryDeviceID;
let alertTitle, alertMessage, onPressAction;
- if (isPrimaryDevice) {
+ if (this.props.isPrimaryDevice) {
alertTitle = 'Log out all devices?';
alertMessage =
'This device is your primary device, ' +
@@ -560,7 +559,6 @@
const ConnectedProfileScreen: React.ComponentType<BaseProps> =
React.memo<BaseProps>(function ConnectedProfileScreen(props: BaseProps) {
const currentUserInfo = useSelector(state => state.currentUserInfo);
- const primaryDeviceID = useSelector(getOwnPrimaryDeviceID);
const logOutLoading =
useSelector(logOutLoadingStatusSelector) === 'loading';
const colors = useColors();
@@ -574,6 +572,8 @@
accountHasPassword(state.currentUserInfo),
);
const currentUserID = useCurrentUserFID();
+ const [isPrimaryDevice, setIsPrimaryDevice] = React.useState(false);
+ const checkIfPrimaryDevice = useCheckIfPrimaryDevice();
const showVersionUnsupportedAlert = useShowVersionUnsupportedAlert(false);
const callLogOut = useLogOut({
@@ -607,11 +607,18 @@
await processAndSendDMOperation(specification);
}, [processAndSendDMOperation, userID]);
+ React.useEffect(() => {
+ void (async () => {
+ const checkIfPrimaryDeviceResult = await checkIfPrimaryDevice();
+ setIsPrimaryDevice(checkIfPrimaryDeviceResult);
+ })();
+ }, [checkIfPrimaryDevice]);
+
return (
<ProfileScreen
{...props}
currentUserInfo={currentUserInfo}
- primaryDeviceID={primaryDeviceID}
+ isPrimaryDevice={isPrimaryDevice}
logOutLoading={logOutLoading}
colors={colors}
styles={styles}

File Metadata

Mime Type
text/plain
Expires
Tue, Jan 20, 9:40 PM (6 h, 30 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5964411
Default Alt Text
D14063.1768945254.diff (3 KB)

Event Timeline