diff --git a/net/web/src/AppContext/useCardContext.hook.js b/net/web/src/AppContext/useCardContext.hook.js index 31711446..fed29a6b 100644 --- a/net/web/src/AppContext/useCardContext.hook.js +++ b/net/web/src/AppContext/useCardContext.hook.js @@ -148,10 +148,9 @@ export function useCardContext() { setRevision: async (rev) => { setCards(rev); }, + getImageUrl: (cardId, rev) => getCardImageUrl(access.current, cardId, rev), } -console.log(state); - return { state, actions } } diff --git a/net/web/src/User/SideBar/Contacts/Cards/Cards.jsx b/net/web/src/User/SideBar/Contacts/Cards/Cards.jsx index 89a1e24d..22d093dc 100644 --- a/net/web/src/User/SideBar/Contacts/Cards/Cards.jsx +++ b/net/web/src/User/SideBar/Contacts/Cards/Cards.jsx @@ -24,8 +24,8 @@ export function Cards({ showRegistry }) { } const cardImage = (item) => { - if (actions?.getCardImageUrl) { - return actions.getCardImageUrl(item.id, item.revision); + if (actions?.getImageUrl) { + return actions.getImageUrl(item.id, item.revision); } return null } diff --git a/net/web/src/User/SideBar/Contacts/Cards/useCards.hook.js b/net/web/src/User/SideBar/Contacts/Cards/useCards.hook.js index 521cb844..9779e81e 100644 --- a/net/web/src/User/SideBar/Contacts/Cards/useCards.hook.js +++ b/net/web/src/User/SideBar/Contacts/Cards/useCards.hook.js @@ -1,5 +1,5 @@ import { useContext, useState, useEffect } from 'react'; -import { AppContext } from '../../../../AppContext/AppContext'; +import { CardContext } from '../../../../AppContext/CardContext'; import { useNavigate } from 'react-router-dom'; export function useCards() { @@ -9,10 +9,10 @@ export function useCards() { }); const navigate = useNavigate(); - const app = useContext(AppContext); + const card = useContext(CardContext); const actions = { - getCardImageUrl: app?.actions?.getCardImageUrl, + getImageUrl: card.actions.getImageUrl, select: (contact) => { navigate(`/user/contact/${contact.data.cardProfile.guid}`); } @@ -23,13 +23,8 @@ export function useCards() { } useEffect(() => { - if (app?.state?.Data?.cards) { - updateState({ cards: app.state.Data.cards }); - } - else { - updateState({ cards: [] }); - } - }, [app]) + updateState({ cards: Array.from(card.state.cards.values()) }); + }, [card]) return { state, actions }; }