Merge pull request #66 from Permissionless-Software-Foundation/upstream-merge

Upstream merge

src/App.css

@@ -55,4 +55,174 @@ input::-webkit-inner-spin-button {
 /* Remove input number arrows Firefox */
 input[type=number] {
   --moz-appearance: textfield;
+}
+
+/* Markdown Content Styles */
+.markdown-content {
+  max-width: 1200px;
+  margin: 0 auto;
+  padding: 2rem;
+  background: #ffffff;
+  border-radius: 12px;
+  box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06);
+  border: 1px solid #e5e7eb;
+  text-align: left;
+}
+
+.markdown-content h1 {
+  font-size: 2.5rem;
+  font-weight: 700;
+  color: #1f2937;
+  margin-bottom: 1.5rem;
+  padding-top: 0.5rem;
+  padding-bottom: 0.5rem;
+  border-bottom: 3px solid #3b82f6;
+  text-align: left;
+}
+
+.markdown-content h2 {
+  font-size: 2rem;
+  font-weight: 600;
+  color: #374151;
+  margin-top: 2rem;
+  margin-bottom: 1rem;
+  padding-bottom: 0.25rem;
+  border-bottom: 2px solid #e5e7eb;
+}
+
+.markdown-content h3 {
+  font-size: 1.5rem;
+  font-weight: 600;
+  color: #4b5563;
+  margin-top: 1.5rem;
+  margin-bottom: 0.75rem;
+}
+
+.markdown-content h4, .markdown-content h5, .markdown-content h6 {
+  font-size: 1.25rem;
+  font-weight: 600;
+  color: #6b7280;
+  margin-top: 1.25rem;
+  margin-bottom: 0.5rem;
+}
+
+.markdown-content p {
+  font-size: 1.1rem;
+  line-height: 1.7;
+  color: #374151;
+  margin-bottom: 1.25rem;
+  text-align: left;
+}
+
+.markdown-content ul, .markdown-content ol {
+  margin-bottom: 1.25rem;
+  padding-left: 1.5rem;
+}
+
+.markdown-content li {
+  font-size: 1.1rem;
+  line-height: 1.6;
+  color: #374151;
+  margin-bottom: 0.5rem;
+}
+
+.markdown-content blockquote {
+  border-left: 4px solid #3b82f6;
+  background: #f8fafc;
+  padding: 1rem 1.5rem;
+  margin: 1.5rem 0;
+  border-radius: 0 8px 8px 0;
+  font-style: italic;
+  color: #4b5563;
+}
+
+.markdown-content code {
+  background: #f1f5f9;
+  color: #e11d48;
+  padding: 0.25rem 0.5rem;
+  border-radius: 4px;
+  font-family: 'Monaco', 'Menlo', 'Ubuntu Mono', monospace;
+  font-size: 0.9rem;
+}
+
+.markdown-content pre {
+  background: #1e293b;
+  color: #e2e8f0;
+  padding: 1.5rem;
+  border-radius: 8px;
+  overflow-x: auto;
+  margin: 1.5rem 0;
+  border: 1px solid #334155;
+}
+
+.markdown-content pre code {
+  background: transparent;
+  color: inherit;
+  padding: 0;
+  border-radius: 0;
+}
+
+.markdown-content a {
+  color: #3b82f6;
+  text-decoration: none;
+  border-bottom: 1px solid transparent;
+  transition: all 0.2s ease;
+}
+
+.markdown-content a:hover {
+  color: #1d4ed8;
+  border-bottom-color: #1d4ed8;
+}
+
+.markdown-content table {
+  width: 100%;
+  border-collapse: collapse;
+  margin: 1.5rem 0;
+  background: white;
+  border-radius: 8px;
+  overflow: hidden;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+
+.markdown-content th, .markdown-content td {
+  padding: 0.75rem 1rem;
+  text-align: left;
+  border-bottom: 1px solid #e5e7eb;
+}
+
+.markdown-content th {
+  background: #f8fafc;
+  font-weight: 600;
+  color: #374151;
+}
+
+.markdown-content hr {
+  border: none;
+  height: 2px;
+  background: linear-gradient(90deg, transparent, #e5e7eb, transparent);
+  margin: 2rem 0;
+}
+
+.markdown-content img {
+  max-width: 100%;
+  height: auto;
+  border-radius: 8px;
+  box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1);
+  margin: 1rem 0;
+}
+
+@media (max-width: 768px) {
+  .markdown-content {
+    padding: 1.5rem;
+    margin: 1rem;
+  }
+  .markdown-content h1 {
+    font-size: 2rem;
+  }
+  .markdown-content h2 {
+    font-size: 1.75rem;
+  }
+  .markdown-content p, .markdown-content li {
+    font-size: 1rem;
+  }
 }

src/App.js

@@ -74,6 +74,7 @@ function App (props) {
 
       console.log('asyncInitStarted: ', appData.asyncInitStarted)
       console.log('is single view : ', singleView)
+      await appData.nostrQueries.start()
       if (!appData.asyncInitStarted && !singleView) {
         try {
           // Instantiate the async load object.

src/components/app-body/nostr-chat/chat-main.js

@@ -9,6 +9,7 @@ import React from 'react'
 import ChatHeader from './chat-header'
 import MessageList from './message-list'
 import MessageInput from './message-input'
+import { Spinner } from 'react-bootstrap'
 
 function ChatMain (props) {
   const { selectedChannel, messages } = props
@@ -16,9 +17,9 @@ function ChatMain (props) {
   return (
     <>
       {!selectedChannel && (
-        <div className='h-100 d-flex align-items-center justify-content-center' style={{ backgroundColor: '#f8f9fa' }}>
+        <div className='h-100 d-flex align-items-center justify-content-center' style={{ backgroundColor: '#f8f9fa', minHeight: '200px' }}>
           <div className='text-center text-muted'>
-            <h4>Select a channel to start chatting</h4>
+            <Spinner animation='border' size='sm' />
           </div>
         </div>
       )}

src/components/app-body/nostr-chat/dm-item.js

@@ -6,6 +6,7 @@
 import React, { useCallback, useEffect, useState } from 'react'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faUser } from '@fortawesome/free-solid-svg-icons'
+import { Spinner } from 'react-bootstrap'
 
 export default function DMItem (props) {
   const { dm, profiles, selectedChannel, onChangeChannel } = props
@@ -97,6 +98,7 @@ export default function DMItem (props) {
           style={{ fontSize: '14px' }}
         >
           {getShortName(profile?.name) || 'Unknown User'}
+          {!profile?.name && <Spinner animation='border' size='sm' style={{ marginLeft: '5px' }} />}
         </div>
         {/*         <div
           className={`small ${isSelected ? 'text-white-50' : 'text-muted'} ${dm.unreadCount > 0 ? 'fw-bold' : ''}`}

src/components/app-body/nostr-chat/index.js

@@ -14,7 +14,8 @@ import config from '../../../config'
 
 function NostrChat (props) {
   const { appData } = props
-  const { nostrQueries, bchWalletState } = appData
+  const { nostrQueries, bchWalletState, startChannelChat } = appData
+
   const [messages, setMessages] = useState([])
   const [loadedMessages, setLoadedMessages] = useState(false)
   const [profiles, setProfiles] = useState({})
@@ -24,12 +25,86 @@ function NostrChat (props) {
   const [dmChannels, setDmChannels] = useState([])
   const [dmListLoaded, setDmListLoaded] = useState(false)
 
-  const [selectedChannel, setSelectedChannel] = useState(config.chatsId[0])
+  const [selectedChannel, setSelectedChannel] = useState(null)
   const [selectedChannelIsDm, setSelectedChannelIsDm] = useState(false)
 
   const profilesRef = useRef({})
   const dmChannelsRef = useRef([])
 
+  // Reset states on change channel
+  const onChangeChannel = useCallback((ch) => {
+    if (selectedChannel === ch) return
+    const profiles = profilesRef.current
+    setSelectedChannelIsDm(!!profiles[ch])
+    setMessages([])
+    setLoadedMessages(false)
+    setSelectedChannel(ch)
+  }, [selectedChannel])
+
+  // Add a new DM to the list
+  const addPrivateMessage = useCallback(async (profile) => {
+    try {
+      const exist = dmChannelsRef.current.find(val => val === profile.pubKey)
+      setMessages([])
+      setLoadedMessages(false)
+      onChangeChannel(profile.pubKey)
+      if (exist) return
+      setDmChannels(currentChs => {
+        let newChs = [...currentChs]
+        newChs.push(profile.pubKey)
+        newChs = newChs.filter((val, i, list) => {
+          const existingIndex = list.findIndex(value => value === val)
+          return existingIndex === i
+        })
+        dmChannelsRef.current = newChs
+        return newChs
+      })
+      setChannelsData(currentChs => {
+        const newChs = { ...currentChs }
+        newChs[profile.pubKey] = profile
+        return newChs
+      })
+    } catch (error) {
+      console.warn(error)
+    }
+  }, [onChangeChannel])
+
+  // Define starter chat
+  useEffect(() => {
+    // Start dm if a initial chat is provided from props
+    const startDM = async (pubKey) => {
+      const npub = await appData.nostrQueries.hexToNpub(pubKey)
+
+      const defaultProfile = { name: npub } // default profile
+      profilesRef.current[pubKey] = defaultProfile // update ref , to prevent fetch this profile again.
+      // Fetch profile
+      const nostrProfile = await appData.nostrQueries.getProfile(pubKey)
+
+      const profile = nostrProfile || defaultProfile
+      // add public key formats to profile object
+      profile.pubKey = pubKey
+      profile.npub = npub
+      // Update profiles state
+      setProfiles(currentProfiles => {
+        const newProfiles = { ...currentProfiles }
+        newProfiles[pubKey] = profile
+        profilesRef.current = newProfiles
+        return newProfiles
+      })
+      await addPrivateMessage(profile)
+    }
+
+    if (selectedChannel) return
+    if (!startChannelChat) {
+      // Set group chat as initial chat
+      setSelectedChannel(config.chatsId[0])
+      setSelectedChannelIsDm(false)
+    } else if (dmListLoaded) {
+      // Set provided profile as initial chat
+      startDM(startChannelChat)
+    }
+  }, [appData, startChannelChat, dmListLoaded, addPrivateMessage, selectedChannel])
+
   // Handle read messages
   const onMsgRead = useCallback(async (ev) => {
     try {
@@ -127,8 +202,9 @@ function NostrChat (props) {
     })
 
     pool.on('event', (relay, subId, ev) => {
-      console.log('post retrieved from ', relay.url, ev.content)
-      onMsgRead(ev)
+      console.log('Group post retrieved from ', relay.url, ev.content)
+      const onBlackList = nostrQueries.blackList.find((val) => { return val === ev.pubkey })
+      if (!onBlackList)onMsgRead(ev)
     })
 
     return () => {
@@ -141,13 +217,11 @@ function NostrChat (props) {
   // Handle nostr pool for dm channels
   useEffect(() => {
     // fetch messages when channel selected and channel metadata are loaded
-    console.log('selectedChannel', selectedChannel)
-    console.log('selectedChannelIsDm', selectedChannelIsDm)
 
     if (!selectedChannel || !selectedChannelIsDm) return
+
     const { nostrKeyPair } = bchWalletState
     const dmPubKey = selectedChannel
-    console.log('dmPubKey', selectedChannel)
 
     // Load messages for group channel
     const relays = nostrQueries.relays
@@ -172,7 +246,7 @@ function NostrChat (props) {
     })
 
     pool.on('event', (relay, subId, ev) => {
-      console.log('post retrieved from ', relay.url, ev.content)
+      console.log('DM post retrieved from ', relay.url, ev.content)
       // decrpt message
       if (ev.pubkey === nostrKeyPair.pubHex) {
         // Sent messages
@@ -211,6 +285,7 @@ function NostrChat (props) {
       setDmChannels(currentChs => {
         const newChs = [...currentChs]
         newChs.push(profile.pubKey)
+
         dmChannelsRef.current = newChs
         return newChs
       })
@@ -254,18 +329,30 @@ function NostrChat (props) {
   // Load Dm channels
   useEffect(() => {
     const loadCurrentDms = async () => {
+      const { nostrQueries, bchWalletState } = appData
       const { nostrKeyPair } = bchWalletState
       const dms = await appData.nostrQueries.getDms(nostrKeyPair.pubHex)
+      setDmChannels(currentChs => {
+        let newChs = [...currentChs, ...dms]
+        newChs = newChs.filter((val, i, list) => {
+          const existingIndex = list.findIndex(value => value === val)
+          return existingIndex === i
+        })
+        dmChannelsRef.current = newChs
+        return newChs
+      })
+      setDmListLoaded(true)
+
       console.log('dm list', dms)
 
       for (let i = 0; i < dms.length; i++) {
         const pubKey = dms[i]
-        const npub = await appData.nostrQueries.hexToNpub(pubKey)
+        const npub = await nostrQueries.hexToNpub(pubKey)
 
         const defaultProfile = { name: npub } // default profile
         profilesRef.current[pubKey] = defaultProfile // update ref , to prevent fetch this profile again.
         // Fetch profile
-        const nostrProfile = await appData.nostrQueries.getProfile(pubKey)
+        const nostrProfile = await nostrQueries.getProfile(pubKey)
 
         const profile = nostrProfile || defaultProfile
         // add public key formats to profile object
@@ -279,13 +366,10 @@ function NostrChat (props) {
           return newProfiles
         })
       }
-      setDmChannels(dms)
-      setDmListLoaded(true)
-      dmChannelsRef.current = dms
     }
 
-    loadCurrentDms()
-  }, [bchWalletState, appData.nostrQueries])
+    if (!dmListLoaded) loadCurrentDms()
+  }, [appData, dmListLoaded])
 
   // Load public channels data
   useEffect(() => {
@@ -313,42 +397,9 @@ function NostrChat (props) {
       }
     }
 
-    // loadMessages()
     loadChData()
   }, [selectedChannel, appData, groupChannels])
 
-  const addPrivateMessage = async (profile) => {
-    try {
-      const exist = dmChannels.find(val => val === profile.pubKey)
-      setMessages([])
-      setLoadedMessages(false)
-      onChangeChannel(profile.pubKey)
-      if (exist) return
-      setDmChannels(currentChs => {
-        const newChs = [...currentChs]
-        newChs.push(profile.pubKey)
-        dmChannelsRef.current = newChs
-        return newChs
-      })
-      setChannelsData(currentChs => {
-        const newChs = { ...currentChs }
-        newChs[profile.pubKey] = profile
-        return newChs
-      })
-    } catch (error) {
-      console.warn(error)
-    }
-  }
-
-  // Reset states on change channel
-  const onChangeChannel = useCallback((ch) => {
-    if (selectedChannel === ch) return
-    setSelectedChannelIsDm(!!profiles[ch])
-    setMessages([])
-    setLoadedMessages(false)
-    setSelectedChannel(ch)
-  }, [selectedChannel, profiles])
-
   return (
     <>
       <Container fluid className='h-100 p-0 mb-5 '>

src/components/app-body/nostr-chat/message-list.js

@@ -12,6 +12,7 @@ import { Spinner } from 'react-bootstrap'
 
 function MessageList (props) {
   const { messages, loadedMessages } = props
+  console.log('loadedMessages', loadedMessages)
   const [groupedMessages, setGroupedMessages] = useState([])
   const msgContainerRef = useRef()
   // Group messages by date

src/components/app-body/nostr/profile/index.js

@@ -3,24 +3,56 @@ Component for read nostr information.
 */
 
 // Global npm libraries
-import React, { useState } from 'react'
+import React, { useState, useCallback, useEffect } from 'react'
+import config from '../../../../config/index.js'
 import { Container } from 'react-bootstrap'
 import ProfileRead from './profile-read.js'
 import PublicRead from './public-read.js'
 import { useParams } from 'react-router-dom'
 import SlpTokensDisplay from './slp-tokens-display'
 import NFTForSale from './nft-for-sale.js'
+import axios from 'axios'
+
 function Profile (props) {
+  const { wallet, bchWalletState } = props.appData
+  const { nostrKeyPair } = bchWalletState
   const [profile, setProfile] = useState(false)
+  const [profileAddresses, setProfileAddresses] = useState(null)
   const { npub } = useParams()
-  console.log('npub', npub)
+
+  const getAddressByNpub = useCallback(async () => {
+    try {
+      // Validate if provided npub match with user npub
+      if (npub === nostrKeyPair.npub) {
+        // Use user addresses
+        setProfileAddresses({
+          bchAddr: bchWalletState.cashAddress,
+          slpAddr: bchWalletState.slpAddress
+        })
+        return
+      }
+
+      // Fetch addresses for external npub.
+      const url = `${config.dexServer}/sm/npub/${npub}`
+      const response = await axios.get(url)
+      const bchAddr = response.data.bchAddr
+      const slpAddr = wallet.bchjs.SLP.Address.toSLPAddress(bchAddr)
+      setProfileAddresses({ bchAddr, slpAddr })
+    } catch (error) {
+      console.error(error)
+    }
+  }, [npub, wallet, nostrKeyPair, bchWalletState])
+
+  useEffect(() => {
+    getAddressByNpub()
+  }, [getAddressByNpub])
   return (
     <>
       <Container>
-        <ProfileRead {...props} onProfileRead={setProfile} npub={npub} />
-        <PublicRead {...props} profile={profile} npub={npub} />
-        <SlpTokensDisplay {...props} npub={npub} />
-        <NFTForSale {...props} npub={npub} />
+        <ProfileRead {...props} onProfileRead={setProfile} npub={npub} profileAddresses={profileAddresses} />
+        <PublicRead {...props} profile={profile} npub={npub} profileAddresses={profileAddresses} />
+        <SlpTokensDisplay {...props} npub={npub} profileAddresses={profileAddresses} />
+        {profileAddresses && <NFTForSale {...props} npub={npub} profileAddresses={profileAddresses} />}
       </Container>
     </>
   )

src/components/app-body/nostr/profile/nft-for-sale.js

@@ -8,7 +8,7 @@ import axios from 'axios'
 import TokenCard from '../../nfts-for-sale/token-card'
 
 function NFTForSale (props) {
-  const { appData, npub } = props
+  const { appData, profileAddresses } = props
 
   const [offers, setOffers] = useState([])
   const [offersAreLoaded, setOffersAreLoaded] = useState(false)
@@ -16,16 +16,8 @@ function NFTForSale (props) {
   const [dataAreLoaded, setDataAreLoaded] = useState(false)
   const [startAsync, setStartAsync] = useState(false)
 
-  const getAddressByNpub = useCallback(async () => {
-    const url = `${config.dexServer}/sm/npub/${npub}`
-    const response = await axios.get(url)
-    const addr = response.data.bchAddr
-    return addr
-  }, [npub])
-
   // Handler for refresh button
   const handleRefresh = () => {
-    console.log('handle refresh')
     loadNftOffers()
   }
 
@@ -52,8 +44,10 @@ function NFTForSale (props) {
   const getNftOffers = useCallback(async (page = 0) => {
     try {
       setOffersAreLoaded(false)
-      const addr = await getAddressByNpub(npub)
-      const url = `${config.dexServer}/offer/list/addr/${addr}`
+      const { bchAddr } = profileAddresses
+      if (!bchAddr) return
+
+      const url = `${config.dexServer}/offer/list/addr/${bchAddr}`
       const result = await axios.get(url)
       const rawOffers = result.data
       console.log('rawOffers: ', rawOffers)
@@ -74,7 +68,7 @@ function NFTForSale (props) {
       setOffersAreLoaded(true)
       throw err
     }
-  }, [processTokenData, getAddressByNpub, npub])
+  }, [processTokenData, profileAddresses])
 
   //  This function loads the token data .
   const lazyLoadTokenData = useCallback(async (tokens) => {
@@ -199,6 +193,7 @@ function NFTForSale (props) {
   // Main function to load NFT offers
   const loadNftOffers = useCallback(async () => {
     try {
+      if (!profileAddresses?.bchAddr) return
       // Get tokens in offers
       const offers = await getNftOffers()
       console.log('offers: ', offers)
@@ -216,7 +211,7 @@ function NFTForSale (props) {
     } catch (err) {
       console.error('Error loading NFT offers:', err)
     }
-  }, [lazyLoadTokenData, lazyLoadMutableData, getNftOffers, reviewNftCachedData, updateNFTCachedData])
+  }, [lazyLoadTokenData, lazyLoadMutableData, getNftOffers, reviewNftCachedData, updateNFTCachedData, profileAddresses])
 
   // Effect to load NFTs on component mount
   useEffect(() => {

src/components/app-body/nostr/profile/profile-read.js

@@ -10,22 +10,25 @@ import CopyOnClick from '../../bch-wallet/copy-on-click.js'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faUser, faGlobe } from '@fortawesome/free-solid-svg-icons'
 import * as nip19 from 'nostr-tools/nip19'
+import { useNavigate } from 'react-router-dom'
 
 // Local libraries
 import NostrFormat from '../nostr-format'
 
 function ProfileRead (props) {
-  const { npub, appData } = props
-  const { onProfileRead } = props
+  const { npub, appData, onProfileRead, profileAddresses } = props
   const [profile, setProfile] = useState({})
+  const [pubKey, setPubKey] = useState({})
+
   const [loaded, setLoaded] = useState(false)
   const [imageError, setImageError] = useState({ picture: false, banner: false })
+  const navigate = useNavigate()
 
   useEffect(() => {
     const start = async () => {
       const pubHexData = nip19.decode(npub)
       const pubHex = pubHexData.data
-
+      setPubKey(pubHex)
       const profile = await appData.nostrQueries.getProfile(pubHex)
       if (profile) {
         onProfileRead(profile)
@@ -48,6 +51,13 @@ function ProfileRead (props) {
     setImageError(prev => ({ ...prev, [type]: false }))
   }
 
+  const handleMessage = () => {
+    console.log('appData', appData)
+    const { setStartChannelChat } = appData
+    setStartChannelChat(pubKey)
+    navigate('/nostr-chat')
+  }
+
   return (
     <Container>
       {/* Banner Section */}
@@ -107,6 +117,32 @@ function ProfileRead (props) {
             </span>
             <CopyOnClick walletProp='npub' appData={props.appData} value={npub} />
           </div>
+          {profileAddresses?.bchAddr && (
+            <div className='text-muted small mb-3 d-flex align-items-center flex-column flex-md-row'>
+              <span className='text-truncate me-2 mb-2 mb-md-0'>
+                <span className='d-md-none'>
+                  {`${profileAddresses?.bchAddr?.slice(0, 8)}...${profileAddresses?.bchAddr?.slice(-5)}`}
+                </span>
+                <span className='d-none d-md-inline'>
+                  {profileAddresses?.bchAddr}
+                </span>
+              </span>
+              <CopyOnClick walletProp='bchAddr' appData={props.appData} value={profileAddresses?.bchAddr} />
+            </div>
+          )}
+          {profileAddresses?.slpAddr && (
+            <div className='text-muted small mb-3 d-flex align-items-center flex-column flex-md-row'>
+              <span className='text-truncate me-2 mb-2 mb-md-0'>
+                <span className='d-md-none'>
+                  {`${profileAddresses?.slpAddr?.slice(0, 8)}...${profileAddresses?.slpAddr?.slice(-5)}`}
+                </span>
+                <span className='d-none d-md-inline'>
+                  {profileAddresses?.slpAddr}
+                </span>
+              </span>
+              <CopyOnClick walletProp='slpAddr' appData={props.appData} value={profileAddresses?.slpAddr} />
+            </div>
+          )}
 
           {/* About Section */}
           {profile.about && (
@@ -146,6 +182,8 @@ function ProfileRead (props) {
             variant='primary'
             className='px-3 px-md-4 py-2 rounded-pill fw-semibold'
             style={{ minWidth: '120px' }}
+            onClick={handleMessage}
+            disabled={!loaded}
           >
             <i className='bi bi-chat-dots me-2' />
             Message

src/components/app-body/slp-tokens/index.js

@@ -15,6 +15,7 @@ import RefreshTokenBalance from './refresh-tokens'
 const SlpTokens = (props) => {
   const [appData, setAppData] = useState(props.appData)
   const [iconsAreLoaded, setIconsAreLoaded] = useState(false)
+  const [dataAreLoaded, setDataAreLoaded] = useState(false)
   const [tokens, setTokens] = useState([])
 
   const refreshTokenButtonRef = React.useRef()
@@ -44,37 +45,68 @@ const SlpTokens = (props) => {
     return url
   }
 
+  //  This function loads the token data .
+  const lazyLoadTokenData = useCallback(async (tokens) => {
+    try {
+      setDataAreLoaded(false)
+      // map each token and fetch the token data
+      for (let i = 0; i < tokens.length; i++) {
+        const thisToken = tokens[i]
+
+        // data does not  need to be downloaded, so continue with the next one
+        if (thisToken.dataAlreadyDownloaded) continue
+
+        // Try to get token data.
+        const tokenData = await appData.wallet.getTokenData(thisToken.tokenId)
+        console.log('tokenData', tokenData)
+        if (tokenData) {
+          // Set data to the token object , this can be used to display the token name in the token card component.
+          thisToken.tokenData = tokenData
+        }
+
+        // Mark token to prevent fetch token data again.
+        thisToken.dataAlreadyDownloaded = true
+      }
+
+      setDataAreLoaded(true)
+    } catch (error) {
+      setDataAreLoaded(true)
+    }
+  }, [appData])
+
   // Fetch mutable data if it exist and get the token icon url
-  const fetchTokenIcon = useCallback(async (token) => {
+  const fetchTokenMutableData = useCallback(async (token) => {
     try {
       // Get the token data
-      const tokenData = await appData.wallet.getTokenData(token.tokenId)
+      const tokenData = token.tokenData
+
       if (!tokenData.mutableData) return false // Return false if no mutable data
+
       // Get the token icon from the mutable data
       const cid = parseCid(tokenData.mutableData)
       console.log('mutable data cid', cid)
 
       const { json } = await appData.wallet.cid2json({ cid })
-
+      console.log('json: ', json)
       if (!json) return false
 
-      const iconUrl = json.tokenIcon
+      let iconUrl = json.tokenIcon
+
+      if (json.fullSizedUrl && json.fullSizedUrl.includes('http')) {
+        iconUrl = json.fullSizedUrl
+      }
+      const userData = json.userData
       // Return icon url
-      return iconUrl
+      return { iconUrl, userData }
     } catch (error) {
       return false
     }
   }, [appData])
 
   //  This function loads the token icons from the ipfs gateways.
-  const lazyLoadTokenIcons = useCallback(async () => {
+  const lazyLoadMutableData = useCallback(async (tokens) => {
     try {
       setIconsAreLoaded(false)
-
-      const tokens = appData.bchWalletState.slpTokens
-
-      setTokens(tokens) // update token state
-
       // map each token and fetch the icon url
       for (let i = 0; i < tokens.length; i++) {
         const thisToken = tokens[i]
@@ -83,28 +115,35 @@ const SlpTokens = (props) => {
         if (thisToken.iconAlreadyDownloaded) continue
 
         // Try to get token icon url from mutable data.
-        const iconUrl = await fetchTokenIcon(thisToken)
+        const { iconUrl, userData } = await fetchTokenMutableData(thisToken)
         console.log('iconUrl', iconUrl)
         if (iconUrl) {
           // Set the icon url to the token , this can be used to display the icon in the token card component.
           thisToken.icon = iconUrl
+          thisToken.tokenData.userData = userData
         }
 
         // Mark token to prevent fetch token icon again.
         thisToken.iconAlreadyDownloaded = true
       }
 
-      appData.updateBchWalletState({ walletObj: { slpTokens: tokens }, appData })
       setIconsAreLoaded(true)
     } catch (error) {
       setIconsAreLoaded(true)
     }
-  }, [appData, fetchTokenIcon])
+  }, [fetchTokenMutableData])
+
+  const loadData = useCallback(async () => {
+    const tokens = appData.bchWalletState.slpTokens
+    setTokens(tokens)
+    await lazyLoadTokenData(tokens)
+    await lazyLoadMutableData(tokens)
+  }, [appData, lazyLoadTokenData, lazyLoadMutableData])
 
   // Start to load the token icons when the component is mounted
   useEffect(() => {
-    lazyLoadTokenIcons()
-  }, [lazyLoadTokenIcons])
+    loadData()
+  }, [loadData])
 
   // Generate the token cards for each token in the wallet.
   const generateCards = () => {
@@ -127,7 +166,7 @@ const SlpTokens = (props) => {
             <RefreshTokenBalance
               appData={appData}
               ref={refreshTokenButtonRef}
-              lazyLoadTokenIcons={lazyLoadTokenIcons}
+              lazyLoadTokenIcons={loadData}
             />
           </Col>
           <Col xs={6} style={{ textAlign: 'right' }}>
@@ -138,8 +177,16 @@ const SlpTokens = (props) => {
         </Row>
         <Row>
           <Col xs={12} style={{ display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
-            {
-              !iconsAreLoaded && (
+            {/** Show spinner info if tokens are loaded but data is not loaded */
+              !dataAreLoaded && (
+                <div style={{ borderRadius: '10px', backgroundColor: '#f0f0f0', padding: '10px', display: 'flex', justifyContent: 'center', alignItems: 'center', width: 'fit-content' }}>
+                  <span style={{ marginRight: '10px' }}>Loading Token Data </span>
+                  <Spinner animation='border' />
+                </div>
+              )
+            }
+            {/** Show spinner info if tokens are loaded but icons are not loaded */
+              dataAreLoaded && !iconsAreLoaded && (
                 <div style={{ borderRadius: '10px', backgroundColor: '#f0f0f0', padding: '10px', display: 'flex', justifyContent: 'center', alignItems: 'center', width: 'fit-content' }}>
                   <span style={{ marginRight: '10px' }}>Loading Token Icons </span>
                   <Spinner animation='border' />

src/components/app-body/slp-tokens/info-button.js

@@ -6,8 +6,8 @@
 */
 
 // Global npm libraries
-import React, { useState } from 'react'
-import { Button, Modal, Container, Row, Col } from 'react-bootstrap'
+import React, { useState, useEffect } from 'react'
+import { Button, Modal, Container, Row, Col, Spinner } from 'react-bootstrap'
 
 // Takes a string as input. If it matches a pattern for a link, a JSX object is
 // returned with a link. Otherwise the original string is returned.
@@ -29,6 +29,7 @@ function linkIfUrl (url) {
 
 function InfoButton (props) {
   const [show, setShow] = useState(false)
+  const [mutableDataCid, setMutableDataCid] = useState(null)
 
   const handleClose = () => {
     setShow(false)
@@ -45,6 +46,33 @@ function InfoButton (props) {
 
   // console.log('props.token: ', props.token)
 
+  // Get Cid from url
+  const parseCid = (url) => {
+    // get the cid from the url format 'ipfs://bafybeicem27xbzs65uvbcgykcmscsgln3lmhbfrcoec3gdttkdgtxv5acq
+    if (url && url.includes('ipfs://')) {
+      const cid = url.split('ipfs://')[1]
+      return cid
+    }
+    return url
+  }
+  // Get token user data if it exists and verify if it contains media or markdown
+  useEffect(() => {
+    try {
+      console.log('props  token', props.token)
+      const userDataStr = props.token.tokenData.userData
+      if (userDataStr) {
+        const userData = JSON.parse(userDataStr)
+
+        // If user data contains media or markdown, set the mutable data cid
+        if (userData?.media || userData?.markdown) {
+          setMutableDataCid(parseCid(props.token.tokenData.mutableData))
+        }
+      }
+    } catch (error) {
+      // Do nothing
+    }
+  }, [props.token, show])
+
   return (
     <>
       <Button variant='info' onClick={handleOpen}>Info</Button>
@@ -87,6 +115,25 @@ function InfoButton (props) {
               <Col xs={4}><b>URL</b>:</Col>
               <Col xs={8}>{url}</Col>
             </Row>
+            {!props.token.iconAlreadyDownloaded && (
+              <div className='text-center'>
+                <Spinner animation='border' size='sm' />
+              </div>
+            )}
+            {props.token.iconAlreadyDownloaded && mutableDataCid && (
+              <Row style={{ paddingTop: '10px' }}>
+                <Col xs={4}><b>User Data</b>:</Col>
+                <Col xs={8}>
+                  <Button
+                    href={`/user-data/${props.token.tokenId}#single-view`}
+                    target='_blank'
+                    rel='noopener noreferrer'
+                  >
+                    View User Data
+                  </Button>
+                </Col>
+              </Row>
+            )}
           </Container>
         </Modal.Body>
         <Modal.Footer />

src/components/app-body/user-data-review.js

@@ -7,6 +7,7 @@ import React, { useState, useEffect } from 'react'
 import { useParams } from 'react-router-dom'
 import { Container, Row, Col, Spinner, Carousel } from 'react-bootstrap'
 import ReactMarkdown from 'react-markdown'
+import '../../App.css'
 
 function UserDataReview (props) {
   const appData = props.appData
@@ -108,7 +109,7 @@ function UserDataReview (props) {
               {/** Markdown Content */}
               {markdown
                 ? (
-                  <div className='markdown-content my-5 text-center'>
+                  <div className='markdown-content my-5'>
                     <ReactMarkdown>{markdown}</ReactMarkdown>
                   </div>
                   )

src/hooks/state.js

@@ -58,6 +58,9 @@ function useAppState () {
   // Nostr queries service
   const nostrQueriesRef = useRef(new NostrQueries({ relays: readRelays }))
 
+  // ProfileDM
+  const [startChannelChat, setStartChannelChat] = useState('')
+
   // The wallet state makes this a true progressive web app (PWA). As
   // balances, UTXOs, and tokens are retrieved, this state is updated.
   // properties are enumerated here for the purpose of documentation.
@@ -205,8 +208,9 @@ function useAppState () {
     updateRelaysData,
     restoreRelaysData,
     readRelays,
-    writeRelays
-
+    writeRelays,
+    startChannelChat,
+    setStartChannelChat
   }
 }
 

src/services/nostr-queries.js

@@ -6,6 +6,7 @@ import { RelayPool } from 'nostr'
 import * as nip19 from 'nostr-tools/nip19'
 import { nip04 } from 'nostr-tools'
 import { hexToBytes } from '@noble/hashes/utils' // already an installed dependency
+import axios from 'axios'
 
 export default class NostrQueries {
   constructor ({ relays }) {
@@ -13,6 +14,17 @@ export default class NostrQueries {
 
     this.loadedProfiles = {}
     this.loadedChannelsInfo = {}
+    this.blackList = []
+    this.blackListFetched = false
+  }
+
+  async start () {
+    try {
+      await this.getBlackList()
+    } catch (error) {
+      console.error('NostrQueries.start() error : ', error.message)
+      throw error
+    }
   }
 
   setRelays (relays) {
@@ -401,7 +413,7 @@ export default class NostrQueries {
         })
 
         pool.on('event', (relay, subId, ev) => {
-          console.log('post retrieved from ', relay.url, ev.sig)
+          // console.log('post retrieved from ', relay.url, ev.sig)
           if (ev.pubkey === pubKey) {
             const pk = ev.tags[0][1]
             list = [...list, pk]
@@ -459,4 +471,39 @@ export default class NostrQueries {
       throw error
     }
   }
+
+  async getBlackList () {
+    try {
+      if (this.blackListFetched) return
+      const opts = {
+        method: 'GET',
+        url: 'https://blacklists.psfoundation.info/nostr-chat-blacklist.json',
+        headers: {
+          'Content-Type': 'application/json'
+        }
+      }
+
+      const result = await axios.request(opts)
+      const { data } = result
+      const { npubs } = data
+
+      // // Dev test mock npub for testing purposes
+      // const myNpubMock = 'npub1y3xq402pu9aqms3khetnt5gzm54t63pzcla56wwfmwshde0ws77qkff5gc'
+      // npubs.push(myNpubMock)
+      // //
+
+      this.blackListFetched = true
+      for (let i = 0; i < npubs.length; i++) {
+        const npub = npubs[i]
+        const pubKey = this.npubToHex(npub)
+        this.blackList.push(pubKey)
+      }
+      console.log('BlackList ', this.blackList)
+
+      return data
+    } catch (error) {
+      console.log('Error on getBlackList()')
+      throw error
+    }
+  }
 }