diff --git a/net/web/src/App.js b/net/web/src/App.js index 9985f41a..d5dc34a0 100644 --- a/net/web/src/App.js +++ b/net/web/src/App.js @@ -1,5 +1,6 @@ import 'antd/dist/reset.css'; +import Colors from 'constants/Colors'; import { HashRouter as Router, Routes, Route } from "react-router-dom"; import { AppContextProvider } from 'context/AppContext'; @@ -18,6 +19,8 @@ import { Access } from './access/Access'; import { Session } from './session/Session'; import { Dashboard } from './dashboard/Dashboard'; +import { ConfigProvider } from 'antd'; + function App() { return ( @@ -30,21 +33,23 @@ function App() { - - - } /> - } /> - } /> - } /> - } /> - - - - }> - - - + + + + } /> + } /> + } /> + } /> + } /> + + + + }> + + + + diff --git a/net/web/src/session/cards/cardItem/useCardItem.hook.js b/net/web/src/session/cards/cardItem/useCardItem.hook.js index 83a4fc57..2576fe67 100644 --- a/net/web/src/session/cards/cardItem/useCardItem.hook.js +++ b/net/web/src/session/cards/cardItem/useCardItem.hook.js @@ -17,7 +17,7 @@ export function useCardItem(item) { } useEffect(() => { - updateState({ logo: card.actions.getImageUrl(item.id) }); + updateState({ logo: card.actions.getCardImageUrl(item.id) }); }, [card, item]); useEffect(() => { diff --git a/net/web/src/session/contact/useContact.hook.js b/net/web/src/session/contact/useContact.hook.js index 9fbcd108..7e94192b 100644 --- a/net/web/src/session/contact/useContact.hook.js +++ b/net/web/src/session/contact/useContact.hook.js @@ -3,6 +3,7 @@ import { CardContext } from 'context/CardContext'; import { ViewportContext } from 'context/ViewportContext'; import { getListingImageUrl } from 'api/getListingImageUrl'; import { getListingMessage } from 'api/getListingMessage'; +import { getCardByGuid } from 'context/cardUtil'; export function useContact(guid, listing, close) { @@ -43,14 +44,14 @@ export function useContact(guid, listing, close) { useEffect(() => { let logo, name, location, description, handle, node, status, cardId; - let contact = card.actions.getCardByGuid(guid); + let contact = getCardByGuid(card.state.cards, guid); if (contact) { let cardProfile = contact?.data?.cardProfile; let cardDetail = contact?.data?.cardDetail; cardId = contact.id; handle = cardProfile.handle; node = cardProfile.node; - logo = card.actions.getImageUrl(contact.id); + logo = card.actions.getCardImageUrl(contact.id); name = cardProfile.name; location = cardProfile.location; description = cardProfile.description; diff --git a/net/web/src/session/identity/Identity.jsx b/net/web/src/session/identity/Identity.jsx index 2060dbf2..d35aee25 100644 --- a/net/web/src/session/identity/Identity.jsx +++ b/net/web/src/session/identity/Identity.jsx @@ -1,4 +1,4 @@ -import { Modal, Dropdown, Menu, Tooltip } from 'antd'; +import { Button, Modal, Dropdown, Menu, Tooltip } from 'antd'; import { Logo } from 'logo/Logo'; import { IdentityWrapper, ErrorNotice, InfoNotice } from './Identity.styled'; import { useIdentity } from './useIdentity.hook'; @@ -10,12 +10,9 @@ export function Identity({ openAccount, openCards, cardUpdated }) { const logout = () => { Modal.confirm({ - title: 'Are you sure you want to logout?', + title: 'you sure you want to logout?', icon: , - onOk() { - actions.logout(); - }, - onCancel() {}, + footer:
, }); }