From 477ef47f465ef7b5b5004eb3f648979cb734c06a Mon Sep 17 00:00:00 2001 From: Davinci Date: Fri, 17 May 2024 13:35:37 +0200 Subject: [PATCH] style: lint fix --- src/components/AppBar/AppBar.tsx | 6 +++--- src/layouts/Main.tsx | 1 + src/pages/profile/index.tsx | 6 +++--- src/store/userRobotImage/action.ts | 4 +++- src/utils/nostr.ts | 5 ++++- 5 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/components/AppBar/AppBar.tsx b/src/components/AppBar/AppBar.tsx index aecdc65..a1971ed 100644 --- a/src/components/AppBar/AppBar.tsx +++ b/src/components/AppBar/AppBar.tsx @@ -53,8 +53,8 @@ export const AppBar = () => { metadataState.content ) - if (picture) { - setUserAvatar(picture) + if (picture || userRobotImage) { + setUserAvatar(picture || userRobotImage) } setUsername(shorten(display_name || name || '', 7)) @@ -91,8 +91,8 @@ export const AppBar = () => { nsecBunkerPubkey: undefined }) ) - dispatch(setMetadataEvent(metadataController.getEmptyMetadataEvent())) + dispatch(setUserRobotImage(null)) // clear authToken saved in local storage clearAuthToken() diff --git a/src/layouts/Main.tsx b/src/layouts/Main.tsx index d31af6c..9c4f4e4 100644 --- a/src/layouts/Main.tsx +++ b/src/layouts/Main.tsx @@ -8,6 +8,7 @@ import { restoreState, setAuthState, setMetadataEvent } from '../store/actions' import { clearAuthToken, clearState, + getRoboHashPicture, loadState, saveNsecBunkerDelegatedKey } from '../utils' diff --git a/src/pages/profile/index.tsx b/src/pages/profile/index.tsx index bc6d587..318f115 100644 --- a/src/pages/profile/index.tsx +++ b/src/pages/profile/index.tsx @@ -246,14 +246,14 @@ export const ProfilePage = () => { /** * Handles the logic for Image URL. * If no picture in kind 0 found - use robohash avatar - * + * * @returns robohash image url */ const getProfileImage = (metadata: ProfileMetadata) => { if (!isUsersOwnProfile) { return metadata.picture || getRoboHashPicture(npub!) } - + // userRobotImage is used only when visiting own profile // while kind 0 picture is not set return metadata.picture || userRobotImage || getRoboHashPicture(npub!) @@ -293,7 +293,7 @@ export const ProfilePage = () => { { event.target.src = getRoboHashPicture(npub!) - }} + }} className={styles.img} src={getProfileImage(profileMetadata)} alt="Profile Image" diff --git a/src/store/userRobotImage/action.ts b/src/store/userRobotImage/action.ts index cfb83e6..5bec4ef 100644 --- a/src/store/userRobotImage/action.ts +++ b/src/store/userRobotImage/action.ts @@ -1,7 +1,9 @@ import * as ActionTypes from '../actionTypes' import { SetUserRobotImage } from './types' -export const setUserRobotImage = (payload: string | null): SetUserRobotImage => ({ +export const setUserRobotImage = ( + payload: string | null +): SetUserRobotImage => ({ type: ActionTypes.SET_USER_ROBOT_IMAGE, payload }) diff --git a/src/utils/nostr.ts b/src/utils/nostr.ts index e027b8a..229b7be 100644 --- a/src/utils/nostr.ts +++ b/src/utils/nostr.ts @@ -143,7 +143,10 @@ export const base64DecodeAuthToken = (authToken: string): SignedEvent => { * @param pubkey in hex or npub format * @returns robohash.org url for the avatar */ -export const getRoboHashPicture = (pubkey?: string, set: number = 1): string => { +export const getRoboHashPicture = ( + pubkey?: string, + set: number = 1 +): string => { if (!pubkey) return '' const npub = hexToNpub(pubkey) return `https://robohash.org/${npub}.png?set=set${set}`