issue-40 #52

Merged
b merged 5 commits from issue-40 into main 2024-05-17 09:23:50 +00:00
5 changed files with 21 additions and 13 deletions
Showing only changes of commit 4f11b1c4a8 - Show all commits

View File

@ -43,12 +43,14 @@ export const AppBar = () => {
useEffect(() => { useEffect(() => {
if (metadataState) { if (metadataState) {
if (metadataState.content) { if (metadataState.content) {
const { picture, display_name, name } = JSON.parse(metadataState.content) const { picture, display_name, name } = JSON.parse(
metadataState.content
)
if (picture) { if (picture) {
setUserAvatar(picture) setUserAvatar(picture)
} }
setUsername(shorten(display_name || name || '', 7)) setUsername(shorten(display_name || name || '', 7))
} else { } else {
setUserAvatar('') setUserAvatar('')
@ -84,9 +86,7 @@ export const AppBar = () => {
}) })
) )
dispatch( dispatch(setMetadataEvent(metadataController.getEmptyMetadataEvent()))
setMetadataEvent(metadataController.getEmptyMetadataEvent())
)
// clear authToken saved in local storage // clear authToken saved in local storage
clearAuthToken() clearAuthToken()

View File

@ -54,6 +54,10 @@ type UserProps = {
image?: string image?: string
} }
/**
* This component will be used for the displaying username and profile picture.
* If image is not available, robohash image will be displayed
*/
export const UserComponent = ({ pubkey, name, image }: UserProps) => { export const UserComponent = ({ pubkey, name, image }: UserProps) => {
const theme = useTheme() const theme = useTheme()

View File

@ -5,7 +5,12 @@ import { useDispatch } from 'react-redux'
import { Outlet } from 'react-router-dom' import { Outlet } from 'react-router-dom'
import { AppBar } from '../components/AppBar/AppBar' import { AppBar } from '../components/AppBar/AppBar'
import { restoreState, setAuthState, setMetadataEvent } from '../store/actions' import { restoreState, setAuthState, setMetadataEvent } from '../store/actions'
import { clearAuthToken, clearState, loadState, saveNsecBunkerDelegatedKey } from '../utils' import {
clearAuthToken,
clearState,
loadState,
saveNsecBunkerDelegatedKey
} from '../utils'
import { LoadingSpinner } from '../components/LoadingSpinner' import { LoadingSpinner } from '../components/LoadingSpinner'
import { Dispatch } from '../store/store' import { Dispatch } from '../store/store'
import { MetadataController, NostrController } from '../controllers' import { MetadataController, NostrController } from '../controllers'
@ -29,9 +34,7 @@ export const MainLayout = () => {
}) })
) )
dispatch( dispatch(setMetadataEvent(metadataController.getEmptyMetadataEvent()))
setMetadataEvent(metadataController.getEmptyMetadataEvent())
)
// clear authToken saved in local storage // clear authToken saved in local storage
clearAuthToken() clearAuthToken()

View File

@ -53,9 +53,8 @@ export const Login = () => {
dispatch(updateLoginMethod(LoginMethods.extension)) dispatch(updateLoginMethod(LoginMethods.extension))
setLoadingSpinnerDesc('Authenticating and finding metadata') setLoadingSpinnerDesc('Authenticating and finding metadata')
const redirectPath = await authController.authenticateAndFindMetadata( const redirectPath =
pubkey await authController.authenticateAndFindMetadata(pubkey)
)
navigate(redirectPath) navigate(redirectPath)
}) })

View File

@ -89,6 +89,8 @@ export const SignPage = () => {
} else { } else {
for (const signer of meta.signers) { for (const signer of meta.signers) {
if (!signedBy.includes(signer)) { if (!signedBy.includes(signer)) {
// signers in meta.json are in npub1 format
// so, convert it to hex before setting to nextSigner
setNextSinger(npubToHex(signer)!) setNextSinger(npubToHex(signer)!)
const usersNpub = hexToNpub(usersPubkey!) const usersNpub = hexToNpub(usersPubkey!)