Merge pull request #79 from Permissionless-Software-Foundation/dh-counter-offer-data

feat(offer): Added more Counter Offer data

package-lock.json

@@ -15,7 +15,7 @@
         "@fortawesome/react-fontawesome": "0.2.2",
         "@noble/hashes": "1.8.0",
         "axios": "0.27.2",
-        "bch-dex-lib": "2.2.0",
+        "bch-dex-lib": "2.3.1",
         "bch-message-lib": "2.2.1",
         "bch-nostr": "1.3.4",
         "bch-token-sweep": "2.2.1",
@@ -10043,9 +10043,9 @@
       "license": "MIT"
     },
     "node_modules/bch-dex-lib": {
-      "version": "2.2.0",
+      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/bch-dex-lib/-/bch-dex-lib-2.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/bch-dex-lib/-/bch-dex-lib-2.3.1.tgz",
-      "integrity": "sha512-SORqn4qNmbxfL2SbbapOpbcCB+FtqasR+GT0XRifdkXFjA3aDL0gwMsHjh8IzLZnKtPYSBcfgzKQFxEsXCJNug==",
+      "integrity": "sha512-HlY21BpUUaSsuZNWF5LGPwSJU7m2kYbNMcS36o22RSHuO1kiBMONHwkV+v22kdbDk3T/Iz+AZN0mzJvH5neCXw==",
       "license": "MIT",
       "dependencies": {
         "@chris.troutner/retry-queue": "1.0.10",

package.json

@@ -9,7 +9,7 @@
     "@fortawesome/react-fontawesome": "0.2.2",
     "@noble/hashes": "1.8.0",
     "axios": "0.27.2",
-    "bch-dex-lib": "2.2.0",
+    "bch-dex-lib": "2.3.1",
     "bch-message-lib": "2.2.1",
     "bch-nostr": "1.3.4",
     "bch-token-sweep": "2.2.1",

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

@@ -67,6 +67,44 @@ function App (props) {
     return false
   }, [appData, addToModal])
 
+  /**
+   *  Run background process to get bch and slp balance.
+   *  Also update the background state process.
+   *  On error this function should trigger a info modal notifying the errors.
+   */
+  const backgroundAsync = useCallback(async (asyncLoad, walletTemp) => {
+    try {
+      appData.setModalBody(['Getting BCH balance in background!.'])
+      // Get Wallet Balance
+      await asyncLoad.getWalletBchBalance(walletTemp, appData.updateBchWalletState, appData)
+      // Update Background state
+      appData.updateBackGroundInitState({ bchInitLoaded: true })
+
+      // Get SLP Balance
+      appData.setModalBody(['Getting SLP tokens in background!.'])
+      await asyncLoad.getSlpTokenBalances(walletTemp, appData.updateBchWalletState, appData)
+
+      // Update Background state
+      appData.updateBackGroundInitState({ slpInitLoaded: true, asyncBackgroundFinished: true })
+    } catch (err) {
+      console.log('App.js backgroundAsync() error!', err)
+
+      appData.updateBackGroundInitState({ asyncBackgroundFinished: true })
+
+      addToModal(`Error: ${err.message}`, appData)
+      addToModal('Try selecting a different back end server using the drop-down menu at the bottom of the app.\'', appData)
+
+      // Update Modal State
+      appData.setHideSpinner(true)
+      appData.setShowStartModal(true)
+      appData.setDenyClose(false)
+
+      // Update the startup state.
+      appData.setAsyncInitFinished(true)
+      appData.setAsyncInitSucceeded(false)
+    }
+  }, [appData, addToModal])
+
   /** Load all required data before component start. */
   useEffect(() => {
     async function asyncEffect () {
@@ -74,6 +112,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.
@@ -98,14 +137,6 @@ function App (props) {
           appData.setWallet(walletTemp)
           // appData.updateBchWalletState({ walletObj: walletTemp.walletInfo, appData })
 
-          // Get the BCH balance of the wallet.
-          addToModal('Getting BCH balance', appData)
-          await asyncLoad.getWalletBchBalance(walletTemp, appData.updateBchWalletState, appData)
-
-          // Get the SLP tokens held by the wallet.
-          addToModal('Getting SLP tokens', appData)
-          await asyncLoad.getSlpTokenBalances(walletTemp, appData.updateBchWalletState, appData)
-
           // Get the BCH spot price
           addToModal('Getting BCH spot price in USD', appData)
           await asyncLoad.getUSDExchangeRate(walletTemp, appData.updateBchWalletState, appData)
@@ -132,6 +163,13 @@ function App (props) {
           appData.setAsyncInitFinished(true)
           appData.setAsyncInitSucceeded(true)
           console.log('App.js useEffect() startup finished successfully')
+
+          backgroundAsync(asyncLoad, walletTemp)
+          // Get the BCH balance of the wallet.
+          // addToModal('Getting BCH balance', appData)
+
+          // Get the SLP tokens held by the wallet.
+          // addToModal('Getting SLP tokens', appData)
         } catch (err) {
           const errModalBody = [
             `Error: ${err.message}`,
@@ -151,7 +189,7 @@ function App (props) {
       }
     }
     asyncEffect()
-  }, [appData, addToModal, isSignleView])
+  }, [appData, addToModal, isSignleView, backgroundAsync])
 
   return (
     <>

src/components/app-body/bch-send/balance-card.js

@@ -3,18 +3,39 @@
 */
 
 // Global npm libraries
-import React from 'react'
+import React, { useEffect, useState } from 'react'
-import { Container, Row, Col, Card } from 'react-bootstrap'
+import { Container, Row, Col, Card, Spinner } from 'react-bootstrap'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faCoins } from '@fortawesome/free-solid-svg-icons'
 
 const BalanceCard = (props) => {
   const { appData } = props
+  const [sats, setSats] = useState('')
+  const [bchBalance, setbchBalance] = useState('')
+  const [usdBalance, setusdBalance] = useState('')
 
-  const bchjs = appData.wallet.bchjs
+  const { bchInitLoaded, asyncBackgroundFinished } = appData.asyncBackGroundInitState
-  const sats = appData.bchWalletState.bchBalance
+
-  const bchBalance = bchjs.BitcoinCash.toBitcoinCash(sats)
+  // Calculate balances if wallet is successfully loaded!
-  const usdBalance = bchjs.Util.floor2(bchBalance * appData.bchWalletState.bchUsdPrice)
+  useEffect(() => {
+    try {
+      const bchjs = appData.wallet.bchjs
+      if (bchjs && appData.asyncInitSucceeded) {
+        const sats = appData.bchWalletState.bchBalance
+        const bchBalance = bchjs.BitcoinCash.toBitcoinCash(sats)
+        const usdBalance = bchjs.Util.floor2(bchBalance * appData.bchWalletState.bchUsdPrice)
+
+        setSats(sats)
+        setbchBalance(bchBalance)
+        setusdBalance(usdBalance)
+      }
+    } catch (error) {
+      // console.warn(error)
+    }
+  }, [appData])
+  // Background bch data loaded finished
+  const backgroundDataLoaded = bchInitLoaded || asyncBackgroundFinished
+  const backgroundDataError = !bchInitLoaded && asyncBackgroundFinished
 
   return (
     <>
@@ -25,25 +46,37 @@ const BalanceCard = (props) => {
           </Card.Title>
           <br />
 
-          <Container>
+          {bchInitLoaded && (
-            <Row>
+            <Container>
-              <Col>
+              <Row>
-                <b>USD</b>: ${usdBalance}
+                <Col>
-              </Col>
+                  <b>USD</b>: ${usdBalance}
-            </Row>
+                </Col>
+              </Row>
 
-            <Row>
+              <Row>
-              <Col>
+                <Col>
-                <b>BCH</b>: {bchBalance}
+                  <b>BCH</b>: {bchBalance}
-              </Col>
+                </Col>
-            </Row>
+              </Row>
 
-            <Row>
+              <Row>
-              <Col>
+                <Col>
-                <b>Satoshis</b>: {sats}
+                  <b>Satoshis</b>: {sats}
-              </Col>
+                </Col>
-            </Row>
+              </Row>
-          </Container>
+            </Container>)}
+          {backgroundDataError && (
+            <Container>
+              <span style={{ color: 'red' }}>Balance could not be loaded!</span>
+            </Container>
+          )}
+
+          {!backgroundDataLoaded && appData.asyncInitSucceeded && (
+            <div className='balance-spinner-container'>
+              <Spinner animation='border' />
+            </div>
+          )}
         </Card.Body>
       </Card>
     </>

src/components/app-body/bch-send/refresh-balance.js

@@ -50,6 +50,9 @@ export default function RefreshBchBalance (props) {
       // Get the latest balance of the wallet.
       const newBalance = await wallet.getBalance({ bchAddress: cashAddr })
 
+      // if bchInitLoaded is 'false', them set as true , to show the new balance.
+      appData.updateBackGroundInitState({ bchInitLoaded: true })
+
       addToModal('Updating BCH per USD price...')
       const bchUsdPrice = await wallet.getUsd()
 

src/components/app-body/bch-send/refresh-bch-balance-button.js

@@ -16,6 +16,10 @@ import RefreshBchBalance from './refresh-balance'
 function RefreshBchBalanceButton (props) {
   // Dependency injections of props
   const appData = props.appData
+  const { bchInitLoaded, asyncBackgroundFinished } = appData.asyncBackGroundInitState
+
+  // Background bch data loaded finished
+  const backgroundDataLoaded = bchInitLoaded || asyncBackgroundFinished
 
   // Child function references
   const refreshBchBalanceRef = useRef()
@@ -28,7 +32,7 @@ function RefreshBchBalanceButton (props) {
 
   return (
     <>
-      <Button variant='success' onClick={() => { handleButtonRefreshBalance(appData) }}>
+      <Button variant='success' onClick={() => { handleButtonRefreshBalance(appData) }} disabled={!backgroundDataLoaded}>
         <FontAwesomeIcon icon={faRedo} size='lg' /> Refresh
       </Button>
 

src/components/app-body/bch-send/send-card.js

@@ -15,6 +15,7 @@ import RefreshBchBalance from './refresh-balance'
 function SendCard (props) {
   // Dependency injection through props
   const appData = props.appData
+  const { bchInitLoaded, asyncBackgroundFinished } = appData.asyncBackGroundInitState
 
   // Modal State
   const [modalBody, setModalBody] = useState([])
@@ -29,6 +30,9 @@ function SendCard (props) {
   const [oppositeUnits, setOppositeUnits] = useState('BCH')
   const [oppositeQty, setOppositeQty] = useState(0)
 
+  // Background bch data loaded finished
+  const backgroundDataLoaded = bchInitLoaded || asyncBackgroundFinished
+
   // Child function references
   const refreshBchBalanceRef = useRef()
 
@@ -318,7 +322,7 @@ function SendCard (props) {
 
             <Row>
               <Col style={{ textAlign: 'center' }}>
-                <Button onClick={(e) => handleSendBch({ sendCardData, appData })}>Send</Button>
+                <Button onClick={(e) => handleSendBch({ sendCardData, appData })} disabled={!backgroundDataLoaded}>Send</Button>
               </Col>
             </Row>
 

src/components/app-body/counter-offers/counter-offer-card.js

@@ -0,0 +1,71 @@
+/*
+  This Card component displays a counter offer with token icon, name, and price.
+*/
+
+// Global npm libraries
+import React, { useState } from 'react'
+import { Container, Row, Col, Card, Button } from 'react-bootstrap'
+import Jdenticon from '@chris.troutner/react-jdenticon'
+
+function CounterOfferCard (props) {
+  const { offer } = props
+  const [icon, setIcon] = useState(offer.tokenIcon)
+
+  return (
+    <>
+      <Col xs={12} sm={6} lg={4} style={{ padding: '25px' }}>
+        <Card className='shadow-sm'>
+          <Card.Body style={{ textAlign: 'center', padding: '10px' }}>
+            {/** If the icon is loaded, display it */}
+            {icon && (
+              <Card.Img
+                src={icon}
+                style={{ height: '100px', width: 'auto', margin: '0 auto' }}
+                onError={(e) => {
+                  setIcon(null) // Set the icon to null if it fails to load the image url.
+                }}
+              />
+            )}
+
+            {/** If the icon is not loaded, display the Jdenticon */}
+            {!icon && (
+              <div style={{ display: 'flex', justifyContent: 'center', marginBottom: '10px' }}>
+                <Jdenticon size='100' value={offer.tokenId} />
+              </div>
+            )}
+
+            <Card.Title style={{ textAlign: 'center', marginTop: '10px' }}>
+              <h4>{offer.ticker}</h4>
+            </Card.Title>
+
+            <Container>
+              <Row>
+                <Col>
+                  {/* <strong>{offer.tokenName}</strong> */}
+                  <strong>Counter Offer UTXO</strong>
+                </Col>
+              </Row>
+              <br />
+
+              <Row>
+                {/* <Col>Price:</Col> */}
+                <Col><strong>{offer.price}</strong></Col>
+              </Row>
+              <br />
+
+              <Row className='text-center'>
+                <Col>
+                  <Button disabled variant='danger' size='sm'>
+                    Cancel
+                  </Button>
+                </Col>
+              </Row>
+            </Container>
+          </Card.Body>
+        </Card>
+      </Col>
+    </>
+  )
+}
+
+export default CounterOfferCard

src/components/app-body/counter-offers/index.js

@@ -0,0 +1,90 @@
+/*
+  Shows Counter Offers created by the user.
+*/
+
+// Global npm libraries
+import React, { useState, useEffect } from 'react'
+import { Container, Row, Col, Spinner } from 'react-bootstrap'
+
+// Local libraries
+import CounterOfferCard from './counter-offer-card'
+import AsyncLoad from '../../../services/async-load'
+
+function CounterOffers (props) {
+  const appData = props.appData
+
+  const [counterOffers, setCounterOffers] = useState([])
+  const [isLoading, setIsLoading] = useState(true)
+
+  // Generate counter offer cards
+  const generateCards = () => {
+    return counterOffers.map((offer) => (
+      <CounterOfferCard
+        key={offer.id}
+        offer={offer}
+        appData={appData}
+      />
+    ))
+  }
+
+  useEffect(() => {
+    const loadWallet = async () => {
+      try {
+        setIsLoading(true)
+        const { bchWalletState, serverUrl } = appData
+        const asyncLoad = new AsyncLoad()
+        await asyncLoad.loadWalletLib()
+        const counterOfferWallet = await asyncLoad.getDerivatedWallet(serverUrl, bchWalletState.mnemonic, "m/44'/245'/0'/0/1")
+
+        const utxoStore = counterOfferWallet.utxos.utxoStore
+        const bchUtxos = utxoStore.bchUtxos
+        setCounterOffers(bchUtxos)
+        console.log('counterOffers', bchUtxos)
+        setIsLoading(false)
+      } catch (error) {
+        setIsLoading(false)
+        console.log('error', error)
+      }
+    }
+
+    loadWallet()
+  }, [appData])
+
+  return (
+    <Container>
+      <Row>
+        <Col>
+          <h1>Counter Offers</h1>
+          <p className='text-muted'>Your pending counter offers</p>
+        </Col>
+      </Row>
+      {isLoading
+        ? (
+          <Row className='text-center' style={{ padding: '50px' }}>
+            <Col>
+              <Spinner animation='border' role='status'>
+                <span className='visually-hidden'>Loading...</span>
+              </Spinner>
+              <p className='mt-3 text-muted'>Loading counter offers...</p>
+            </Col>
+          </Row>
+          )
+        : (
+          <>
+            <Row>
+              {generateCards()}
+            </Row>
+            {counterOffers.length === 0 && (
+              <Row className='text-center'>
+                <Col>
+                  <p>No counter offers found.</p>
+                </Col>
+              </Row>
+            )}
+          </>
+          )}
+    </Container>
+  )
+}
+
+export default CounterOffers

src/components/app-body/index.js

@@ -30,6 +30,7 @@ import ContentCreators from './nostr/content-creators/index.js'
 import UserDataReview from './user-data-review'
 import Offers from './offers'
 import NostrChat from './nostr-chat'
+import CounterOffers from './counter-offers'
 function AppBody (props) {
   // Dependency injection through props
   const appData = props.appData
@@ -55,6 +56,7 @@ function AppBody (props) {
         <Route path='/content-creators' element={<ContentCreators appData={appData} />} />
         <Route path='/user-data/:tokenId' element={<UserDataReview appData={appData} />} />
         <Route path='/offers' element={<Offers appData={appData} />} />
+        <Route path='/counter-offers' element={<CounterOffers appData={appData} />} />
         <Route path='/nostr-chat' element={<NostrChat appData={appData} />} />
       </Routes>
       {/** Show in all paths except the servers view */}

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

@@ -6,6 +6,7 @@
 // Global npm libraries
 import React, { useState } from 'react'
 import { Button, Modal, Container, Row, Col, Spinner } from 'react-bootstrap'
+import AsyncLoad from '../../../services/async-load'
 
 function BuyButton (props) {
   const { token, appData, onSuccess } = props
@@ -45,10 +46,19 @@ function BuyButton (props) {
 
       // Generate a counter offer.
       const bchDexLib = appData.dexLib
-      const { offerData, partialHex } = await bchDexLib.take.takeOffer(
+      const { offerData, partialHex, counterOfferUtxo } = await bchDexLib.take.takeOffer(
         targetOffer
       )
 
+      // Get counter offer data
+      const asyncLoad = new AsyncLoad()
+      const { takerAddr, takerNpub, counterOfferAddr } = await asyncLoad.getCounterOfferMetadata(appData)
+
+      offerData.takerAddr = takerAddr
+      offerData.takerNpub = takerNpub
+      offerData.counterOfferAddr = counterOfferAddr
+      offerData.counterOfferUtxo = counterOfferUtxo.txid
+
       progress.push(<p key='progress-msg2'>Uploading counter offer to Nostr...</p>)
       setProgressMsg(progress)
 

src/components/app-body/nfts-for-sale/filter-dropdown.js

@@ -0,0 +1,41 @@
+import React from 'react'
+import { Dropdown } from 'react-bootstrap'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faFilter } from '@fortawesome/free-solid-svg-icons'
+
+function FilterDropdown (props) {
+  const { selectedFilter, setSelectedFilter } = props
+
+  return (
+    <Dropdown>
+      <Dropdown.Toggle
+        variant='outline-secondary'
+        className='d-flex align-items-center justify-content-around gap-2 mt-3'
+        style={{ minWidth: '150px' }}
+      >
+        <FontAwesomeIcon icon={faFilter} />
+        <span>{selectedFilter}</span>
+      </Dropdown.Toggle>
+
+      <Dropdown.Menu>
+        <Dropdown.Item onClick={() => setSelectedFilter('Misc')}>
+          Misc
+        </Dropdown.Item>
+        <Dropdown.Item onClick={() => setSelectedFilter('Art')}>
+          Art
+        </Dropdown.Item>
+        <Dropdown.Item onClick={() => setSelectedFilter('Video')}>
+          Video
+        </Dropdown.Item>
+        <Dropdown.Item onClick={() => setSelectedFilter('Writing')}>
+          Writing
+        </Dropdown.Item>
+        <Dropdown.Item onClick={() => setSelectedFilter('Download')}>
+          Download
+        </Dropdown.Item>
+      </Dropdown.Menu>
+    </Dropdown>
+  )
+}
+
+export default FilterDropdown

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

@@ -11,7 +11,7 @@
 */
 
 // Global npm libraries
-import React, { useState, useEffect, useCallback } from 'react'
+import React, { useState, useEffect, useCallback, useRef } from 'react'
 import { Container, Row, Col, Button, Spinner } from 'react-bootstrap'
 import axios from 'axios'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
@@ -20,6 +20,7 @@ import { faRedo } from '@fortawesome/free-solid-svg-icons'
 // Local libraries
 import config from '../../../config'
 import TokenCard from './token-card'
+import FilterDropdown from './filter-dropdown'
 
 // Global variables and constants
 const SERVER = config.dexServer
@@ -33,11 +34,26 @@ function NftsForSale (props) {
   const [offersAreLoaded, setOffersAreLoaded] = useState(false)
   const [iconsAreLoaded, setIconsAreLoaded] = useState(false)
   const [dataAreLoaded, setDataAreLoaded] = useState(false)
+  const [currentPage, setCurrentPage] = useState(0)
+  const [lastLoadedPage, setLastLoadedPage] = useState(0)
+  const [totalPages, setTotalPages] = useState(0)
+  const [selectedFilter, setSelectedFilter] = useState('Misc')
 
-  // Handler for refresh button
+  // Flag to prevent load data multiple times on component mount!
-  const handleRefresh = () => {
+  const componentMountRef = useRef(false)
-    console.log('handling refresh')
+
-    loadNftOffers()
+  // Handler for previous page
+  const handlePreviousPage = () => {
+    if (currentPage > 0) {
+      setCurrentPage(currentPage - 1)
+    }
+  }
+
+  // Handler for next page
+  const handleNextPage = () => {
+    if (currentPage < totalPages - 1) {
+      setCurrentPage(currentPage + 1)
+    }
   }
 
   // Function to process token data
@@ -58,6 +74,20 @@ function NftsForSale (props) {
       return offer
     }
   }, [appData])
+  // Function to process token metadata (iconUrl , userData).
+  const processOfferMetadata = useCallback(async (offer) => {
+    try {
+      // Token icon
+      if (offer.tokenIconUrl) {
+        offer.icon = offer.tokenIconUrl
+        offer.iconAlreadyDownloaded = true
+        offer.userData = JSON.parse(offer.userDataStr)
+      }
+      return offer
+    } catch (error) {
+      return offer
+    }
+  }, [])
 
   //  Fetch offers
   const getNftOffers = useCallback(async (page = 0) => {
@@ -65,15 +95,17 @@ function NftsForSale (props) {
       setOffersAreLoaded(false)
 
       const result = await axios.get(`${SERVER}/offer/list/nft/${page}`)
-      const rawOffers = result.data
+      const rawOffers = result.data.data
       console.log('rawOffers: ', rawOffers)
+      setTotalPages(result.data.pagination.totalPages)
 
       // 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)
+        const processedOfferMetadata = await processOfferMetadata(processedOffer)
+        processedOffers.push(processedOfferMetadata)
       }
 
       setOffersAreLoaded(true)
@@ -84,7 +116,7 @@ function NftsForSale (props) {
       setOffersAreLoaded(true)
       throw err
     }
-  }, [processTokenData])
+  }, [processTokenData, processOfferMetadata])
 
   //  This function loads the token data .
   const lazyLoadTokenData = useCallback(async (tokens) => {
@@ -153,6 +185,7 @@ function NftsForSale (props) {
         const thisToken = tokens[i]
 
         // Incon does not  need to be downloaded, so continue with the next one
+        console.log('Icon already downloaded  ', thisToken.iconAlreadyDownloaded)
         if (thisToken.iconAlreadyDownloaded) continue
 
         // Try to get token icon url from mutable data.
@@ -161,7 +194,7 @@ function NftsForSale (props) {
         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
+          thisToken.userData = userData
         }
 
         // Mark token to prevent fetch token icon again.
@@ -207,11 +240,11 @@ function NftsForSale (props) {
   }, [appData])
 
   // Main function to load NFT offers
-  const loadNftOffers = useCallback(async () => {
+  const loadNftOffers = useCallback(async (page = 0) => {
     try {
       setIsLoading(true)
       // Get tokens in offers
-      const offers = await getNftOffers()
+      const offers = await getNftOffers(page)
       console.log('offers: ', offers)
       // Review cached data to populate token data from cached data
       await reviewNftCachedData(offers)
@@ -233,10 +266,31 @@ function NftsForSale (props) {
 
   // Effect to load NFTs on component mount
   useEffect(() => {
-    console.log('loading nfts for sale')
+    // Peevent to run multiple times
-    loadNftOffers()
+    if (!componentMountRef.current) {
+      console.log('loading nfts for sale')
+      loadNftOffers()
+      componentMountRef.current = true
+    }
   }, [loadNftOffers])
 
+  // Effect to reload data when page changes
+  useEffect(() => {
+    // Validate to prevent load same page again
+    if (currentPage >= 0 && currentPage !== lastLoadedPage) {
+      console.log('page changed, reloading nfts for sale')
+      loadNftOffers(currentPage)
+      setLastLoadedPage(currentPage)
+    }
+  }, [currentPage, loadNftOffers, lastLoadedPage])
+
+  // Handler for refresh button
+  const handleRefresh = useCallback(() => {
+    console.log('handling refresh')
+
+    loadNftOffers(currentPage)
+  }, [currentPage, loadNftOffers])
+
   // Get Cid from url
   const parseCid = (url) => {
     // get the cid from the url format 'ipfs://bafybeicem27xbzs65uvbcgykcmscsgln3lmhbfrcoec3gdttkdgtxv5acq
@@ -247,8 +301,34 @@ function NftsForSale (props) {
     return url
   }
 
+  const updateOffer = useCallback(async (offer) => {
+    try {
+      if (!offer) return
+      setOffersAreLoaded(false)
+      const processedOffer = await processTokenData(offer)
+      const processedOfferMetadata = await processOfferMetadata(processedOffer)
+
+      setOffers(offers => {
+        // find offer
+        const index = offers.findIndex((val) => { return val.tokenId === offer.tokenId })
+        // Save existing token data
+        processedOfferMetadata.tokenData = offers[index].tokenData
+        // replace with the new data
+        offers[index] = processedOfferMetadata
+        return offers
+      })
+
+      // Re-render tokens cards , to load the new data.
+      setTimeout(() => {
+        setOffersAreLoaded(true)
+      }, 500)
+    } catch (error) {
+      console.warn(error)
+    }
+  }, [processOfferMetadata, processTokenData])
+
   // This function generates a Token Card for each token in the wallet.
-  function generateCards (offers) {
+  const generateCards = useCallback(() => {
     console.log('generateCards() offerData: ', offers)
 
     const tokens = offers
@@ -264,13 +344,14 @@ function NftsForSale (props) {
           token={thisToken}
           handleRefresh={handleRefresh}
           key={`${thisToken.tokenId + i}`}
+          updateOffer={updateOffer}
         />
       )
       tokenCards.push(thisTokenCard)
     }
 
     return tokenCards
-  }
+  }, [offers, appData, handleRefresh, updateOffer])
 
   return (
     <Container>
@@ -278,6 +359,9 @@ function NftsForSale (props) {
         <Col>
           <h1>NFTs for Sale</h1>
         </Col>
+        <Col className='d-flex justify-content-end'>
+          <FilterDropdown selectedFilter={selectedFilter} setSelectedFilter={setSelectedFilter} />
+        </Col>
       </Row>
       <Row>
         <Col xs={12} style={{ display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
@@ -311,6 +395,121 @@ function NftsForSale (props) {
         </Row>
       )}
 
+      {/* Pagination Controls */}
+      {offersAreLoaded && totalPages > 1 && (
+        <div
+          style={{
+            position: 'fixed',
+            bottom: '70px',
+            left: '50%',
+            transform: 'translateX(-50%)',
+            zIndex: 1000,
+            background: 'rgba(255, 255, 255, 0.95)',
+            backdropFilter: 'blur(10px)',
+            borderRadius: '25px',
+            padding: '12px 20px',
+            boxShadow: '0 8px 32px rgba(0, 0, 0, 0.1)',
+            border: '1px solid rgba(255, 255, 255, 0.2)',
+            display: 'flex',
+            alignItems: 'center',
+            gap: '16px',
+            minWidth: '280px',
+            justifyContent: 'center'
+          }}
+        >
+          <Button
+            variant='outline-primary'
+            size='sm'
+            onClick={handlePreviousPage}
+            disabled={currentPage === 0}
+            style={{
+              borderRadius: '20px',
+              padding: '8px 16px',
+              border: '2px solid #007bff',
+              background: currentPage === 0 ? 'transparent' : '#007bff',
+              color: currentPage === 0 ? '#6c757d' : 'white',
+              fontWeight: '500',
+              fontSize: '14px',
+              transition: 'all 0.3s ease',
+              minWidth: '80px',
+              opacity: currentPage === 0 ? 0.5 : 1,
+              cursor: currentPage === 0 ? 'not-allowed' : 'pointer'
+            }}
+            onMouseEnter={(e) => {
+              if (currentPage > 0) {
+                e.target.style.background = '#0056b3'
+                e.target.style.transform = 'translateY(-1px)'
+                e.target.style.boxShadow = '0 4px 12px rgba(0, 123, 255, 0.3)'
+              }
+            }}
+            onMouseLeave={(e) => {
+              if (currentPage > 0) {
+                e.target.style.background = '#007bff'
+                e.target.style.transform = 'translateY(0)'
+                e.target.style.boxShadow = 'none'
+              }
+            }}
+          >
+            ← Previous
+          </Button>
+
+          <div
+            style={{
+              display: 'flex',
+              alignItems: 'center',
+              gap: '8px',
+              fontSize: '14px',
+              fontWeight: '500',
+              color: '#495057'
+            }}
+          >
+            <span style={{ color: '#007bff', fontWeight: '600' }}>
+              {currentPage + 1}
+            </span>
+            <span style={{ color: '#6c757d' }}>of</span>
+            <span style={{ color: '#495057', fontWeight: '600' }}>
+              {totalPages}
+            </span>
+          </div>
+
+          <Button
+            variant='outline-primary'
+            size='sm'
+            onClick={handleNextPage}
+            disabled={currentPage >= totalPages - 1}
+            style={{
+              borderRadius: '20px',
+              padding: '8px 16px',
+              border: '2px solid #007bff',
+              background: currentPage >= totalPages - 1 ? 'transparent' : '#007bff',
+              color: currentPage >= totalPages - 1 ? '#6c757d' : 'white',
+              fontWeight: '500',
+              fontSize: '14px',
+              transition: 'all 0.3s ease',
+              minWidth: '80px',
+              opacity: currentPage >= totalPages - 1 ? 0.5 : 1,
+              cursor: currentPage >= totalPages - 1 ? 'not-allowed' : 'pointer'
+            }}
+            onMouseEnter={(e) => {
+              if (currentPage < totalPages - 1) {
+                e.target.style.background = '#0056b3'
+                e.target.style.transform = 'translateY(-1px)'
+                e.target.style.boxShadow = '0 4px 12px rgba(0, 123, 255, 0.3)'
+              }
+            }}
+            onMouseLeave={(e) => {
+              if (currentPage < totalPages - 1) {
+                e.target.style.background = '#007bff'
+                e.target.style.transform = 'translateY(0)'
+                e.target.style.boxShadow = 'none'
+              }
+            }}
+          >
+            Next →
+          </Button>
+        </div>
+      )}
+
       {!offersAreLoaded && (
         <Row className='d-block text-center'>
           <Spinner animation='border' variant='primary' style={{ maegin: '0 auto' }} />

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

@@ -7,11 +7,18 @@
 
 // Global npm libraries
 import React, { useEffect, useState } from 'react'
-import { Button, Modal, Container, Row, Col } from 'react-bootstrap'
+import { Button, Modal, Container, Row, Col, Spinner } from 'react-bootstrap'
+import axios from 'axios'
+
+// Local libraries
+import config from '../../../config'
+// Global variables and constants
+const SERVER = config.dexServer
 
 function InfoButton (props) {
   const [show, setShow] = useState(false)
   const [mutableDataCid, setMutableDataCid] = useState(null)
+  const [loading, setLoading] = useState(false)
 
   const handleClose = () => {
     console.log('handleClose()')
@@ -36,7 +43,7 @@ function InfoButton (props) {
   // Get token user data if it exists and verify if it contains media or markdown
   useEffect(() => {
     try {
-      const userDataStr = props.token.tokenData.userData
+      const userDataStr = props.token.userData
       if (userDataStr) {
         const userData = JSON.parse(userDataStr)
 
@@ -50,6 +57,22 @@ function InfoButton (props) {
     }
   }, [props.token, show])
 
+  // Update offer data
+  const updateOffer = async () => {
+    try {
+      setLoading(true)
+      const inputObj = { tokenId: props.token.tokenId }
+      const result = await axios.post(`${SERVER}/offer/mutable/sync/`, inputObj)
+      const offerData = result.data
+      console.log('offerData: ', offerData)
+
+      if (props.updateOffer) await props.updateOffer(offerData)
+      setLoading(false)
+    } catch (error) {
+      setLoading(false)
+    }
+  }
+
   // Replace with dummy button until token data is loaded.
   if (!props.token.tokenData) {
     return (
@@ -105,6 +128,7 @@ function InfoButton (props) {
                     href={`/user-data/${props.token.tokenId}#single-view`}
                     target='_blank'
                     rel='noopener noreferrer'
+                    variant='success'
                   >
                     View User Data
                   </Button>
@@ -114,7 +138,10 @@ function InfoButton (props) {
 
           </Container>
         </Modal.Body>
-        <Modal.Footer />
+        <Modal.Footer style={{ justifyContent: 'center' }}>
+          {!loading && <Button style={{ width: '135px' }} onClick={updateOffer}>Update</Button>}
+          {loading && <Spinner />}
+        </Modal.Footer>
       </Modal>
     </>
   )

src/components/app-body/nfts-for-sale/seller-profile.js

@@ -0,0 +1,186 @@
+/*
+  This component displays the seller's profile information for an NFT listing.
+*/
+
+// Global npm libraries
+import React, { useState, useEffect } from 'react'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faUser } from '@fortawesome/free-solid-svg-icons'
+
+function SellerProfile (props) {
+  const { npub, appData } = props
+  const [profile, setProfile] = useState(null)
+  const [imageError, setImageError] = useState(false)
+  const [isLoading, setIsLoading] = useState(true)
+
+  const { nostrQueries } = appData
+
+  // Get profile if npub is provided.
+  useEffect(() => {
+    const start = async () => {
+      setIsLoading(true)
+      try {
+        const pubKey = nostrQueries.npubToHex(npub)
+        const profile = await nostrQueries.getProfile(pubKey)
+        setProfile(profile)
+      } catch (error) {
+        console.warn('Error fetching seller profile:', error)
+      } finally {
+        setIsLoading(false)
+      }
+    }
+    if (npub) {
+      start()
+    } else {
+      setIsLoading(false)
+    }
+  }, [npub, nostrQueries])
+
+  // handle img url errors
+  const handleImageError = (type) => {
+    setImageError(true)
+  }
+
+  // go to profile
+  const goToProfile = () => {
+    if (npub) {
+      const profileUrl = `${window.location.origin}/profile/${npub}#single-view`
+      window.open(profileUrl, '_blank')
+    }
+  }
+
+  // Get display name - use profile name, npub short form, or "Anonymous User"
+  const getDisplayName = () => {
+    if (profile?.name) return profile.name
+    if (npub) {
+      return npub.slice(0, 8) + '...' + npub.slice(-6)
+    }
+    return 'Anonymous User'
+  }
+
+  return (
+    <div
+      onClick={goToProfile}
+      className='seller-profile-container'
+      style={{
+        padding: '4px 8px',
+        backgroundColor: '#f8f9fa',
+        borderRadius: '6px',
+        border: '1px solid #e9ecef',
+        transition: 'all 0.2s ease',
+        cursor: 'pointer',
+        display: 'flex',
+        justifyContent: 'center',
+        width: '100%'
+      }}
+      onMouseEnter={(e) => {
+        e.currentTarget.style.backgroundColor = '#e9ecef'
+        e.currentTarget.style.borderColor = '#dee2e6'
+      }}
+      onMouseLeave={(e) => {
+        e.currentTarget.style.backgroundColor = '#f8f9fa'
+        e.currentTarget.style.borderColor = '#e9ecef'
+      }}
+    >
+      <div className='d-flex align-items-center justify-content-center gap-1'>
+        {/* Seller Label */}
+        <small
+          className='text-muted fw-semibold'
+          style={{
+            fontSize: '0.65rem',
+            textTransform: 'uppercase',
+            letterSpacing: '0.3px'
+          }}
+        >
+          Seller:
+        </small>
+
+        {/* Profile Picture or Placeholder */}
+        <div
+          className='d-flex align-items-center justify-content-center'
+          style={{
+            width: '24px',
+            height: '24px',
+            borderRadius: '50%',
+            backgroundColor: '#e9ecef',
+            border: '1.5px solid #dee2e6',
+            overflow: 'hidden',
+            flexShrink: 0,
+            cursor: 'pointer',
+            transition: 'transform 0.2s ease'
+          }}
+          onClick={(e) => {
+            e.stopPropagation()
+            goToProfile()
+          }}
+          onMouseEnter={(e) => {
+            e.currentTarget.style.transform = 'scale(1.1)'
+          }}
+          onMouseLeave={(e) => {
+            e.currentTarget.style.transform = 'scale(1)'
+          }}
+        >
+          {isLoading
+            ? (
+              <FontAwesomeIcon
+                icon={faUser}
+                style={{
+                  color: '#adb5bd',
+                  fontSize: '12px',
+                  opacity: 0.5
+                }}
+              />
+              )
+            : (profile?.picture && !imageError)
+                ? (
+                  <img
+                    src={profile.picture}
+                    alt='Seller profile'
+                    className='w-100 h-100'
+                    style={{ objectFit: 'cover' }}
+                    onError={() => handleImageError('picture')}
+                  />
+                  )
+                : (
+                  <FontAwesomeIcon
+                    icon={faUser}
+                    style={{
+                      color: '#6c757d',
+                      fontSize: '12px'
+                    }}
+                  />
+                  )}
+        </div>
+
+        {/* Seller Name */}
+        <span
+          onClick={(e) => {
+            e.stopPropagation()
+            goToProfile()
+          }}
+          className='cursor-pointer fw-medium'
+          style={{
+            color: '#495057',
+            fontSize: '0.8rem',
+            transition: 'color 0.2s ease',
+            maxWidth: '120px',
+            overflow: 'hidden',
+            textOverflow: 'ellipsis',
+            whiteSpace: 'nowrap'
+          }}
+          onMouseEnter={(e) => {
+            e.currentTarget.style.color = '#007bff'
+          }}
+          onMouseLeave={(e) => {
+            e.currentTarget.style.color = '#495057'
+          }}
+          title={profile?.name || npub}
+        >
+          {getDisplayName()}
+        </span>
+      </div>
+    </div>
+  )
+}
+
+export default SellerProfile

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

@@ -10,16 +10,15 @@ import Jdenticon from '@chris.troutner/react-jdenticon'
 // Local libraries
 import InfoButton from './info-button'
 import BuyButton from './buy-button'
-
+import SellerProfile from './seller-profile'
 function TokenCard (props) {
   const { token, appData, handleRefresh, hideBuyBtn } = props
   const [icon, setIcon] = useState(token.icon)
   const [tokenData, setTokenData] = useState(token.tokenData)
 
-  console.log('TokenCard() appData: ', appData)
-
   // Update icon state every token.icon and token.tokenData changes
   useEffect(() => {
+    console.log('setting icon')
     setIcon(token.icon)
     setTokenData(token.tokenData)
   }, [token.icon, token.tokenData])
@@ -27,8 +26,14 @@ function TokenCard (props) {
   return (
     <>
       <Col xs={12} sm={6} lg={4} style={{ padding: '25px' }}>
-        <Card>
+        <Card className='shadow-sm'>
-          <Card.Body style={{ textAlign: 'center' }}>
+          <Card.Body style={{ textAlign: 'center', padding: '10px' }}>
+            {/* Seller Profile Section */}
+            <Row className='mb-2'>
+              <Col className='text-center mb-2'>
+                <SellerProfile npub={token.makerNpub} appData={appData} />
+              </Col>
+            </Row>
             {/** If the icon is loaded, display it */
               icon && (
                 <Card.Img
@@ -49,7 +54,6 @@ function TokenCard (props) {
             <Card.Title style={{ textAlign: 'center', marginTop: '10px' }}>
               <h4>{token.ticker}</h4>
             </Card.Title>
-
             <Container>
               <Row>
                 <Col>
@@ -66,7 +70,7 @@ function TokenCard (props) {
 
               <Row className='text-center'>
                 <Col>
-                  <InfoButton token={token} disabled={!token.tokenData} />
+                  <InfoButton token={token} disabled={!token.tokenData} {...props} />
                 </Col>
 
                 {!hideBuyBtn && (

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

@@ -6,7 +6,7 @@
 import React, { useState, useCallback, useEffect } from 'react'
 import { Spinner } from 'react-bootstrap'
 function ChatHeader (props) {
-  const { selectedChannel, channelsData } = props
+  const { selectedChannel, channelsData, selectedChannelIsDm, profiles } = props
   const [chInfo, setChInfo] = useState() // channel data
   const getShortName = useCallback((str) => {
     if (str.length < 20) return str
@@ -20,10 +20,15 @@ function ChatHeader (props) {
 
   // get channel info
   useEffect(() => {
-    if (!chInfo && channelsData[selectedChannel]) {
+    // Public channel
+    if (!chInfo && !selectedChannelIsDm && channelsData[selectedChannel]) {
       setChInfo(channelsData[selectedChannel])
     }
-  }, [chInfo, channelsData, selectedChannel])
+    // Dm Channel
+    if (!chInfo && selectedChannelIsDm && profiles[selectedChannel]) {
+      setChInfo(profiles[selectedChannel])
+    }
+  }, [chInfo, channelsData, selectedChannel, profiles, selectedChannelIsDm])
   return (
     <div className='p-3 d-flex justify-content-between align-items-center' style={{ backgroundColor: '#ffffff' }}>
       {chInfo &&

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

@@ -3,19 +3,34 @@
 */
 
 // Global npm libraries
-import React, { useCallback } from 'react'
+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
   const { pubKey } = dm
-  const profile = profiles[pubKey]
+
+  const [profile, setProfile] = useState(profiles[pubKey])
   const isSelected = selectedChannel === pubKey
 
+  useEffect(() => {
+    const profile = profiles[pubKey]
+
+    if (profile) {
+      setProfile(profile)
+    }
+  }, [profiles, pubKey])
+
   const getShortName = useCallback((str) => {
-    if (str.length < 20) return str
+    if (!str || !str.startsWith('npub')) return str
-    return str.slice(0, 4) + '...' + str.slice(-4)
+
+    const prefix = 'npub'
+    const first4 = str.slice(prefix.length, prefix.length + 4)
+    const last4 = str.slice(-4)
+
+    return `${prefix}:${first4}...${last4}`
   }, [])
 
   const handleClick = () => {
@@ -83,13 +98,14 @@ 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
+        {/*         <div
           className={`small ${isSelected ? 'text-white-50' : 'text-muted'} ${dm.unreadCount > 0 ? 'fw-bold' : ''}`}
           style={{ fontSize: '12px' }}
         >
           No messages yet
-        </div>
+        </div> */}
       </div>
 
       {/* Unread indicator */}

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

@@ -7,11 +7,12 @@ import React from 'react'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faUser } from '@fortawesome/free-solid-svg-icons'
 import DMItem from './dm-item'
+import { Spinner } from 'react-bootstrap'
 
 function DMList (props) {
-  const { dmChannels, profiles, selectedChannel, onChangeChannel } = props
+  const { dmChannels, profiles, selectedChannel, onChangeChannel, dmListLoaded } = props
 
-  if (dmChannels.length === 0) {
+  if (dmChannels.length === 0 && dmListLoaded) {
     return (
       <div className='text-center p-3'>
         <div className='text-muted mb-2'>
@@ -37,6 +38,11 @@ function DMList (props) {
           {...props}
         />
       ))}
+      {!dmListLoaded && (
+        <div className='text-center'>
+          <Spinner animation='border' />
+        </div>
+      )}
     </div>
   )
 }

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

@@ -5,16 +5,23 @@
 // Global npm libraries
 import React, { useCallback, useEffect, useState, useRef } from 'react'
 import { Container, Row, Col } from 'react-bootstrap'
-import { RelayPool } from 'nostr'
+import NostrRestClient, { generateSubId } from '../../../services/nostr-rest-client.js'
 
 // Local libraries
 import ChatSidebar from './chat-sidebar'
 import ChatMain from './chat-main'
 import config from '../../../config'
 
+// Global variables and constants
+
 function NostrChat (props) {
   const { appData } = props
-  const { nostrQueries } = appData
+  const { nostrQueries, bchWalletState, startChannelChat } = appData
+  // Initialize REST client for SSE subscriptions
+  const restClient = useRef(new NostrRestClient())
+  // Track active subscriptions for cleanup
+  const subscriptionsRef = useRef({})
+
   const [messages, setMessages] = useState([])
   const [loadedMessages, setLoadedMessages] = useState(false)
   const [profiles, setProfiles] = useState({})
@@ -22,23 +29,103 @@ function NostrChat (props) {
   const [channelsLoaded, setChannelsLoaded] = useState(false)
   const [groupChannels] = useState(config.chatsId)
   const [dmChannels, setDmChannels] = useState([])
+  const [dmListLoaded, setDmListLoaded] = useState(false)
+
+  const [selectedChannel, setSelectedChannel] = useState(null)
+  const [selectedChannelIsDm, setSelectedChannelIsDm] = useState(false)
+
+  const [deletedChats] = useState(appData.nostrQueries.deletedChats)
 
-  const [selectedChannel, setSelectedChannel] = useState(config.chatsId[0])
   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 (msg) => {
+  const onMsgRead = useCallback(async (ev) => {
     try {
       // console.log('onMsgRead() msg: ', msg)
 
       // Update messages list
       setMessages(current => {
         // ignore existing messages
-        const exist = current.find(val => val.id === msg.id)
+        const exist = current.find(val => val.id === ev.id)
         if (exist) return current
 
         const newMsgs = [...current]
-        newMsgs.push(msg)
+        newMsgs.push(ev)
 
         // Sort messages by timestamp
         newMsgs.sort((a, b) => b.created_at - a.created_at)
@@ -46,21 +133,21 @@ function NostrChat (props) {
       })
 
       // Fetch message owner profile
-      const pubKey = msg.pubkey
+      const pubKey = ev.pubkey
-      const existProfile = profilesRef.current[msg.pubkey]
+      const existProfile = profilesRef.current[ev.pubkey]
       if (existProfile) {
         return
       }
+      const npub = await appData.nostrQueries.hexToNpub(pubKey)
 
       console.log(`Trying to get ${pubKey} profile.`)
 
-      const defaultProfile = { name: pubKey } // default profile
+      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
-      const npub = await appData.nostrQueries.hexToNpub(pubKey)
       // add public key formats to profile object
       profile.pubKey = pubKey
       profile.npub = npub
@@ -76,40 +163,332 @@ function NostrChat (props) {
     }
   }, [appData, profilesRef])
 
-  // Handle nostr pool
+  const decryptMsg = useCallback(async ({ ev, pubKey }) => {
+    try {
+      const encryptedMsg = ev.content
+      const senderPubKey = pubKey
+
+      const { nostrKeyPair } = appData.bchWalletState
+      const { nostrQueries } = appData
+      const decryptData = {
+        receiverPrivKey: nostrKeyPair.privHex,
+        senderPubKey,
+        encryptedMsg
+      }
+
+      const decrptedMsg = await nostrQueries.decryptMsg(decryptData)
+
+      ev.content = decrptedMsg
+      onMsgRead(ev)
+    } catch (error) {
+      console.warn(error)
+    }
+  }, [appData, onMsgRead])
+
+  // Handle SSE subscription for group channels
   useEffect(() => {
     // fetch messages when channel selected and channel metadata are loaded
-    if (!selectedChannel || !channelsLoaded) return
+    if (!selectedChannel || !channelsLoaded || selectedChannelIsDm) return
 
-    const relays = nostrQueries.relays
+    // wait for deleted chats
-    if (relays.length === 0) {
+    if (!deletedChats || !Array.isArray(deletedChats)) return
-      return
-    }
 
-    const pool = RelayPool(relays)
+    // Create subscription for group channel messages
+    const subId = generateSubId(`group-${selectedChannel}`)
+    const filter = { limit: 10, kinds: [42], '#e': [selectedChannel] }
 
-    // const pool = RelayPool([config.nostrRelay])
+    // Track if EOSE has been called
-    pool.on('open', relay => {
+    let eoseCalled = false
-      relay.subscribe('REQ', { limit: 10, kinds: [42], '#e': [selectedChannel] })
+    let eoseTimeoutId = null
+
+    const subscription = restClient.current.createSubscription(subId, filter, {
+      onEvent: (ev) => {
+        console.log('Group post retrieved from REST API', ev.content)
+        const onBlackList = nostrQueries.blackList.find((val) => { return val === ev.pubkey })
+        const isDeleted = deletedChats.find((val) => { return val.eventId === ev.id })
+        if (!onBlackList && !isDeleted) {
+          onMsgRead(ev)
+        }
+      },
+      onEose: () => {
+        eoseCalled = true
+        if (eoseTimeoutId) {
+          clearTimeout(eoseTimeoutId)
+          eoseTimeoutId = null
+        }
+        if (!selectedChannelIsDm) {
+          // Use setTimeout to ensure state updates from onEvent callbacks are processed
+          // before setting loadedMessages to true
+          setTimeout(() => {
+            setLoadedMessages(true)
+          }, 100)
+        }
+      },
+      onClosed: (message) => {
+        console.log('Group channel subscription closed:', message)
+      },
+      onError: (error) => {
+        console.warn('Group channel subscription error:', error)
+      }
     })
 
-    pool.on('eose', relay => {
+    subscriptionsRef.current[subId] = subscription
-      setLoadedMessages(true)
-    })
 
-    pool.on('event', (relay, subId, ev) => {
+    // Set up EOSE timeout fallback - if EOSE doesn't arrive within 10 seconds, set loadedMessages anyway
-      console.log('post retrieved from ', relay.url, ev.content)
+    const EOSE_TIMEOUT_MS = 10000 // 10 seconds
-      onMsgRead(ev)
+    eoseTimeoutId = setTimeout(() => {
-    })
+      if (!eoseCalled && !selectedChannelIsDm) {
+        console.warn(`EOSE timeout reached for subscription ${subId} - setting loadedMessages to true`)
+        setLoadedMessages(true)
+      }
+    }, EOSE_TIMEOUT_MS)
+
+    // Capture values for cleanup
+    const subscriptionsRefValue = subscriptionsRef.current
+    const restClientValue = restClient.current
 
     return () => {
-      // Close pool on component unmount or selected channel changes
+      // Clear EOSE timeout if it exists
-      console.log('Close existing pool')
+      if (eoseTimeoutId) {
-      pool.close()
+        clearTimeout(eoseTimeoutId)
+      }
+      // Close subscription on component unmount or selected channel changes
+      console.log('Close existing subscription for group channel')
+      if (subscriptionsRefValue[subId]) {
+        subscriptionsRefValue[subId].close()
+        delete subscriptionsRefValue[subId]
+      }
+      restClientValue.closeSubscription(subId).catch(err => {
+        // Subscription already closed is not an error - this is expected behavior
+        const errorMessage = err?.message || err?.toString() || ''
+        if (!errorMessage.includes('not found') && !errorMessage.includes('already closed')) {
+          console.warn('Error closing subscription:', err)
+        }
+      })
     }
-  }, [onMsgRead, selectedChannel, nostrQueries, channelsLoaded])
+  }, [onMsgRead, selectedChannel, selectedChannelIsDm, nostrQueries, channelsLoaded, deletedChats])
 
-  // Load channels data
+  // Handle SSE subscription for dm channels
+  useEffect(() => {
+    // fetch messages when channel selected and channel metadata are loaded
+
+    if (!selectedChannel || !selectedChannelIsDm) return
+
+    const { nostrKeyPair } = bchWalletState
+    const dmPubKey = selectedChannel
+
+    // Create subscription for DM channel messages
+    const subId = generateSubId(`dm-${dmPubKey}`)
+    // Use array of filters for multiple conditions
+    const filters = [
+      { limit: 10, kinds: [4], '#p': [nostrKeyPair.pubHex], authors: [dmPubKey] }, // received messages
+      { limit: 10, kinds: [4], '#p': [dmPubKey], authors: [nostrKeyPair.pubHex] } // sent messages
+    ]
+
+    // Track if EOSE has been called
+    let eoseCalled = false
+    let eoseTimeoutId = null
+
+    const subscription = restClient.current.createSubscription(subId, filters, {
+      onEvent: (ev) => {
+        console.log('DM post retrieved from REST API', ev.content)
+        // decrypt message
+        if (ev.pubkey === nostrKeyPair.pubHex) {
+          // Sent messages
+          decryptMsg({ ev, pubKey: dmPubKey })
+        } else {
+          // Received messages
+          decryptMsg({ ev, pubKey: ev.pubkey })
+        }
+      },
+      onEose: () => {
+        eoseCalled = true
+        if (eoseTimeoutId) {
+          clearTimeout(eoseTimeoutId)
+          eoseTimeoutId = null
+        }
+        if (selectedChannelIsDm) {
+          // Use setTimeout to ensure state updates from onEvent callbacks are processed
+          // before setting loadedMessages to true
+          setTimeout(() => {
+            setLoadedMessages(true)
+          }, 100)
+        }
+      },
+      onClosed: (message) => {
+        console.log('DM channel subscription closed:', message)
+      },
+      onError: (error) => {
+        console.warn('DM channel subscription error:', error)
+      }
+    })
+
+    subscriptionsRef.current[subId] = subscription
+
+    // Set up EOSE timeout fallback - if EOSE doesn't arrive within 10 seconds, set loadedMessages anyway
+    const EOSE_TIMEOUT_MS = 10000 // 10 seconds
+    eoseTimeoutId = setTimeout(() => {
+      if (!eoseCalled && selectedChannelIsDm) {
+        console.warn(`EOSE timeout reached for subscription ${subId} - setting loadedMessages to true`)
+        setLoadedMessages(true)
+      }
+    }, EOSE_TIMEOUT_MS)
+
+    // Capture values for cleanup
+    const subscriptionsRefValue = subscriptionsRef.current
+    const restClientValue = restClient.current
+
+    return () => {
+      // Clear EOSE timeout if it exists
+      if (eoseTimeoutId) {
+        clearTimeout(eoseTimeoutId)
+      }
+      // Close subscription on component unmount or selected channel changes
+      console.log('Close existing subscription for private channel')
+      if (subscriptionsRefValue[subId]) {
+        subscriptionsRefValue[subId].close()
+        delete subscriptionsRefValue[subId]
+      }
+      restClientValue.closeSubscription(subId).catch(err => {
+        // Subscription already closed is not an error - this is expected behavior
+        const errorMessage = err?.message || err?.toString() || ''
+        if (!errorMessage.includes('not found') && !errorMessage.includes('already closed')) {
+          console.warn('Error closing subscription:', err)
+        }
+      })
+    }
+  }, [onMsgRead, selectedChannel, selectedChannelIsDm, nostrQueries, bchWalletState, decryptMsg])
+
+  const handleIncomingDms = useCallback(async (pubKey) => {
+    try {
+      if (!dmListLoaded) return
+      const exist = dmChannelsRef.current.find(val => val === pubKey)
+      if (exist) return
+
+      let profile = await nostrQueries.getProfile(pubKey)
+      const npub = nostrQueries.hexToNpub(pubKey)
+      if (!profile) profile = { name: npub }
+      // add public key formats to profile object
+      profile.pubKey = pubKey
+      profile.npub = npub
+      setProfiles(currentProfiles => {
+        const newProfiles = { ...currentProfiles }
+        newProfiles[pubKey] = profile
+        profilesRef.current = newProfiles
+        return newProfiles
+      })
+      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)
+    }
+  }, [nostrQueries, dmListLoaded])
+
+  // Keep live subscription for new DMs
+  useEffect(() => {
+    if (!dmListLoaded || !channelsLoaded) return
+    const { bchWalletState } = appData
+    const { nostrKeyPair } = bchWalletState
+
+    // Create subscription for new incoming DM notifications
+    const subId = generateSubId('dm-notify')
+    const filter = { limit: 0, kinds: [4], '#p': [nostrKeyPair.pubHex] } // received messages
+
+    const subscription = restClient.current.createSubscription(subId, filter, {
+      onEvent: (ev) => {
+        console.log('New message received from REST API', ev)
+        handleIncomingDms(ev.pubkey)
+      },
+      onEose: () => {
+        // EOSE received, subscription is active
+      },
+      onClosed: (message) => {
+        console.log('DM notification subscription closed:', message)
+      },
+      onError: (error) => {
+        console.warn('DM notification subscription error:', error)
+      }
+    })
+
+    subscriptionsRef.current[subId] = subscription
+
+    // Capture values for cleanup
+    const subscriptionsRefValue = subscriptionsRef.current
+    const restClientValue = restClient.current
+
+    return () => {
+      // Close subscription on component unmount
+      console.log('Close existing subscription for DM notifications')
+      if (subscriptionsRefValue[subId]) {
+        subscriptionsRefValue[subId].close()
+        delete subscriptionsRefValue[subId]
+      }
+      restClientValue.closeSubscription(subId).catch(err => {
+        // Subscription already closed is not an error - this is expected behavior
+        const errorMessage = err?.message || err?.toString() || ''
+        if (!errorMessage.includes('not found') && !errorMessage.includes('already closed')) {
+          console.warn('Error closing subscription:', err)
+        }
+      })
+    }
+  }, [handleIncomingDms, appData, nostrQueries, dmListLoaded, channelsLoaded])
+
+  // 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 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 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
+        })
+      }
+    }
+
+    if (!dmListLoaded) loadCurrentDms()
+  }, [appData, dmListLoaded])
+
+  // Load public channels data
   useEffect(() => {
     const loadChData = async () => {
       const loadedChannels = []
@@ -135,43 +514,9 @@ function NostrChat (props) {
       }
     }
 
-    // loadMessages()
     loadChData()
   }, [selectedChannel, appData, groupChannels])
 
-  const addPrivateMessage = async (profile) => {
-    try {
-      const exist = dmChannels.find(val => val === profile.pubKey)
-
-      setSelectedChannel(profile.pubKey)
-      if (exist) return
-      setDmChannels(currentChs => {
-        const newChs = [...currentChs]
-        newChs.push(profile.pubKey)
-        return newChs
-      })
-      setChannelsData(currentChs => {
-        const newChs = { ...currentChs }
-        newChs[profile.pubKey] = profile
-        return newChs
-      })
-
-      setMessages([])
-
-      // setSelectedChannel(profile.pubKey)
-    } catch (error) {
-      console.warn(error)
-    }
-  }
-
-  // Reset states on change channel
-  const onChangeChannel = useCallback((ch) => {
-    if (selectedChannel === ch) return
-    setSelectedChannel(ch)
-    setMessages([])
-    setLoadedMessages(false)
-  }, [selectedChannel])
-
   return (
     <>
       <Container fluid className='h-100 p-0 mb-5 '>
@@ -181,9 +526,11 @@ function NostrChat (props) {
               groupChannels={groupChannels}
               dmChannels={dmChannels}
               selectedChannel={selectedChannel}
+              selectedChannelIsDm={selectedChannelIsDm}
               profiles={profiles}
               channelsData={channelsData}
               onChangeChannel={onChangeChannel}
+              dmListLoaded={dmListLoaded && channelsLoaded}
               {...props}
             />
           </Col>
@@ -191,9 +538,11 @@ function NostrChat (props) {
             <ChatMain
               loadedMessages={loadedMessages}
               selectedChannel={selectedChannel}
+              selectedChannelIsDm={selectedChannelIsDm}
               messages={messages}
               profiles={profiles}
               channelsData={channelsData}
+              dmListLoaded={dmListLoaded && channelsLoaded}
               onChangeChannel={onChangeChannel}
               addPrivateMessage={addPrivateMessage}
               {...props}

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

@@ -3,24 +3,86 @@
 */
 
 // Global npm libraries
-import React, { useState } from 'react'
+import React, { useState, useEffect } from 'react'
 import { Form, Button, InputGroup } from 'react-bootstrap'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faPaperPlane } from '@fortawesome/free-solid-svg-icons'
 import { finalizeEvent } from 'nostr-tools/pure'
 import { hexToBytes } from '@noble/hashes/utils' // already an installed dependency
-import { Relay } from 'nostr-tools/relay'
+import NostrRestClient from '../../../services/nostr-rest-client.js'
 
 function MessageInput (props) {
   const { appData, selectedChannel, profiles } = props
-  const { bchWalletState, writeRelays } = appData
+  const { bchWalletState, nostrQueries } = appData
+  // Initialize REST client for publishing
+  const restClient = new NostrRestClient()
+  const [isDm, setIsDm] = useState(false)
+  const [dmProfile, setDmProfile] = useState(false)
   const [message, setMessage] = useState('')
   const [onFetch, setOnFetch] = useState(false)
 
-  // Post on nostr network
+  // Define input type between private or public
-  const handleSubmit = async (e) => {
+  useEffect(() => {
+    const dmTo = profiles[selectedChannel]
+    setIsDm(!!dmTo)
+    setDmProfile(dmTo)
+  }, [selectedChannel, profiles])
+
+  const handleSubmitPrivate = async (e) => {
     e.preventDefault()
 
+    try {
+      setOnFetch(true)
+      console.log('dm To : ', dmProfile)
+
+      const { nostrKeyPair } = bchWalletState
+      // Convert private key to binary
+      const privateKeyBin = hexToBytes(nostrKeyPair.privHex)
+
+      const encryptedMsg = await nostrQueries.encryptMsg({
+        senderPrivKey: nostrKeyPair.privHex,
+        receiverPubKey: dmProfile?.pubKey,
+        message
+      })
+
+      console.log('encryptedMsg', encryptedMsg)
+      // Generate a post.
+      const eventTemplate = {
+        kind: 4,
+        created_at: Math.floor(Date.now() / 1000),
+        tags: [['p', dmProfile.pubKey]],
+        content: encryptedMsg
+      }
+      console.log(`eventTemplate: ${JSON.stringify(eventTemplate, null, 2)}`)
+
+      // Sign the post
+      const signedEvent = finalizeEvent(eventTemplate, privateKeyBin)
+      console.log('signedEvent: ', signedEvent)
+
+      // Publish the message via REST API (handles broadcasting to multiple relays)
+      try {
+        const result = await restClient.publishEvent(signedEvent)
+        console.log('result: ', result)
+
+        if (!result.accepted) {
+          throw new Error(`Failed to publish: ${result.message || 'Unknown error'}`)
+        }
+      } catch (err) {
+        console.warn(`Error publishing message: ${err}`)
+        throw err
+      }
+
+      setMessage('')
+      setOnFetch(false)
+    } catch (error) {
+      console.warn(error)
+      setOnFetch(false)
+    }
+  }
+
+  // Post on nostr network
+  const handleSubmitPublic = async (e) => {
+    e.preventDefault()
     try {
       setOnFetch(true)
 
@@ -45,25 +107,19 @@ function MessageInput (props) {
       const signedEvent = finalizeEvent(eventTemplate, privateKeyBin)
       console.log('signedEvent: ', signedEvent)
 
-      // Publish the post to each relay.
+      // Publish the message via REST API (handles broadcasting to multiple relays)
-      for (let i = 0; i < writeRelays.length; i++) {
+      try {
-        const relayUrl = writeRelays[i]
+        const result = await restClient.publishEvent(signedEvent)
+        console.log('result: ', result)
 
-        try {
+        if (!result.accepted) {
-          // Connect to a relay.
+          throw new Error(`Failed to publish: ${result.message || 'Unknown error'}`)
-          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)
-
-          // Close the connection to the relay.
-          relay.close()
-        } catch (err) {
-          console.warn(`Skipping publishing to ${relayUrl} due to error: ${err}`)
         }
+      } catch (err) {
+        console.warn(`Error publishing message: ${err}`)
+        throw err
       }
+
       setMessage('')
       setOnFetch(false)
     } catch (error) {
@@ -77,12 +133,12 @@ function MessageInput (props) {
   }
   return (
     <div className='p-3' style={{ backgroundColor: '#ffffff' }}>
-      <Form onSubmit={handleSubmit}>
+      <Form onSubmit={isDm ? handleSubmitPrivate : handleSubmitPublic}>
         <InputGroup>
           <Form.Control
             as='textarea'
             rows={3}
-            placeholder={profiles[selectedChannel] ? 'Coming soon...' : 'Type a message...'}
+            placeholder='Type a message...'
             className='border-1 bg-transparent text-dark'
             style={{
               backgroundColor: '#f8f9fa',
@@ -96,7 +152,7 @@ function MessageInput (props) {
             }}
             value={message}
             onChange={onChange}
-            disabled={onFetch || profiles[selectedChannel]}
+            disabled={onFetch}
           />
 
           <Button
@@ -110,7 +166,7 @@ function MessageInput (props) {
               marginBottom: '8px'
             }}
             title='Send message'
-            disabled={onFetch || profiles[selectedChannel]}
+            disabled={onFetch}
 
           >
             <FontAwesomeIcon icon={faPaperPlane} />

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

@@ -11,9 +11,17 @@ import NostrFormat from '../../app-body/nostr/nostr-format'
 import ProfileMenu from './profile-menu'
 
 function MessageItem (props) {
-  const { message, profiles } = props
+  const { message, profiles, selectedChannel } = props
   const [profile, setProfile] = useState(null)
 
+  const [isDm, setIsDm] = useState(false)
+
+  // Define type between private or public
+  useEffect(() => {
+    const dmTo = profiles[selectedChannel]
+    setIsDm(!!dmTo)
+  }, [selectedChannel, profiles])
+
   // Format timestamp
   const formatTime = (timestamp) => {
     return new Date(timestamp).toLocaleTimeString([], {
@@ -24,10 +32,10 @@ function MessageItem (props) {
   }
 
   useEffect(() => {
-    if (!profile && profiles[message.pubkey]) {
+    if (profiles[message.pubkey]) {
       setProfile(profiles[message.pubkey])
     }
-  }, [profiles, message, profile])
+  }, [profiles, message])
 
   return (
     <div className='mb-3 d-flex align-items-start'>
@@ -50,6 +58,7 @@ function MessageItem (props) {
                 ? (
                   <ProfileMenu
                     profile={profile}
+                    isDm={isDm}
                     {...props}
                   >
                     <img
@@ -67,6 +76,7 @@ function MessageItem (props) {
                 : (
                   <ProfileMenu
                     profile={profile}
+                    isDm={isDm}
                     {...props}
 
                   >
@@ -89,6 +99,7 @@ function MessageItem (props) {
             {profile && profile.name && (
               <ProfileMenu
                 profile={profile}
+                isDm={isDm}
                 {...props}
               >
                 <span className='fw-bold text-dark me-2'>

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

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

src/components/app-body/nostr-chat/profile-menu.js

@@ -9,7 +9,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faMessage, faUser } from '@fortawesome/free-solid-svg-icons'
 
 function ProfileMenu (props) {
-  const { profile, children, addPrivateMessage } = props
+  const { profile, children, addPrivateMessage, isDm, dmListLoaded } = props
 
   const handlePrivateMessage = () => {
     addPrivateMessage(profile)
@@ -47,10 +47,12 @@ function ProfileMenu (props) {
           <Dropdown.Header className='text-muted fw-bold'>
             Profile Options
           </Dropdown.Header>
-          <Dropdown.Item onClick={handlePrivateMessage}>
+          {!isDm && (
-            <FontAwesomeIcon icon={faMessage} className='me-2' />
+            <Dropdown.Item onClick={handlePrivateMessage} disabled={!dmListLoaded}>
-            Private Message
+              <FontAwesomeIcon icon={faMessage} className='me-2' />
-          </Dropdown.Item>
+              Private Message
+            </Dropdown.Item>
+          )}
           <Dropdown.Item onClick={handleUserProfile}>
             <FontAwesomeIcon icon={faUser} className='me-2' />
             User Profile

src/components/app-body/nostr/content-creators/content-creators-list.js

@@ -11,14 +11,13 @@
 */
 
 import React, { useState, useEffect, useCallback } from 'react'
-import { Container, Spinner, Dropdown } from 'react-bootstrap'
+import { Container, Spinner } from 'react-bootstrap'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { faFilter } from '@fortawesome/free-solid-svg-icons'
 import axios from 'axios'
 
 // Local libraries
 import config from '../../../../config'
 import ContentCard from './content-card'
+import FilterDropdown from './filter-dropdown'
 
 // Global variables and constants
 const SERVER = config.dexServer
@@ -101,24 +100,10 @@ function ContentCreators (props) {
       </div>
 
       <div className='mb-4 d-flex justify-content-end'>
-        <Dropdown>
+        <FilterDropdown
-          <Dropdown.Toggle variant='outline-secondary' className='d-flex align-items-center gap-2'>
+          selectedFilter={selectedFilter}
-            <FontAwesomeIcon icon={faFilter} />
+          setSelectedFilter={setSelectedFilter}
-            <span>{selectedFilter}</span>
+        />
-          </Dropdown.Toggle>
-
-          <Dropdown.Menu>
-            <Dropdown.Item onClick={() => setSelectedFilter('Most Followers')}>
-              Most Followers
-            </Dropdown.Item>
-            <Dropdown.Item onClick={() => setSelectedFilter('Most Tokens')}>
-              Most Tokens
-            </Dropdown.Item>
-            <Dropdown.Item onClick={() => setSelectedFilter('Most Likes')}>
-              Most Likes
-            </Dropdown.Item>
-          </Dropdown.Menu>
-        </Dropdown>
       </div>
 
       {!loaded && (

src/components/app-body/nostr/content-creators/filter-dropdown.js

@@ -0,0 +1,31 @@
+import React from 'react'
+import { Dropdown } from 'react-bootstrap'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faFilter } from '@fortawesome/free-solid-svg-icons'
+
+function FilterDropdown (props) {
+  const { selectedFilter, setSelectedFilter } = props
+
+  return (
+    <Dropdown>
+      <Dropdown.Toggle variant='outline-secondary' className='d-flex align-items-center gap-2'>
+        <FontAwesomeIcon icon={faFilter} />
+        <span>{selectedFilter}</span>
+      </Dropdown.Toggle>
+
+      <Dropdown.Menu>
+        <Dropdown.Item onClick={() => setSelectedFilter('Most Followers')}>
+          Most Followers
+        </Dropdown.Item>
+        <Dropdown.Item onClick={() => setSelectedFilter('Most Tokens')}>
+          Most Tokens
+        </Dropdown.Item>
+        <Dropdown.Item onClick={() => setSelectedFilter('Most Likes')}>
+          Most Likes
+        </Dropdown.Item>
+      </Dropdown.Menu>
+    </Dropdown>
+  )
+}
+
+export default FilterDropdown

src/components/app-body/nostr/content-creators/follow-btn.js

@@ -1,13 +1,15 @@
 import React, { useState, useEffect } from 'react'
 import { Spinner } from 'react-bootstrap'
 import { finalizeEvent } from 'nostr-tools/pure'
-import { Relay } from 'nostr-tools/relay'
 import { hexToBytes } from '@noble/hashes/utils'
+import NostrRestClient from '../../../../services/nostr-rest-client.js'
 
 function FollowBtn (props) {
   const [onFetch, setOnFetch] = useState(false)
   const [isFollowing, setIsFollowing] = useState(false)
   const { creator, appData, creatorProfile, followList, refreshFollowList } = props
+  // Initialize REST client for publishing
+  const restClient = new NostrRestClient()
 
   useEffect(() => {
     const isFollowing = followList.find(item => item[1] === creator.pubkey)
@@ -27,8 +29,8 @@ function FollowBtn (props) {
       if (!existing) {
         const creatorName = creatorProfile.name || ''
 
-        // add creator to the list
+        // add creator to the list (relay URL in tag is optional, REST API handles relay selection)
-        currentList.push(['p', creator.pubkey, 'wss://nostr-relay.psfoundation.info', creatorName])
+        currentList.push(['p', creator.pubkey, '', creatorName])
         await submitFollowList(currentList)
         await refreshFollowList()
       } else {
@@ -73,10 +75,7 @@ function FollowBtn (props) {
       // Convert private key to binary
       const privateKeyBin = hexToBytes(nostrKeyPair.privHex)
 
-      // Relay list
+      // Generate a follow list event.
-      const psf = 'wss://nostr-relay.psfoundation.info'
-
-      // Generate a post.
       const eventTemplate = {
         kind: 3,
         created_at: Math.floor(Date.now() / 1000),
@@ -89,16 +88,14 @@ function FollowBtn (props) {
       const signedEvent = finalizeEvent(eventTemplate, privateKeyBin)
       console.log('signedEvent: ', signedEvent)
 
-      // Connect to a relay.
+      // Publish the follow list via REST API (handles broadcasting to multiple relays)
-      const relay = await Relay.connect(psf)
+      const result = await restClient.publishEvent(signedEvent)
-      console.log(`connected to ${relay.url}`)
-
-      // Publish the message to the relay.
-      const result = await relay.publish(signedEvent)
       console.log('result: ', result)
 
-      // Close the connection to the relay.
+      if (!result.accepted) {
-      relay.close()
+        throw new Error(`Failed to publish follow list: ${result.message || 'Unknown error'}`)
+      }
+
       setTimeout(() => {
         setOnFetch(false)
       }, 1000)

src/components/app-body/nostr/feeds/feed-card.js

@@ -10,8 +10,8 @@ import { faUser, faHeart as faHeartSolid } from '@fortawesome/free-solid-svg-ico
 import { faHeart } from '@fortawesome/free-regular-svg-icons'
 import * as nip19 from 'nostr-tools/nip19'
 import { finalizeEvent } from 'nostr-tools/pure'
-import { Relay } from 'nostr-tools/relay'
 import { hexToBytes } from '@noble/hashes/utils' // already an installed dependency
+import NostrRestClient from '../../../../services/nostr-rest-client.js'
 
 // Local libraries
 import CopyOnClick from '../../bch-wallet/copy-on-click.js'
@@ -19,7 +19,9 @@ import NostrFormat from '../nostr-format'
 
 function FeedCard (props) {
   const { post, appData, profiles } = props
-  const { nostrKeyPair, writeRelays } = appData.bchWalletState
+  const { nostrKeyPair } = appData.bchWalletState
+  // Initialize REST client for publishing
+  const restClient = new NostrRestClient()
 
   const [profile, setProfile] = useState(profiles[post.pubkey])
 
@@ -103,25 +105,22 @@ function FeedCard (props) {
       }
       console.log(`eventTemplate: ${JSON.stringify(eventTemplate, null, 2)}`)
 
-      writeRelays.map(async (relayUrl) => {
+      // Sign the post
-        try {
+      const signedEvent = finalizeEvent(eventTemplate, privateKeyBin)
-          // Sign the post
+      console.log('signedEvent: ', signedEvent)
-          const signedEvent = finalizeEvent(eventTemplate, privateKeyBin)
-          console.log('signedEvent: ', signedEvent)
-          // Connect to a relay.
-          const relay = await Relay.connect(relayUrl)
-          console.log(`connected to ${relay.url}`)
 
-          // Publish the message to the relay.
+      // Publish the like via REST API (handles broadcasting to multiple relays)
-          const result = await relay.publish(signedEvent)
+      try {
-          console.log('result: ', result)
+        const result = await restClient.publishEvent(signedEvent)
+        console.log('result: ', result)
 
-          // Close the connection to the relay.
+        if (!result.accepted) {
-          relay.close()
+          throw new Error(`Failed to publish like: ${result.message || 'Unknown error'}`)
-        } catch (err) {
-          console.warn(`Skipping publishing to ${relayUrl} due to error: ${err}`)
         }
-      })
+      } catch (err) {
+        console.warn(`Error publishing like: ${err}`)
+        throw err
+      }
 
       await handleLikes(post, nostrKeyPair.pubHex)
       setLikesFetched(true)

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

@@ -7,14 +7,16 @@ import React, { useState, useEffect } from 'react'
 import { Container, Form, Button, Spinner } from 'react-bootstrap'
 import Accordion from 'react-bootstrap/Accordion'
 import { finalizeEvent } from 'nostr-tools/pure'
-import { Relay } from 'nostr-tools/relay'
 import { hexToBytes } from '@noble/hashes/utils' // already an installed dependency
+import NostrRestClient from '../../../../services/nostr-rest-client.js'
 
 // Local libraries
 
 function ProfilePost (props) {
   const { appData } = props
-  const { bchWalletState, writeRelays } = appData
+  const { bchWalletState } = appData
+  // Initialize REST client for publishing
+  const restClient = new NostrRestClient()
   const [accordionKey, setAccordionKey] = useState(null)
   const [onFetch, setOnFetch] = useState(false)
   const [formLoaded, setFormLoaded] = useState(false)
@@ -88,23 +90,13 @@ function ProfilePost (props) {
       const signedEvent = finalizeEvent(eventTemplate, privateKeyBin)
       console.log('signedEvent: ', signedEvent)
 
-      // Publish the post to each relay.
+      // Publish the profile via REST API (handles broadcasting to multiple relays)
-      writeRelays.map(async (relayUrl) => {
+      const result = await restClient.publishEvent(signedEvent)
-        try {
+      console.log('result: ', result)
-          // Connect to a relay.
-          const relay = await Relay.connect(relayUrl)
-          console.log(`connected to ${relay.url}`)
 
-          // Publish the message to the relay.
+      if (!result.accepted) {
-          const result = await relay.publish(signedEvent)
+        throw new Error(`Failed to publish profile: ${result.message || 'Unknown error'}`)
-          console.log('result: ', result)
+      }
-
-          // Close the connection to the relay.
-          relay.close()
-        } catch (err) {
-          console.warn(`Skipping publishing to ${relayUrl} due to error: ${err}`)
-        }
-      })
 
       setSuccessMsg('Post successfully published!')
       setOnFetch(false)

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

@@ -7,15 +7,17 @@ import React, { useState } from 'react'
 import { Container, Form, Button, Spinner } from 'react-bootstrap'
 import Accordion from 'react-bootstrap/Accordion'
 import { finalizeEvent } from 'nostr-tools/pure'
-import { Relay } from 'nostr-tools/relay'
 import { hexToBytes } from '@noble/hashes/utils' // already an installed dependency
+import NostrRestClient from '../../../../services/nostr-rest-client.js'
 
 // Local libraries
 
 function PublicPost (props) {
   const [accordionKey, setAccordionKey] = useState('0')
   const [onFetch, setOnFetch] = useState(false)
-  const { bchWalletState, writeRelays } = props.appData
+  const { bchWalletState } = props.appData
+  // Initialize REST client for publishing
+  const restClient = new NostrRestClient()
   const [formData, setFormData] = useState({
     content: ''
   })
@@ -62,23 +64,13 @@ function PublicPost (props) {
       const signedEvent = finalizeEvent(eventTemplate, privateKeyBin)
       console.log('signedEvent: ', signedEvent)
 
-      // Publish the post to each relay.
+      // Publish the post via REST API (handles broadcasting to multiple relays)
-      writeRelays.map(async (relayUrl) => {
+      const result = await restClient.publishEvent(signedEvent)
-        try {
+      console.log('result: ', result)
-          // Connect to a relay.
-          const relay = await Relay.connect(relayUrl)
-          console.log(`connected to ${relay.url}`)
 
-          // Publish the message to the relay.
+      if (!result.accepted) {
-          const result = await relay.publish(signedEvent)
+        throw new Error(`Failed to publish post: ${result.message || 'Unknown error'}`)
-          console.log('result: ', result)
+      }
-
-          // Close the connection to the relay.
-          relay.close()
-        } catch (err) {
-          console.warn(`Skipping publishing to ${relayUrl} due to error: ${err}`)
-        }
-      })
 
       resetForm()
       setSuccessMsg('Post successfully published!')

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} />
+        <ProfileRead {...props} onProfileRead={setProfile} npub={npub} profileAddresses={profileAddresses} />
-        <PublicRead {...props} profile={profile} npub={npub} />
+        <PublicRead {...props} profile={profile} npub={npub} profileAddresses={profileAddresses} />
-        <SlpTokensDisplay {...props} npub={npub} />
+        <SlpTokensDisplay {...props} npub={npub} profileAddresses={profileAddresses} />
-        <NFTForSale {...props} npub={npub} />
+        {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 { bchAddr } = profileAddresses
-      const url = `${config.dexServer}/offer/list/addr/${addr}`
+      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) => {
@@ -151,7 +145,7 @@ function NFTForSale (props) {
         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
+          thisToken.userData = userData
         }
 
         // Mark token to prevent fetch token icon again.
@@ -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 { npub, appData, onProfileRead, profileAddresses } = props
-  const { onProfileRead } = 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/offers/index.js

@@ -8,7 +8,7 @@ import React, { useState, useEffect, useCallback } from 'react'
 import { Container, Row, Col, Table, Button, Spinner } from 'react-bootstrap'
 import axios from 'axios'
 import { DatatableWrapper, TableBody, TableHeader } from 'react-bs-datatable'
-
+import AsyncLoad from '../../../services/async-load'
 // Local libraries
 import config from '../../../config'
 import WaitingModal from '../../waiting-modal'
@@ -100,10 +100,19 @@ function Offers (props) {
 
       // Generate a counter offer.
       const bchDexLib = appData.dexLib
-      const { offerData, partialHex } = await bchDexLib.take.takeOffer(
+      const { offerData, partialHex, counterOfferUtxo } = await bchDexLib.take.takeOffer(
         targetOfferEventId
       )
 
+      // Get counter offer data
+      const asyncLoad = new AsyncLoad()
+      const { takerAddr, takerNpub, counterOfferAddr } = await asyncLoad.getCounterOfferMetadata(appData)
+
+      offerData.takerAddr = takerAddr
+      offerData.takerNpub = takerNpub
+      offerData.counterOfferAddr = counterOfferAddr
+      offerData.counterOfferUtxo = counterOfferUtxo.txid
+
       // Upload the counter offer to Nostr.
       const nostr = appData.nostr
       const { eventId, noteId } = await nostr.testNostrUpload({

src/components/app-body/sign/index.js

@@ -14,8 +14,8 @@ function SignMessage (props) {
 
   const [sign, setSign] = useState('')
   const [msg, setMsg] = useState('')
-  const [bchAddr] = useState(wallet.walletInfo.cashAddress)
+  const [bchAddr] = useState(wallet?.walletInfo?.cashAddress)
-  const [slpAddr] = useState(wallet.walletInfo.slpAddress)
+  const [slpAddr] = useState(wallet?.walletInfo?.slpAddress)
   const [err, setErr] = useState('')
   const [copied, setCopied] = useState(false)
 

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

@@ -13,11 +13,17 @@ import TokenCard from './token-card'
 import RefreshTokenBalance from './refresh-tokens'
 
 const SlpTokens = (props) => {
-  const [appData, setAppData] = useState(props.appData)
+  const { appData } = props
   const [iconsAreLoaded, setIconsAreLoaded] = useState(false)
+  const [dataAreLoaded, setDataAreLoaded] = useState(false)
   const [tokens, setTokens] = useState([])
 
   const refreshTokenButtonRef = React.useRef()
+  const { slpInitLoaded, asyncBackgroundFinished } = props.appData.asyncBackGroundInitState
+
+  // Background bch data loaded finished
+  const backgroundDataLoaded = slpInitLoaded || asyncBackgroundFinished
+  const backgroundDataError = !slpInitLoaded && asyncBackgroundFinished
 
   // Update the tokens state when the appData changes
   useEffect(() => {
@@ -30,8 +36,7 @@ const SlpTokens = (props) => {
   // within the wallet app.
   // This function triggers the on-click function within the refresh-tokens.js button.
   const refreshTokens = async () => {
-    const newAppData = await refreshTokenButtonRef.current.handleRefreshTokenBalance()
+    await refreshTokenButtonRef.current.handleRefreshTokenBalance()
-    setAppData(newAppData)
   }
 
   // Get Cid from url
@@ -44,37 +49,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 +119,38 @@ 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.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
+    console.log('tokens', tokens)
+    setTokens(tokens)
+    await lazyLoadTokenData(tokens)
+    await lazyLoadMutableData(tokens)
+  }, [appData, lazyLoadTokenData, lazyLoadMutableData])
 
   // Start to load the token icons when the component is mounted
   useEffect(() => {
-    lazyLoadTokenIcons()
+    if (slpInitLoaded) {
-  }, [lazyLoadTokenIcons])
+      loadData()
+    }
+  }, [loadData, slpInitLoaded])
 
   // Generate the token cards for each token in the wallet.
   const generateCards = () => {
@@ -127,7 +173,7 @@ const SlpTokens = (props) => {
             <RefreshTokenBalance
               appData={appData}
               ref={refreshTokenButtonRef}
-              lazyLoadTokenIcons={lazyLoadTokenIcons}
+              lazyLoadTokenIcons={loadData}
             />
           </Col>
           <Col xs={6} style={{ textAlign: 'right' }}>
@@ -137,17 +183,35 @@ const SlpTokens = (props) => {
           </Col>
         </Row>
         <Row>
-          <Col xs={12} style={{ display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
+          {appData.asyncInitSucceeded && (
-            {
+            <Col xs={12} style={{ display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
-              !iconsAreLoaded && (
+              {/** Show spinner info if tokens are loaded but data is not loaded */
-                <div style={{ borderRadius: '10px', backgroundColor: '#f0f0f0', padding: '10px', display: 'flex', justifyContent: 'center', alignItems: 'center', width: 'fit-content' }}>
+             !backgroundDataLoaded && !backgroundDataError && (
-                  <span style={{ marginRight: '10px' }}>Loading Token Icons </span>
+               <div style={{ borderRadius: '10px', backgroundColor: '#f0f0f0', padding: '10px', display: 'flex', justifyContent: 'center', alignItems: 'center', width: 'fit-content' }}>
-                  <Spinner animation='border' />
+                 <span style={{ marginRight: '10px' }}>Loading Tokens </span>
-                </div>
+                 <Spinner animation='border' />
-              )
+               </div>
-            }
+             )
+           }
+              {/** Show spinner info if tokens are loaded but data is not loaded */
+             !backgroundDataError && !dataAreLoaded && tokens.length > 0 && (
+               <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 */
+             backgroundDataLoaded && 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>
+            </Col>
+          )}
         </Row>
         <br />
 
@@ -155,11 +219,16 @@ const SlpTokens = (props) => {
           {generateCards()}
         </Row>
         {/** Display a message if no tokens are found */}
-        {tokens.length === 0 && (
+        {backgroundDataLoaded && !backgroundDataError && tokens.length === 0 && (
           <Row className='text-center'>
             <span> No tokens found in wallet </span>
           </Row>
         )}
+        {backgroundDataError && (
+          <Row style={{ color: 'red' }} className='text-center'>
+            <span>Tokens could not be loaded! </span>
+          </Row>
+        )}
 
       </Container>
     </>

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

@@ -6,8 +6,8 @@
 */
 
 // Global npm libraries
-import React, { useState } from 'react'
+import React, { useState, useEffect } from 'react'
-import { Button, Modal, Container, Row, Col } from 'react-bootstrap'
+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.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/slp-tokens/refresh-tokens.js

@@ -18,6 +18,10 @@ function RefreshTokenBalance ({ appData: initialAppData, ref, lazyLoadTokenIcons
   const [modalBody, setModalBody] = useState([])
   const [hideSpinner, setHideSpinner] = useState(false)
   const [hideWaitingModal, setHideWaitingModal] = useState(true)
+  const { slpInitLoaded, asyncBackgroundFinished } = initialAppData.asyncBackGroundInitState
+
+  // Background bch data loaded finished
+  const backgroundDataLoaded = slpInitLoaded || asyncBackgroundFinished
 
   // Add a new line to the waiting modal.
   const addToModal = (inStr) => {
@@ -58,6 +62,10 @@ function RefreshTokenBalance ({ appData: initialAppData, ref, lazyLoadTokenIcons
       appData.updateBchWalletState({ walletObj: walletState, appData })
 
       const newAppData = { ...appData, bchWalletState: walletState }
+
+      // if slpInitLoaded is 'false', them set as true , to show the new balance.
+      appData.updateBackGroundInitState({ slpInitLoaded: true })
+
       // Update state
       setHideWaitingModal(true)
       setAppData(newAppData)
@@ -82,7 +90,7 @@ function RefreshTokenBalance ({ appData: initialAppData, ref, lazyLoadTokenIcons
 
   return (
     <>
-      <Button variant='success' onClick={handleRefreshTokenBalance}>
+      <Button variant='success' onClick={handleRefreshTokenBalance} disabled={!backgroundDataLoaded}>
         <FontAwesomeIcon icon={faRedo} size='lg' /> Refresh
       </Button>
 

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/components/nav-menu/index.js

@@ -58,6 +58,14 @@ function NavMenu (props) {
                 Fungible Tokens
               </NavLink>
 
+              <NavLink
+                className={currentPath === '/counter-offers' ? 'nav-link-active' : 'nav-link-inactive'}
+                to='/counter-offers'
+                onClick={handleClickEvent}
+              >
+                Counter Offers
+              </NavLink>
+
               <hr />
 
               <NavLink

src/components/starter-views.js

@@ -21,7 +21,7 @@ export function UninitializedView (props = {}) {
       />
       {
         appData.asyncInitFinished
-          ? <AppBody menuState={100} wallet={appData.wallet} appData={appData} />
+          ? <> <br /><AppBody menuState={100} wallet={appData.wallet} appData={appData} /></>
           : null
       }
     </>

src/config/index.js

@@ -18,6 +18,12 @@ const config = {
   // dexServer: 'http://localhost:5700',
 
   nostrTopic: 'bch-dex-test-topic-02',
+
+  // REST API endpoint for Nostr relay interactions (primary interface)
+  nostrRestApiUrl: 'https://nostr-relay-api.psfoundation.info',
+  // nostrRestApiUrl: 'http://localhost:5942',
+
+  // Legacy relay URLs kept for reference (may be used in tags, but actual connections use REST API)
   nostrRelay: 'wss://nostr-relay.psfoundation.info',
   nostrRelays: [
     'wss://nostr-relay.psfoundation.info',

src/hooks/state.js

@@ -47,6 +47,11 @@ function useAppState () {
   const [denyClose, setDenyClose] = useState(false)
   const [isSingleView, setIsSingleView] = useState(false)
 
+  // Background process state
+  const [asyncBackGroundInitState, setAsyncBackGroundInitState] = useState({
+    bchInitLoaded: false, slpInitLoaded: false, asyncBackgroundFinished: false
+  })
+
   // NFTs for sale stored data to improve performance
   const [nftForSaleCacheData, setNftForSaleCacheData] = useState(lsState.nftData || {})
 
@@ -55,8 +60,11 @@ function useAppState () {
   const [readRelays, setReadRelays] = useState(relaysData.filter(relay => relay.read).map(relay => relay.address)) // Read relays
   const [writeRelays, setWriteRelays] = useState(relaysData.filter(relay => relay.write).map(relay => relay.address)) // Write relays
 
-  // Nostr queries service
+  // Nostr queries service (REST API handles relays server-side, pass empty array for compatibility)
-  const nostrQueriesRef = useRef(new NostrQueries({ relays: readRelays }))
+  const nostrQueriesRef = useRef(new NostrQueries({ relays: [] }))
+
+  // 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.
@@ -127,7 +135,8 @@ function useAppState () {
     setNftForSaleCacheData(allCacheData) // Update the state
     updateLocalStorage({ nftData: allCacheData }) // Update the local storage
   }
-  // Update relays data
+
+  // Update relays data (kept for UI compatibility, REST API handles relays server-side)
   function updateRelaysData (relaysData) {
     setRelaysData(relaysData)
     updateLocalStorage({ relays: relaysData }) // Update the local storage
@@ -139,9 +148,12 @@ function useAppState () {
     const writeRelays = relaysData.filter(relay => relay.write).map(relay => relay.address)
     setWriteRelays(writeRelays)
     console.log('writeRelays: ', writeRelays)
-    nostrQueriesRef.current = new NostrQueries({ relays: readRelays })
+    // NostrQueries no longer needs relay updates (REST API handles relays server-side)
+    // Recreate instance for compatibility, but pass empty array
+    nostrQueriesRef.current = new NostrQueries({ relays: [] })
   }
-  // Restore relays data
+
+  // Restore relays data (kept for UI compatibility, REST API handles relays server-side)
   function restoreRelaysData () {
     const relaysData = [...localStorageDefault.relays] // Create a new array  in order to detect changes
     setRelaysData(relaysData)
@@ -154,7 +166,28 @@ function useAppState () {
     const writeRelays = relaysData.filter(relay => relay.write).map(relay => relay.address)
     setWriteRelays(writeRelays)
     console.log('writeRelays: ', writeRelays)
-    nostrQueriesRef.current = new NostrQueries({ relays: readRelays })
+    // NostrQueries no longer needs relay updates (REST API handles relays server-side)
+    // Recreate instance for compatibility, but pass empty array
+    nostrQueriesRef.current = new NostrQueries({ relays: [] })
+  }
+
+  // Update background state
+  function updateBackGroundInitState (inObj = {}) {
+    try {
+      setAsyncBackGroundInitState(oldState => {
+        // console.log('background old state: ', oldState)
+
+        const state = Object.assign({}, oldState, inObj)
+        // console.log('background state: ', state)
+
+        return state
+      })
+
+    // console.log(`New wallet state: ${JSON.stringify(bchWalletState, null, 2)}`)
+    } catch (err) {
+      console.error('Error in App.js updateBackGroundInitState()')
+      throw err
+    }
   }
 
   return {
@@ -205,8 +238,11 @@ function useAppState () {
     updateRelaysData,
     restoreRelaysData,
     readRelays,
-    writeRelays
+    writeRelays,
-
+    startChannelChat,
+    setStartChannelChat,
+    asyncBackGroundInitState,
+    updateBackGroundInitState
   }
 }
 

src/services/async-load.js

@@ -90,6 +90,11 @@ class AsyncLoad {
   // Get the BCH balance of the wallet.
   async getWalletBchBalance (wallet, updateBchWalletState, appData) {
     try {
+      /* // Force error for development
+            await sleep(6000)
+            throw new Error('getWalletBchBalance error')
+             */
+
       // Get the BCH balance of the wallet.
       const bchBalance = await wallet.getBalance({ bchAddress: wallet.walletInfo.cashAddress })
 
@@ -125,6 +130,10 @@ class AsyncLoad {
   // Get a list of SLP tokens held by the wallet.
   async getSlpTokenBalances (wallet, updateBchWalletState, appData) {
     try {
+      /*    // Force error for development
+            await sleep(6000)
+            throw new Error('getSlpTokenBalances error')
+            */
       // Get token information from the wallet. This will also initialize the UTXO store.
       const slpTokens = await wallet.listTokens(wallet.walletInfo.cashAddress)
       // console.log('slpTokens: ', slpTokens)
@@ -324,6 +333,59 @@ class AsyncLoad {
       throw error
     }
   }
+
+  async getDerivatedWallet (restURL, mnemonic, hdPath = "m/44'/245'/0'/0/0", initialize = true) {
+    try {
+      const options = {
+        interface: 'consumer-api',
+        restURL,
+        noUpdate: true,
+        hdPath
+      }
+
+      const wallet = new this.BchWallet(mnemonic, options)
+
+      // Wait for wallet to initialize.
+      await wallet.walletInfoPromise
+      if (initialize) {
+        await wallet.initialize()
+      }
+
+      return wallet
+    } catch (error) {
+      console.error('Error initStarterWallet: ', error)
+      throw error
+    }
+  }
+
+  // Get buyer and counter offer data.
+  async getCounterOfferMetadata (appData) {
+    try {
+      const { bchWalletState, serverUrl } = appData
+      // Start async load lib
+      const asyncLoad = new AsyncLoad()
+      await asyncLoad.loadWalletLib()
+
+      // Buyer wallet data
+      const buyerWallet = await asyncLoad.getDerivatedWallet(serverUrl, bchWalletState.mnemonic, "m/44'/245'/0'/0/0", false)
+      const buyerAddr = buyerWallet.walletInfo.cashAddress
+      const buyerKeyPair = asyncLoad.nostrKeyPairFromWIF(buyerWallet.walletInfo.privateKey)
+      const buyerNpub = buyerKeyPair.npub
+
+      // Counter offer wallet data
+      const counterOfferWallet = await asyncLoad.getDerivatedWallet(serverUrl, bchWalletState.mnemonic, "m/44'/245'/0'/0/1", false)
+      const counterOfferAddr = counterOfferWallet.walletInfo.cashAddress
+
+      return {
+        takerAddr: buyerAddr,
+        takerNpub: buyerNpub,
+        counterOfferAddr
+      }
+    } catch (error) {
+      console.error('Error getCounterOfferMetadata()', error)
+      throw error
+    }
+  }
 }
 
 function sleep (ms) {

src/services/nostr-queries.js

@@ -1,17 +1,47 @@
 /**
  *  Nostr class for query into relay pools
- *
+ *  Refactored to use REST API instead of WebSocket
  */
-import { RelayPool } from 'nostr'
+import NostrRestClient, { generateSubId } from './nostr-rest-client.js'
 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'
+import config from '../config'
+
+const SERVER = `${config.dexServer}/`
 
 export default class NostrQueries {
   constructor ({ relays }) {
-    this.relays = relays || []
+    // Keep relays property for backward compatibility (empty array)
+    this.relays = []
+
+    // Initialize REST client
+    this.restClient = new NostrRestClient()
+
+    this.loadedProfiles = {}
+    this.loadedChannelsInfo = {}
+    this.blackList = []
+    this.blackListFetched = false
+
+    this.deletedChats = []
+    this.deletedPosts = []
+  }
+
+  async start () {
+    try {
+      await this.getBlackList()
+      await this.fetchDeletedChats()
+      await this.fetchDeletedPosts()
+    } catch (error) {
+      console.error('NostrQueries.start() error : ', error.message)
+      throw error
+    }
   }
 
   setRelays (relays) {
-    this.relays = relays
+    // No-op for backward compatibility (REST API handles relays server-side)
+    this.relays = []
   }
 
   npubToHex (npub) {
@@ -24,153 +54,50 @@ export default class NostrQueries {
     return nip19.npubEncode(hex)
   }
 
-  // Load profile from nostr relays
+  // Load profile from nostr relays via REST API
-  // It uses multiple relays. It will exit after the first successful retrieval
-  // from any relay. If one relay fails, it will move on to the next one.
   async getProfile (pubHex) {
     try {
-      if (this.relays.length === 0) {
+      const existingProfile = this.loadedProfiles[pubHex]
-        return false
+      if (existingProfile) {
+        console.log(`Returning profile from cache :  ${existingProfile.name}`)
+        return existingProfile
       }
-      for (let i = 0; i < this.relays.length; i++) {
-        const profile = await new Promise((resolve) => {
-          const relay = this.relays[i]
-          // const pool = RelayPool(config.nostrRelays)
-          const pool = RelayPool([relay])
-          pool.on('open', relay => {
-            relay.subscribe('subid', { limit: 5, kinds: [0], authors: [pubHex] })
-          })
 
-          pool.on('eose', relay => {
+      const subId = generateSubId('profile')
-            relay.close()
+      const filter = { limit: 5, kinds: [0], authors: [pubHex] }
-            resolve(false)
-          })
 
-          pool.on('event', (relay, subId, ev) => {
+      const events = await this.restClient.queryEvents(subId, filter)
-            try {
+
-              const profile = JSON.parse(ev.content)
+      // Find the most recent profile event (kind 0 events are replaceable)
-              // console.log('profile', profile)
+      if (events && events.length > 0) {
-              console.log(`Profile found  for ${pubHex} at ${relay.url}`)
+        // Sort by created_at descending to get most recent
-              resolve(profile)
+        events.sort((a, b) => b.created_at - a.created_at)
-            } catch (error) {
+        const profileEvent = events[0]
-              resolve(false)
+        try {
-            }
+          const profile = JSON.parse(profileEvent.content)
-            relay.close()
+          console.log(`Profile found for ${pubHex}`)
-          })
+          this.loadedProfiles[pubHex] = profile
-          pool.on('error', (relay) => {
-            console.log(`Error fetching ${pubHex} profile. relay connection error :${relay.url} `)
-            relay.close()
-            resolve(false)
-          })
-        })
-        // Stop looking for profile if found
-        if (profile) {
           return profile
+        } catch (error) {
+          console.warn(`Error parsing profile content for ${pubHex}:`, error)
+          return false
         }
       }
+
+      return false
     } catch (error) {
-      console.warn(error)
+      console.warn(`Error fetching profile for ${pubHex}:`, error)
+      return false
     }
   }
 
-  // Get Feeds by user pubkey
+  // Get Feeds by user pubkey via REST API
   async getUserFeeds (pubHex) {
     try {
-      if (this.relays.length === 0) {
+      const subId = generateSubId('user-feeds')
-        return []
+      const filter = { limit: 5, kinds: [1], authors: [pubHex] }
-      }
-      let feeds = await new Promise((resolve) => {
-        let list = []
-        const closedRelays = []
 
-        const pool = RelayPool(this.relays)
+      let feeds = await this.restClient.queryEvents(subId, filter)
-
-        pool.on('open', relay => {
-          relay.subscribe('subid', { limit: 5, kinds: [1], authors: [pubHex] })
-        })
-
-        pool.on('eose', relay => {
-          relay.close()
-          if (!closedRelays.includes(relay)) {
-            closedRelays.push(relay)
-          }
-          // Resolve list if all relays are closed
-          if (closedRelays.length === this.relays.length) {
-            resolve(list)
-          }
-        })
-
-        pool.on('event', (relay, subId, ev) => {
-          list = [...list, ev]
-        })
-        pool.on('error', (relay) => {
-          relay.close()
-          if (!closedRelays.includes(relay)) {
-            closedRelays.push(relay)
-          } // Resolve list if all relays are closed
-          if (closedRelays.length === this.relays.length) {
-            resolve(list)
-          }
-        })
-      })
-      // Remove duplicated feeds
-      feeds = feeds.filter((val, i, list) => {
-        const existingIndex = list.findIndex(value => value.id === val.id)
-        return existingIndex === i
-      })
-
-      // Sort from newest to oldest
-      feeds.sort((a, b) => b.created_at - a.created_at)
-
-      return feeds
-    } catch (error) {
-      console.warn(error)
-    }
-  }
-
-  // Get global feeds
-  async getGlobalFeeds () {
-    try {
-      if (this.relays.length === 0) {
-        return []
-      }
-
-      let feeds = await new Promise((resolve, reject) => {
-        let list = []
-        const closedRelays = []
-
-        const pool = RelayPool(this.relays)
-        // const pool = RelayPool([config.nostrRelay])
-        pool.on('open', relay => {
-          relay.subscribe('REQ', { limit: 10, kinds: [1], '#t': ['slpdex-socialmedia'] })
-        })
-
-        pool.on('eose', relay => {
-          relay.close()
-          if (!closedRelays.includes(relay)) {
-            closedRelays.push(relay)
-          }
-          // Resolve list if all relays are closed
-          if (closedRelays.length === this.relays.length) {
-            resolve(list)
-          }
-        })
-
-        pool.on('event', (relay, subId, ev) => {
-          console.log('post retrieved from ', relay.url, ev.sig)
-          list = [...list, ev]
-        })
-        pool.on('error', (relay) => {
-          relay.close()
-          if (!closedRelays.includes(relay)) {
-            closedRelays.push(relay)
-          }
-          // Resolve list if all relays are closed
-          if (closedRelays.length === this.relays.length) {
-            resolve(list)
-          }
-        })
-      })
 
       // Remove duplicated feeds
       feeds = feeds.filter((val, i, list) => {
@@ -181,111 +108,80 @@ export default class NostrQueries {
       // Sort from newest to oldest
       feeds.sort((a, b) => b.created_at - a.created_at)
 
-      // console.log('feeds', feeds)
+      return feeds || []
-
-      return feeds
     } catch (error) {
-      console.warn(error)
+      console.warn(`Error fetching user feeds for ${pubHex}:`, error)
-    }
-  }
-
-  // Get follow list by pubkey
-  async getFollowList (pubHex) {
-    if (this.relays.length === 0) {
       return []
     }
-    return new Promise((resolve, reject) => {
-      let list = []
-      const closedRelays = []
-
-      const pool = RelayPool(this.relays)
-      // const pool = RelayPool([config.nostrRelay])
-      pool.on('open', relay => {
-        relay.subscribe('subid', { limit: 1, kinds: [3], authors: [pubHex] })
-      })
-
-      pool.on('eose', relay => {
-        relay.close()
-        if (!closedRelays.includes(relay)) {
-          closedRelays.push(relay)
-        }
-        // Resolve list if all relays are closed
-        if (closedRelays.length === this.relays.length) {
-          resolve(list)
-        }
-      })
-
-      pool.on('event', (relay, subId, ev) => {
-        // console.log('Received event:', ev)
-        // Merge list received from all relays
-        list = [...list, ...ev.tags]
-      })
-      pool.on('error', (relay) => {
-        relay.close()
-        if (!closedRelays.includes(relay)) {
-          closedRelays.push(relay)
-        }
-        // Resolve list if all relays are closed
-        if (closedRelays.length === this.relays.length) {
-          resolve(list)
-        }
-      })
-    })
   }
 
-  // Get event likes
+  // Get global feeds via REST API
+  async getGlobalFeeds () {
+    try {
+      const subId = generateSubId('global-feeds')
+      const filter = { limit: 10, kinds: [1], '#t': ['slpdex-socialmedia'] }
+
+      let feeds = await this.restClient.queryEvents(subId, filter)
+
+      // Filter out deleted posts
+      feeds = feeds.filter((ev) => {
+        const isDeleted = this.deletedPosts.find((val) => { return val.eventId === ev.id })
+        return !isDeleted
+      })
+
+      // Remove duplicated feeds
+      feeds = feeds.filter((val, i, list) => {
+        const existingIndex = list.findIndex(value => value.id === val.id)
+        return existingIndex === i
+      })
+
+      // Sort from newest to oldest
+      feeds.sort((a, b) => b.created_at - a.created_at)
+
+      return feeds || []
+    } catch (error) {
+      console.warn('Error fetching global feeds:', error)
+      return []
+    }
+  }
+
+  // Get follow list by pubkey via REST API
+  async getFollowList (pubHex) {
+    try {
+      const subId = generateSubId('follow-list')
+      const filter = { limit: 1, kinds: [3], authors: [pubHex] }
+
+      const events = await this.restClient.queryEvents(subId, filter)
+
+      // Get the most recent follow list (kind 3 events are replaceable)
+      if (events && events.length > 0) {
+        // Sort by created_at descending to get most recent
+        events.sort((a, b) => b.created_at - a.created_at)
+        const followListEvent = events[0]
+        return followListEvent.tags || []
+      }
+
+      return []
+    } catch (error) {
+      console.warn(`Error fetching follow list for ${pubHex}:`, error)
+      return []
+    }
+  }
+
+  // Get event likes via REST API
   async getPostLikes (postId) {
     try {
-      if (this.relays.length === 0) {
+      const subId = generateSubId('post-likes')
-        return []
+      const filter = { kinds: [7], '#e': [postId] }
-      }
-      let likesRes = await new Promise((resolve) => {
-        const likes = []
-        const closedRelays = []
 
-        const pool = RelayPool(this.relays)
+      let likesRes = await this.restClient.queryEvents(subId, filter)
-        pool.on('open', relay => {
-          relay.subscribe('subid', { kinds: [7], '#e': [postId] })
-        })
-
-        pool.on('eose', relay => {
-          relay.close()
-          if (!closedRelays.includes(relay)) {
-            closedRelays.push(relay)
-          }
-          // Resolve list if all relays are closed
-          if (closedRelays.length === this.relays.length) {
-            resolve(likes)
-          }
-        })
-
-        pool.on('event', (relay, subId, ev) => {
-          try {
-            // Count likes
-            if (ev.content === '+' || ev.content === '-') {
-              likes.push(ev)
-            }
-          } catch (error) {
-            // skip error
-          }
-        })
-        pool.on('error', (relay) => {
-          relay.close()
-          if (!closedRelays.includes(relay)) {
-            closedRelays.push(relay)
-          }
-          // Resolve list if all relays are closed
-          if (closedRelays.length === this.relays.length) {
-            resolve(likes)
-          }
-        })
-      })
 
       // Remove duplicated events
       likesRes = likesRes.filter((val, i, list) => {
         const existingIndex = list.findIndex(value => value.id === val.id)
         return existingIndex === i
       })
+
       // Get likes
       const likesArr = likesRes.filter((val, i, list) => {
         return val.content === '+'
@@ -295,63 +191,188 @@ export default class NostrQueries {
       const dislikesArr = likesRes.filter((val, i, list) => {
         return val.content === '-'
       })
+
       // For every user dislike remove a user like from the array
       for (let i = 0; i < dislikesArr.length; i++) {
         const disLike = dislikesArr[i]
         const likeExist = likesArr.findIndex(val => val.pubkey === disLike.pubkey)
         if (likeExist >= 0) likesArr.splice(likeExist, 1)
       }
+
       // Return array of likes.
       return likesArr
     } catch (error) {
-      console.warn(error)
+      console.warn(`Error fetching post likes for ${postId}:`, error)
+      return []
     }
   }
 
   async getChannelInfo (channelId) {
     try {
-      if (this.relays.length === 0) {
+      const existingChInfo = this.loadedChannelsInfo[channelId]
-        return false
+      if (existingChInfo) {
+        console.log(`Returning ch info from cache :  ${existingChInfo.name}`)
+        return existingChInfo
       }
-      for (let i = 0; i < this.relays.length; i++) {
-        const info = await new Promise((resolve) => {
-          const relay = this.relays[i]
-          // const pool = RelayPool(config.nostrRelays)
-          const pool = RelayPool([relay])
-          pool.on('open', relay => {
-            relay.subscribe('REQ', { limit: 1, kinds: [41], '#e': [channelId] })
-          })
 
-          pool.on('eose', relay => {
+      const subId = generateSubId('channel-info')
-            relay.close()
+      const filter = { limit: 1, kinds: [41], '#e': [channelId] }
-            resolve(false)
-          })
 
-          pool.on('event', (relay, subId, ev) => {
+      const events = await this.restClient.queryEvents(subId, filter)
-            try {
+
-              const chInfo = JSON.parse(ev.content)
+      if (events && events.length > 0) {
-              resolve(chInfo)
+        // Sort by created_at descending to get most recent
-            } catch (error) {
+        events.sort((a, b) => b.created_at - a.created_at)
-              resolve(false)
+        const channelEvent = events[0]
-            }
+        try {
-            relay.close()
+          const chInfo = JSON.parse(channelEvent.content)
-          })
+          this.loadedChannelsInfo[channelId] = chInfo
-          pool.on('error', (relay) => {
+          return chInfo
-            relay.close()
+        } catch (error) {
-            resolve(false)
+          console.warn(`Error parsing channel info for ${channelId}:`, error)
-          })
+          return false
-        })
-        // Stop looking for profile if found
-        if (info) {
-          return info
         }
       }
+
+      return false
     } catch (error) {
-      console.warn(error)
+      console.warn(`Error fetching channel info for ${channelId}:`, error)
+      return false
     }
   }
 
-  catch (error) {
+  // Get associated pub keys from kind 04 inbox via REST API
-    console.warn(error)
+  async getDms (pubKey) {
+    try {
+      const subId = generateSubId('dms')
+      // Use array of filters for multiple conditions
+      const filters = [
+        { limit: 100, kinds: [4], '#p': [pubKey] }, // received messages
+        { limit: 100, kinds: [4], authors: [pubKey] } // sent messages
+      ]
+
+      const events = await this.restClient.queryEvents(subId, filters)
+
+      const list = []
+      for (const ev of events) {
+        if (ev.pubkey === pubKey) {
+          // Sent message - get recipient from tags
+          if (ev.tags && ev.tags.length > 0 && ev.tags[0][0] === 'p') {
+            list.push(ev.tags[0][1])
+          }
+        } else {
+          // Received message - get sender pubkey
+          list.push(ev.pubkey)
+        }
+      }
+
+      // Remove duplicated pubkeys
+      const dms = list.filter((val, i, list) => {
+        const existingIndex = list.findIndex(value => value === val)
+        return existingIndex === i
+      })
+
+      return dms
+    } catch (error) {
+      console.warn(`Error fetching DMs for ${pubKey}:`, error)
+      return []
+    }
+  }
+
+  async encryptMsg (inObj = {}) {
+    try {
+      const { senderPrivKey, receiverPubKey, message } = inObj
+      const privateKeyBin = hexToBytes(senderPrivKey)
+      const encryptedMsg = await nip04.encrypt(privateKeyBin, receiverPubKey, message)
+      console.log('encryptedMsg', encryptedMsg)
+      return encryptedMsg
+    } catch (error) {
+      console.warn(error)
+      throw error
+    }
+  }
+
+  async decryptMsg (inObj = {}) {
+    try {
+      console.log(inObj)
+      const { receiverPrivKey, senderPubKey, encryptedMsg } = inObj
+      const privateKeyBin = hexToBytes(receiverPrivKey)
+      const decryptedMsg = await nip04.decrypt(privateKeyBin, senderPubKey, encryptedMsg)
+      console.log('decryptedMsg', decryptedMsg)
+      return decryptedMsg
+    } catch (error) {
+      console.warn(error)
+      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
+    }
+  }
+
+  // Get all deleted chats
+  async fetchDeletedChats () {
+    try {
+      const options = {
+        method: 'GET',
+        url: `${SERVER}nostr/deletedChat`
+      }
+      const result = await axios.request(options)
+      const { deletedChats } = result.data
+      this.deletedChats = deletedChats
+    } catch (error) {
+      console.error('Error fetchDeletedChats: ', error)
+      throw error
+    }
+  }
+
+  // Get all deleted posts
+  async fetchDeletedPosts () {
+    try {
+      const options = {
+        method: 'GET',
+        url: `${SERVER}nostr/deletedPost`
+      }
+      const result = await axios.request(options)
+      console.log('result', result)
+      const { deletedPosts } = result.data
+      console.log('deletedPosts', deletedPosts)
+
+      this.deletedPosts = deletedPosts
+    } catch (error) {
+      console.error('Error fetchDeletedPosts: ', error)
+      throw error
+    }
   }
 }

src/services/nostr-rest-client.js

@@ -0,0 +1,239 @@
+/**
+ * REST API Client for Nostr relay interactions via REST2NOSTR proxy
+ */
+
+import config from '../config/index.js'
+
+/**
+ * Generate a unique subscription ID
+ * @param {string} prefix - Prefix for the subscription ID
+ * @returns {string} Unique subscription ID
+ */
+export function generateSubId (prefix = 'sub') {
+  return `${prefix}-${Date.now()}-${Math.random().toString(36).substr(2, 9)}`
+}
+
+class NostrRestClient {
+  constructor (localConfig = {}) {
+    this.apiUrl = localConfig.apiUrl || config.nostrRestApiUrl
+    this.activeSubscriptions = new Map() // Track active SSE subscriptions
+  }
+
+  /**
+   * Publish a signed event to the relay
+   * @param {Object} signedEvent - Signed Nostr event
+   * @returns {Promise<Object>} Response with {accepted, message, eventId}
+   */
+  async publishEvent (signedEvent) {
+    try {
+      const response = await fetch(`${this.apiUrl}/event`, {
+        method: 'POST',
+        headers: {
+          'Content-Type': 'application/json'
+        },
+        body: JSON.stringify(signedEvent)
+      })
+
+      if (!response.ok) {
+        const errorText = await response.text()
+        throw new Error(`HTTP ${response.status}: ${errorText}`)
+      }
+
+      const result = await response.json()
+      return result
+    } catch (error) {
+      console.error('Error publishing event:', error)
+      throw error
+    }
+  }
+
+  /**
+   * Query events statelessly (GET request)
+   * @param {string} subId - Subscription ID
+   * @param {Array|Object} filters - Filter object or array of filters
+   * @returns {Promise<Array>} Array of events
+   */
+  async queryEvents (subId, filters) {
+    try {
+      // Ensure filters is an array
+      const filtersArray = Array.isArray(filters) ? filters : [filters]
+
+      // Encode filters as query parameter
+      const filtersJson = encodeURIComponent(JSON.stringify(filtersArray))
+      const url = `${this.apiUrl}/req/${subId}?filters=${filtersJson}`
+
+      const response = await fetch(url)
+
+      if (!response.ok) {
+        const errorText = await response.text()
+        throw new Error(`HTTP ${response.status}: ${errorText}`)
+      }
+
+      const events = await response.json()
+      return events
+    } catch (error) {
+      console.error('Error querying events:', error)
+      throw error
+    }
+  }
+
+  /**
+   * Create a subscription for Server-Sent Events (SSE)
+   * @param {string} subId - Subscription ID
+   * @param {Array|Object} filters - Filter object or array of filters
+   * @param {Object} callbacks - Callback functions {onEvent, onEose, onClosed, onError}
+   * @returns {EventSource} EventSource instance for cleanup
+   */
+  createSubscription (subId, filters, callbacks = {}) {
+    const { onEvent, onEose, onClosed, onError } = callbacks
+
+    // Ensure filters is an array
+    const filtersArray = Array.isArray(filters) ? filters : [filters]
+
+    // Use POST method for SSE subscription
+    // Note: EventSource doesn't support POST, so we'll use fetch with streaming
+    // However, for simplicity and browser compatibility, we'll use a workaround:
+    // Create a form and use POST, or use EventSource with GET if the server supports it
+
+    // For now, we'll use fetch with streaming and parse SSE manually
+    // This is more complex but allows POST with filters in body
+    const abortController = new AbortController()
+
+    const fetchSubscription = async () => {
+      try {
+        const response = await fetch(`${this.apiUrl}/req/${subId}`, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+            Accept: 'text/event-stream'
+          },
+          body: JSON.stringify(filtersArray),
+          signal: abortController.signal
+        })
+
+        if (!response.ok) {
+          const errorText = await response.text()
+          if (onError) {
+            onError(new Error(`HTTP ${response.status}: ${errorText}`))
+          }
+          return
+        }
+
+        const reader = response.body.getReader()
+        const decoder = new TextDecoder()
+        let buffer = ''
+
+        while (true) {
+          const { done, value } = await reader.read()
+
+          if (done) {
+            break
+          }
+
+          buffer += decoder.decode(value, { stream: true })
+          const lines = buffer.split('\n')
+          buffer = lines.pop() || '' // Keep incomplete line in buffer
+
+          for (const line of lines) {
+            if (line.startsWith('data: ')) {
+              try {
+                const data = JSON.parse(line.slice(6)) // Remove 'data: ' prefix
+
+                if (data.type === 'connected') {
+                  // Connection established
+                  console.log(`Subscription ${subId} connected`)
+                } else if (data.type === 'event' && data.data) {
+                  // Event received
+                  if (onEvent) {
+                    onEvent(data.data)
+                  }
+                } else if (data.type === 'eose') {
+                  // End of stored events
+                  if (onEose) {
+                    onEose()
+                  }
+                } else if (data.type === 'closed') {
+                  // Subscription closed
+                  if (onClosed) {
+                    onClosed(data.message || 'Subscription closed')
+                  }
+                  return // Stop reading
+                }
+              } catch (parseError) {
+                console.warn('Error parsing SSE message:', parseError, line)
+              }
+            }
+          }
+        }
+      } catch (error) {
+        if (error.name === 'AbortError') {
+          // Subscription was cancelled, this is expected
+          return
+        }
+        console.error('Error in SSE subscription:', error)
+        if (onError) {
+          onError(error)
+        }
+      }
+    }
+
+    // Store subscription for cleanup
+    const subscription = {
+      subId,
+      abortController,
+      close: () => {
+        abortController.abort()
+        this.closeSubscription(subId)
+      }
+    }
+
+    this.activeSubscriptions.set(subId, subscription)
+
+    // Start the subscription
+    fetchSubscription()
+
+    return subscription
+  }
+
+  /**
+   * Close an existing subscription
+   * @param {string} subId - Subscription ID to close
+   * @returns {Promise<void>}
+   */
+  async closeSubscription (subId) {
+    try {
+      // Abort the fetch if it's still active
+      const subscription = this.activeSubscriptions.get(subId)
+      if (subscription && subscription.abortController) {
+        subscription.abortController.abort()
+      }
+
+      // Send DELETE request to close subscription
+      const response = await fetch(`${this.apiUrl}/req/${subId}`, {
+        method: 'DELETE'
+      })
+
+      if (!response.ok) {
+        const errorText = await response.text()
+        console.warn(`Error closing subscription ${subId}:`, errorText)
+      }
+
+      // Remove from active subscriptions
+      this.activeSubscriptions.delete(subId)
+    } catch (error) {
+      console.error(`Error closing subscription ${subId}:`, error)
+      // Still remove from active subscriptions even if DELETE fails
+      this.activeSubscriptions.delete(subId)
+    }
+  }
+
+  /**
+   * Close all active subscriptions
+   */
+  async closeAllSubscriptions () {
+    const subIds = Array.from(this.activeSubscriptions.keys())
+    await Promise.all(subIds.map(subId => this.closeSubscription(subId)))
+  }
+}
+
+export default NostrRestClient

src/services/nostr.js

@@ -10,10 +10,10 @@
 // import * as nip19 from '@chris.troutner/nostr-tools/nip19'
 
 import { finalizeEvent } from 'nostr-tools/pure'
-import { Relay } from 'nostr-tools/relay'
 import BchNostr from 'bch-nostr'
 import * as nip19 from 'nostr-tools/nip19'
 import config from '../config/index.js'
+import NostrRestClient from './nostr-rest-client.js'
 
 class NostrBrowser {
   constructor (localConfig = {}) {
@@ -27,6 +27,9 @@ class NostrBrowser {
       relayWs: config.nostrRelay,
       topic: config.nostrTopic
     })
+
+    // Initialize REST client for publishing events
+    this.restClient = new NostrRestClient()
   }
 
   async testNostrUpload (inObj = {}) {
@@ -69,7 +72,6 @@ class NostrBrowser {
       //   tags: [['t', 'bch-dex-test-topic-01']]
       // }
 
-      const relayWs = config.nostrRelay
       const eventTemplate = {
         kind: 867,
         created_at: Math.floor(Date.now() / 1000),
@@ -82,18 +84,12 @@ class NostrBrowser {
       // console.log('signedEvent: ', signedEvent)
       const eventId = signedEvent.id
 
-      // Connect to a relay.
+      // Publish the message via REST API
-      const relay = await Relay.connect(relayWs, {
+      const result = await this.restClient.publishEvent(signedEvent)
-        /* global WebSocket */
-        webSocket: WebSocket
-      })
-      // console.log(`connected to ${relay.url}`)
 
-      // Publish the message to the relay.
+      if (!result.accepted) {
-      await relay.publish(signedEvent)
+        throw new Error(`Failed to publish event: ${result.message || 'Unknown error'}`)
-
+      }
-      // Close the connection to the relay.
-      relay.close()
 
       // const eventId = await this.bchNostr.post.uploadToNostr(inObj)