Merge pull request #44 from Permissionless-Software-Foundation/ct-unstable

Minor design improvements

src/App.js

@@ -14,7 +14,10 @@ import NavMenu from './components/nav-menu'
 import useAppState from './hooks/state'
 import { UninitializedView, InitializedView } from './components/starter-views'
 
-const sigleViewPaths = ['/profile']
+// Paths with custom async loader
+// Single Views, load minimal async services in order to prevent the long-time screen loader.
+const sigleViewPaths = ['/profile', 'user-data']
+
 function App (props) {
   // Load all the app state into a single object that can be passed to child
   // components.
@@ -45,6 +48,9 @@ function App (props) {
         await asyncLoad.loadWalletLib()
         const walletTemp = await asyncLoad.initStarterWallet(appData.serverUrl, appData.lsState.mnemonic, appData)
         appData.setWallet(walletTemp)
+        // Get the BCH spot price
+        addToModal('Getting BCH spot price in USD', appData)
+        await asyncLoad.getUSDExchangeRate(walletTemp, appData.updateBchWalletState, appData)
       }
 
       // Update Modal State

src/components/app-body/nfts-for-sale/index.js

@@ -172,7 +172,7 @@ function NftsForSale (props) {
     } catch (error) {
       setIconsAreLoaded(true)
     }
-  }, [fetchTokenMutableData, appData])
+  }, [fetchTokenMutableData])
 
   //  Check if token data exists in the cache and add it to the tokens object.
   const reviewNftCachedData = useCallback(async (offers) => {

src/components/app-body/nfts-for-sale/info-button.js

@@ -98,17 +98,16 @@ function InfoButton (props) {
             </Row>
 
             {mutableDataCid && (
-              <Row>
+              <Row style={{ paddingTop: '10px' }}>
                 <Col xs={4}><b>User Data</b>:</Col>
                 <Col xs={8}>
-                  <a
-                    href={`/user-data/${props.token.tokenId}`}
+                  <Button
+                    href={`/user-data/${props.token.tokenId}#single-view`}
                     target='_blank'
                     rel='noopener noreferrer'
-                    className='btn btn-link p-0'
                   >
                     View User Data
-                  </a>
+                  </Button>
                 </Col>
               </Row>
             )}

src/components/app-body/nfts-for-sale/token-card.js

@@ -12,7 +12,7 @@ import InfoButton from './info-button'
 import BuyButton from './buy-button'
 
 function TokenCard (props) {
-  const { token, appData, handleRefresh } = props
+  const { token, appData, handleRefresh, hideBuyBtn } = props
   const [icon, setIcon] = useState(token.icon)
   const [tokenData, setTokenData] = useState(token.tokenData)
 
@@ -64,16 +64,16 @@ function TokenCard (props) {
               </Row>
               <br />
 
-              <Row>
+              <Row className='text-center'>
                 <Col>
                   <InfoButton token={token} disabled={!token.tokenData} />
                 </Col>
 
-                <Col />
-
-                <Col>
-                  <BuyButton token={token} disabled={!token.tokenData} appData={appData} onSuccess={handleRefresh} />
-                </Col>
+                {!hideBuyBtn && (
+                  <Col>
+                    <BuyButton token={token} disabled={!token.tokenData} appData={appData} onSuccess={handleRefresh} />
+                  </Col>
+                )}
               </Row>
 
             </Container>
@@ -83,17 +83,5 @@ function TokenCard (props) {
     </>
   )
 }
-// eslint-disable-next-line
-{/* <Col>
-                  <InfoButton token={props.token} />
-                </Col>
-
-                <Col>
-                  <FlagButton appData={props.appData} offer={props.token} />
-                </Col>
-
-                <Col>
-                  <BuyNftButton appData={props.appData} offer={props.token} />
-                </Col> */ }
 
 export default TokenCard

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

@@ -1,13 +1,15 @@
 /*
-Component for reading the nostr feeds.
+  Component for reading the nostr feeds.
 */
 
 // Global npm libraries
 import React, { useState, useEffect, useCallback } from 'react'
 import { Container, Nav, Tab, Spinner } from 'react-bootstrap'
+import { RelayPool } from 'nostr'
+
+// Local libraries
 import Feed from './feed'
 import Following from './following'
-import { RelayPool } from 'nostr'
 
 function Feeds (props) {
   const { appData } = props

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

@@ -1,10 +1,12 @@
 /*
-Component for posting nostr information.
+  Component for posting nostr information.
 */
 
 // Global npm libraries
 import React from 'react'
 import { Container } from 'react-bootstrap'
+
+// Local libraries
 import ProfilePost from './profile-post'
 import PublicPost from './public-post'
 

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

@@ -11,6 +11,9 @@ import { Relay } from 'nostr-tools/relay'
 import { hexToBytes } from '@noble/hashes/utils' // already an installed dependency
 import { RelayPool } from 'nostr'
 
+// Local libraries
+import config from '../../../../config'
+
 function ProfilePost (props) {
   const { bchWalletState } = props.appData
   const [accordionKey, setAccordionKey] = useState(null)
@@ -90,7 +93,7 @@ function ProfilePost (props) {
       const privateKeyBin = hexToBytes(nostrKeyPair.privHex)
 
       // Relay list
-      const psf = 'wss://nostr-relay.psfoundation.info'
+      // const psf = 'wss://nostr-relay.psfoundation.info'
 
       const formDataString = JSON.stringify(formData)
 
@@ -107,16 +110,24 @@ function ProfilePost (props) {
       const signedEvent = finalizeEvent(eventTemplate, privateKeyBin)
       console.log('signedEvent: ', signedEvent)
 
-      // Connect to a relay.
-      const relay = await Relay.connect(psf)
-      console.log(`connected to ${relay.url}`)
+      // Publish the post to each relay.
+      config.nostrRelays.map(async (relayUrl) => {
+        try {
+          // Connect to a relay.
+          const relay = await Relay.connect(relayUrl)
+          console.log(`connected to ${relay.url}`)
 
-      // Publish the message to the relay.
-      const result = await relay.publish(signedEvent)
-      console.log('result: ', result)
+          // Publish the message to the relay.
+          const result = await relay.publish(signedEvent)
+          console.log('result: ', result)
+
+          // Close the connection to the relay.
+          relay.close()
+        } catch (err) {
+          console.warn(`Skipping publishing to ${relayUrl} due to error: ${err}`)
+        }
+      })
 
-      // Close the connection to the relay.
-      relay.close()
       setSuccessMsg('Post successfully published!')
       setOnFetch(false)
     } catch (error) {

src/components/app-body/nostr/nostr-post/public-post.js

@@ -1,5 +1,5 @@
 /*
-Component for posting nostr information on kind 1.
+  Component for posting nostr information on kind 1.
 */
 
 // Global npm libraries
@@ -10,8 +10,11 @@ import { finalizeEvent } from 'nostr-tools/pure'
 import { Relay } from 'nostr-tools/relay'
 import { hexToBytes } from '@noble/hashes/utils' // already an installed dependency
 
+// Local libraries
+import config from '../../../../config'
+
 function PublicPost (props) {
-  const [accordionKey, setAccordionKey] = useState(null)
+  const [accordionKey, setAccordionKey] = useState('0')
   const [onFetch, setOnFetch] = useState(false)
   const { bchWalletState } = props.appData
   const [formData, setFormData] = useState({
@@ -44,9 +47,6 @@ function PublicPost (props) {
       // Convert private key to binary
       const privateKeyBin = hexToBytes(nostrKeyPair.privHex)
 
-      // Relay list
-      const psf = 'wss://nostr-relay.psfoundation.info'
-
       // BCH address of the user.
       const bchAddr = bchWalletState.address
 
@@ -63,16 +63,24 @@ function PublicPost (props) {
       const signedEvent = finalizeEvent(eventTemplate, privateKeyBin)
       console.log('signedEvent: ', signedEvent)
 
-      // Connect to a relay.
-      const relay = await Relay.connect(psf)
-      console.log(`connected to ${relay.url}`)
+      // Publish the post to each relay.
+      config.nostrRelays.map(async (relayUrl) => {
+        try {
+          // Connect to a relay.
+          const relay = await Relay.connect(relayUrl)
+          console.log(`connected to ${relay.url}`)
 
-      // Publish the message to the relay.
-      const result = await relay.publish(signedEvent)
-      console.log('result: ', result)
+          // Publish the message to the relay.
+          const result = await relay.publish(signedEvent)
+          console.log('result: ', result)
+
+          // Close the connection to the relay.
+          relay.close()
+        } catch (err) {
+          console.warn(`Skipping publishing to ${relayUrl} due to error: ${err}`)
+        }
+      })
 
-      // Close the connection to the relay.
-      relay.close()
       resetForm()
       setSuccessMsg('Post successfully published!')
       setOnFetch(false)

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

@@ -9,7 +9,7 @@ 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'
 function Profile (props) {
   const [profile, setProfile] = useState(false)
   const { npub } = useParams()
@@ -20,6 +20,7 @@ function Profile (props) {
         <ProfileRead {...props} setProfile={setProfile} npub={npub} />
         <PublicRead {...props} profile={profile} npub={npub} />
         <SlpTokensDisplay {...props} npub={npub} />
+        <NFTForSale {...props} npub={npub} />
       </Container>
     </>
   )

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

@@ -0,0 +1,321 @@
+/**
+ * Component for displaying SLP tokens in a grid layout
+ */
+import React, { useState, useEffect, useCallback } from 'react'
+import { Container, Row, Col, Spinner } from 'react-bootstrap'
+import config from '../../../../config'
+import axios from 'axios'
+import TokenCard from '../../nfts-for-sale/token-card'
+
+function NFTForSale (props) {
+  const { appData, npub } = props
+
+  const [offers, setOffers] = useState([])
+  const [offersAreLoaded, setOffersAreLoaded] = useState(false)
+  const [iconsAreLoaded, setIconsAreLoaded] = useState(false)
+  const [dataAreLoaded, setDataAreLoaded] = 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 = () => {
+    loadNftOffers()
+  }
+
+  // Function to process token data
+  const processTokenData = useCallback(async (offer) => {
+    try {
+      const { wallet, bchWalletState } = appData
+      const { bchjs } = wallet
+
+      // Calculate USD price
+      const rateInSats = parseInt(offer.rateInBaseUnit)
+      const bchCost = bchjs.BitcoinCash.toBitcoinCash(rateInSats)
+      const usdPrice = bchCost * bchWalletState.bchUsdPrice * offer.numTokens
+      offer.usdPrice = `$${usdPrice.toFixed(3)}`
+
+      return offer
+    } catch (err) {
+      console.error('Error processing token:', err)
+      return offer
+    }
+  }, [appData])
+
+  //  Fetch offers
+  const getNftOffers = useCallback(async (page = 0) => {
+    try {
+      setOffersAreLoaded(false)
+      const addr = await getAddressByNpub(npub)
+      const url = `${config.dexServer}/offer/list/addr/${addr}`
+      const result = await axios.get(url)
+      const rawOffers = result.data
+      console.log('rawOffers: ', rawOffers)
+
+      // Process each offer
+      const processedOffers = []
+      for (let i = 0; i < rawOffers.length; i++) {
+        const offer = rawOffers[i]
+        const processedOffer = await processTokenData(offer)
+        processedOffers.push(processedOffer)
+      }
+
+      setOffersAreLoaded(true)
+
+      return processedOffers
+    } catch (err) {
+      console.error('getNftOffers error:', err)
+      setOffersAreLoaded(true)
+      throw err
+    }
+  }, [processTokenData, getAddressByNpub, npub])
+
+  //  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 fetchTokenMutableData = useCallback(async (token) => {
+    try {
+      // Get the token data
+      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
+
+      let iconUrl = json.tokenIcon
+
+      if (json.fullSizedUrl && json.fullSizedUrl.includes('http')) {
+        iconUrl = json.fullSizedUrl
+      }
+      const userData = json.userData
+      // Return icon url
+      return { iconUrl, userData }
+    } catch (error) {
+      return false
+    }
+  }, [appData])
+
+  //  This function loads the token icons from the ipfs gateways.
+  const lazyLoadMutableData = useCallback(async (tokens) => {
+    try {
+      setIconsAreLoaded(false)
+      // map each token and fetch the icon url
+      for (let i = 0; i < tokens.length; i++) {
+        const thisToken = tokens[i]
+
+        // Incon does not  need to be downloaded, so continue with the next one
+        if (thisToken.iconAlreadyDownloaded) continue
+
+        // Try to get token icon url from mutable data.
+        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
+      }
+
+      setIconsAreLoaded(true)
+    } catch (error) {
+      setIconsAreLoaded(true)
+    }
+  }, [fetchTokenMutableData])
+
+  //  Check if token data exists in the cache and add it to the tokens object.
+  const reviewNftCachedData = useCallback(async (offers) => {
+    const cacheData = appData.nftForSaleCacheData
+    console.log(`Token data from cache: ${JSON.stringify(cacheData, null, 2)}`)
+    // Map all offers
+    for (let i = 0; i < offers.length; i++) {
+      const thisToken = offers[i]
+      const cacheToken = cacheData[thisToken.tokenId]
+      // If cache data exists, add it to the token object
+      if (cacheToken) {
+        thisToken.tokenData = cacheToken.tokenData
+        thisToken.icon = cacheToken.tokenIcon
+      }
+    }
+  }, [appData])
+
+  //  Check if token data exists in the cache and add it to the tokens object.
+  const updateNFTCachedData = useCallback(async (offers) => {
+    // Map all offers
+    for (let i = 0; i < offers.length; i++) {
+      const thisToken = offers[i]
+      // save token icon and token data in cache
+      const newTokenCacheData = {
+        tokenIcon: thisToken.icon,
+        tokenData: thisToken.tokenData
+      }
+
+      console.log('newTokenCacheData: ', newTokenCacheData)
+      appData.updateNFTCachedData(thisToken.tokenId, newTokenCacheData)
+    }
+  }, [appData])
+
+  // Main function to load NFT offers
+  const loadNftOffers = useCallback(async () => {
+    try {
+      // Get tokens in offers
+      const offers = await getNftOffers()
+      console.log('offers: ', offers)
+      // Review cached data to populate token data from cached data
+      await reviewNftCachedData(offers)
+      // set state to start displaying tokens cards.
+      setOffers(offers)
+      // Load tokens data for any updates to the token data
+      await lazyLoadTokenData(offers)
+      // Load tokens icons from mutable data
+      await lazyLoadMutableData(offers)
+
+      //  Update cached data with the latest retrieved data
+      await updateNFTCachedData(offers)
+    } catch (err) {
+      console.error('Error loading NFT offers:', err)
+    }
+  }, [lazyLoadTokenData, lazyLoadMutableData, getNftOffers, reviewNftCachedData, updateNFTCachedData])
+
+  // Effect to load NFTs on component mount
+  useEffect(() => {
+    console.log('loading nfts for sale')
+    loadNftOffers()
+  }, [loadNftOffers])
+
+  // 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
+  }
+
+  // This function generates a Token Card for each token in the wallet.
+  function generateCards (offers) {
+    console.log('generateCards() offerData: ', offers)
+
+    const tokens = offers
+
+    const tokenCards = []
+
+    for (let i = 0; i < tokens.length; i++) {
+      const thisToken = tokens[i]
+
+      const thisTokenCard = (
+        <TokenCard
+          appData={appData}
+          token={thisToken}
+          handleRefresh={handleRefresh}
+          key={`${thisToken.tokenId + i}`}
+          hideBuyBtn
+          hideSendBtn
+        />
+      )
+      tokenCards.push(thisTokenCard)
+    }
+
+    return tokenCards
+  }
+
+  return (
+    <Container>
+      {!offersAreLoaded && (
+        <div className='d-flex justify-content-center align-items-center h-100 mb-4'>
+          <Spinner />
+        </div>
+      )}
+      {offersAreLoaded && offers.length !== 0 && (
+        <div className='bg-white rounded-1 shadow-sm border mb-4'>
+          <div className='p-3 border-bottom bg-light rounded-top-4'>
+            <h5 className='mb-0 fw-bold text-dark'>Tokens For Sale</h5>
+          </div>
+          <div
+            className='p-3'
+            style={{
+              height: '800px',
+              overflowY: 'auto',
+              maxHeight: '800px'
+            }}
+          >
+
+            <Row>
+              <Col xs={12} style={{ display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
+                {/** Show spinner info if tokens are loaded but data is not loaded */
+                  offersAreLoaded && !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' />
+                    </div>
+                  )
+                }
+
+              </Col>
+            </Row>
+
+            {!offersAreLoaded && (
+              <Row className='d-block text-center'>
+                <Spinner animation='border' variant='primary' style={{ maegin: '0 auto' }} />
+              </Row>
+            )}
+            <Row>
+              {offersAreLoaded && generateCards(offers)}
+            </Row>
+
+          </div>
+        </div>
+      )}
+    </Container>
+  )
+}
+
+export default NFTForSale

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

@@ -13,11 +13,11 @@ import { Button, Modal, Container, Row, Col } from 'react-bootstrap'
 // returned with a link. Otherwise the original string is returned.
 function linkIfUrl (url) {
   // Convert the URL into a link if it contains 'http'
-  if (url.includes('http')) {
+  if (url?.includes('http')) {
     url = (<a href={url} target='_blank' rel='noreferrer'>{url}</a>)
 
     //
-  } else if (url.includes('ipfs://')) {
+  } else if (url?.includes('ipfs://')) {
     // Convert to a Filecoin link if its an IPFS reference.
 
     const cid = url.substring(7)

src/config/index.js

@@ -18,7 +18,12 @@ const config = {
   // dexServer: 'http://localhost:5700',
 
   nostrTopic: 'bch-dex-test-topic-02',
-  nostrRelay: 'wss://nostr-relay.psfoundation.info'
+  nostrRelay: 'wss://nostr-relay.psfoundation.info',
+  nostrRelays: [
+    'wss://nostr-relay.psfoundation.info',
+    'wss://nos.lol',
+    'wss://relay.damus.io'
+  ]
 
 }