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

Upstream merge

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

@@ -16,8 +16,7 @@ import { useNavigate } from 'react-router-dom'
 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({})
 
@@ -118,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 && (

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 />