Merge pull request #82 from Permissionless-Software-Foundation/dh-ctr-offr-page

feat(offers): Created Counter Offers page
2026-09-21 16:52:01 -07:00 · 2025-11-25 19:01:13 -08:00 · 2025-11-25 20:56:03 -04:00 · 2025-11-20 05:48:03 -08:00 · 2025-11-20 05:29:59 -08:00 · 2025-11-20 05:28:08 -08:00
48 changed files with 8685 additions and 7142 deletions
@@ -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",
@@ -40,7 +40,8 @@
    "eject": "react-app-rewired eject",
    "lint": "standard --env mocha --fix",
    "pub": "node deploy/publish-main.js",
-    "pub:ghp": "./deploy/publish-gh-pages.sh"
+    "pub:ghp": "./deploy/publish-gh-pages.sh",
+    "postinstall": "rm -rf node_modules/fork-ts-checker-webpack-plugin/node_modules 2>/dev/null || true && (cd node_modules/@eslint/eslintrc && npm install ajv@^6.12.6 --no-save 2>/dev/null || true) && (cd node_modules/eslint && npm install ajv@^6.12.6 --no-save 2>/dev/null || true)"
  },
  "eslintConfig": {
    "extends": "react-app"
@@ -66,6 +67,16 @@
    "standard": "17.0.0",
    "web3.storage": "4.3.0"
  },
+  "overrides": {
+    "ajv": "^8.17.1",
+    "ajv-keywords": "^5.1.0",
+    "ajv-formats": "^2.1.1",
+    "babel-loader": {
+      "schema-utils": "^2.7.1",
+      "ajv-keywords": "^3.5.2",
+      "ajv": "^6.12.6"
+    }
+  },
  "release": {
    "publish": [
      {
@@ -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;
+  }
 }
@@ -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 (
    <>
@@ -3,18 +3,39 @@
 */

 // Global npm libraries
-import React from 'react'
-import { Container, Row, Col, Card } from 'react-bootstrap'
+import React, { useEffect, useState } from 'react'
+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 sats = appData.bchWalletState.bchBalance
-  const bchBalance = bchjs.BitcoinCash.toBitcoinCash(sats)
-  const usdBalance = bchjs.Util.floor2(bchBalance * appData.bchWalletState.bchUsdPrice)
+  const { bchInitLoaded, asyncBackgroundFinished } = appData.asyncBackGroundInitState
+
+  // Calculate balances if wallet is successfully loaded!
+  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>
-            <Row>
-              <Col>
-                <b>USD</b>: ${usdBalance}
-              </Col>
-            </Row>
+          {bchInitLoaded && (
+            <Container>
+              <Row>
+                <Col>
+                  <b>USD</b>: ${usdBalance}
+                </Col>
+              </Row>

-            <Row>
-              <Col>
-                <b>BCH</b>: {bchBalance}
-              </Col>
-            </Row>
+              <Row>
+                <Col>
+                  <b>BCH</b>: {bchBalance}
+                </Col>
+              </Row>

-            <Row>
-              <Col>
-                <b>Satoshis</b>: {sats}
-              </Col>
-            </Row>
-          </Container>
+              <Row>
+                <Col>
+                  <b>Satoshis</b>: {sats}
+                </Col>
+              </Row>
+            </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>
    </>
@@ -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()

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

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

@@ -0,0 +1,42 @@
+/*
+  This component renders as a button. When clicked, it opens a modal that
+  cancels the counter offer.
+
+  This is a functional component with as little state as possible.
+*/
+
+// Global npm libraries
+import React, { useState } from 'react'
+import { Button, Modal, Container } from 'react-bootstrap'
+
+function CancelCounterOfferBtn (props) {
+  const [show, setShow] = useState(false)
+
+  const handleClose = () => {
+    setShow(false)
+    // props.instance.setState({ showModal: false })
+  }
+
+  const handleOpen = () => {
+    setShow(true)
+  }
+
+  return (
+    <>
+      <Button variant='danger' onClick={handleOpen} disabled>Cancel</Button>
+      <Modal show={show} onHide={handleClose}>
+        <Modal.Header closeButton>
+          <Modal.Title>Cancel </Modal.Title>
+        </Modal.Header>
+        <Modal.Body>
+          <Container>
+            {/** ... */}
+          </Container>
+        </Modal.Body>
+        <Modal.Footer />
+      </Modal>
+    </>
+  )
+}
+
+export default CancelCounterOfferBtn
@@ -0,0 +1,86 @@
+/*
+  This Card component summarizes an SLP token.
+  if a token icon does not exist or cant be loaded , then display a default icon from Jdenticon library.
+*/
+
+// Global npm libraries
+import React, { useState, useEffect } from 'react'
+import { Container, Row, Col, Card, Button } from 'react-bootstrap'
+import Jdenticon from '@chris.troutner/react-jdenticon'
+// Local libraries
+import InfoButton from './info-button'
+import CancelCounterOfferBtn from './cancel-counter-offer-btn'
+
+function CounterOfferCard (props) {
+  const { token } = props
+  const [icon, setIcon] = useState(token.icon)
+
+  // Update icon state every token.icon changes
+  useEffect(() => {
+    setIcon(token.icon)
+  }, [token.icon])
+
+  return (
+    <>
+      <Col xs={12} sm={6} lg={4} style={{ padding: '25px' }}>
+        <Card>
+          <Card.Body style={{ textAlign: 'center' }}>
+            {/** If the icon is loaded, display it */
+              icon && (
+                <Card.Img
+                  src={icon}
+                  style={{ height: '100px', width: '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 && (
+                <Jdenticon size='100' value={token.tokenId} />
+              )
+            }
+            <Card.Title style={{ textAlign: 'center' }}>
+              <h4>{props.token.ticker}</h4>
+            </Card.Title>
+
+            <Container>
+              <Row>
+                <Col>
+                  {props.token.name}
+                </Col>
+              </Row>
+              <br />
+              <br />
+
+              <Row className='text-center'>
+                <Col xs={4}>
+                  <InfoButton token={props.token} />
+                </Col>
+                <Col xs={4}>
+                  <Button
+                    href={`/profile/${props.token.makerNpub}#single-view`}
+                    target='_blank'
+                    rel='noopener noreferrer'
+                    disabled={!props.token.makerNpub}
+                  >
+                    Seller
+                  </Button>
+
+                </Col>
+                <Col xs={4}>
+                  <CancelCounterOfferBtn token={props.token} />
+                </Col>
+
+              </Row>
+            </Container>
+          </Card.Body>
+        </Card>
+      </Col>
+    </>
+  )
+}
+
+export default CounterOfferCard
@@ -0,0 +1,246 @@
+/*
+  This component displays the counter offers for the current wallet.
+*/
+
+// Global npm libraries
+import React, { useState, useEffect, useCallback } from 'react'
+import { Container, Row, Col, Spinner, Button } from 'react-bootstrap'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import CounterOfferCard from './counter-offer-card'
+import AsyncLoad from '../../../services/async-load'
+import { faRedo } from '@fortawesome/free-solid-svg-icons'
+// Local libraries
+
+const CounterOffers = (props) => {
+  const { appData } = props
+  const [iconsAreLoaded, setIconsAreLoaded] = useState(false)
+  const [dataAreLoaded, setDataAreLoaded] = useState(false)
+  const [counterOffers, setCounterOffers] = useState([])
+  const [isLoading, setIsLoading] = useState(true)
+
+  // Get Cid from url
+  const parseCid = (url) => {
+    // get the cid from the url format 'ipfs://bafybeicem27xbzs65uvbcgykcmscsgln3lmhbfrcoec3gdttkdgtxv5acq
+    if (url && url.includes('ipfs://')) {
+      const cid = url.split('ipfs://')[1]
+      return cid
+    }
+    return url
+  }
+
+  //  This function 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
+          thisToken.tokenId = tokenData.genesisData.tokenId
+          thisToken.ticker = tokenData.genesisData.ticker
+          thisToken.name = tokenData.genesisData.name
+          thisToken.decimals = tokenData.genesisData.decimals
+          thisToken.tokenType = tokenData.genesisData.type
+          thisToken.url = tokenData.genesisData.documentUri
+        }
+
+        // Mark token to prevent fetch token data again.
+        thisToken.dataAlreadyDownloaded = true
+      }
+
+      setDataAreLoaded(true)
+    } catch (error) {
+      setDataAreLoaded(true)
+    }
+  }, [appData])
+
+  // Fetch mutable data if it exist and get the token icon url
+  const fetchTokenMutableData = useCallback(async (token) => {
+    try {
+      // Get the token data
+      const tokenData = token.tokenData
+
+      if (!tokenData.mutableData) return false // Return false if no mutable data
+
+      // Get the token icon from the mutable data
+      const cid = parseCid(tokenData.mutableData)
+      console.log('mutable data cid', cid)
+
+      const { json } = await appData.wallet.cid2json({ cid })
+      console.log('json: ', json)
+      if (!json) return false
+
+      let iconUrl = json.tokenIcon
+
+      if (json.fullSizedUrl && json.fullSizedUrl.includes('http')) {
+        iconUrl = json.fullSizedUrl
+      }
+      const userData = json.userData
+      // Return icon url
+      return { iconUrl, userData }
+    } catch (error) {
+      return false
+    }
+  }, [appData])
+
+  //  This function loads the token icons from the ipfs gateways.
+  const lazyLoadMutableData = useCallback(async (tokens) => {
+    try {
+      setIconsAreLoaded(false)
+      // map each token and fetch the icon url
+      for (let i = 0; i < tokens.length; i++) {
+        const thisToken = tokens[i]
+
+        // Incon does not  need to be downloaded, so continue with the next one
+        if (thisToken.iconAlreadyDownloaded) continue
+
+        // Try to get token icon url from mutable data.
+        const { iconUrl, userData } = await fetchTokenMutableData(thisToken)
+        console.log('iconUrl', iconUrl)
+        if (iconUrl) {
+          // Set the icon url to the token , this can be used to display the icon in the token card component.
+          thisToken.icon = iconUrl
+          thisToken.userData = userData
+        }
+
+        // Mark token to prevent fetch token icon again.
+        thisToken.iconAlreadyDownloaded = true
+      }
+
+      setIconsAreLoaded(true)
+    } catch (error) {
+      setIconsAreLoaded(true)
+    }
+  }, [fetchTokenMutableData])
+
+  // Load the counter offers for the current wallet.
+  const loadData = useCallback(async () => {
+    try {
+      setIsLoading(true)
+      setCounterOffers([])
+      // Get the wallet state and server url from the app data.
+      const { bchWalletState, serverUrl } = appData
+      // Create a new AsyncLoad instance.
+      const asyncLoad = new AsyncLoad()
+      // Load the wallet library.
+      await asyncLoad.loadWalletLib()
+      // Get the counter offer derivated wallet
+      const counterOfferWallet = await asyncLoad.getDerivatedWallet(serverUrl, bchWalletState.mnemonic, "m/44'/245'/0'/0/1")
+      // Get the utxos from the counter offer wallet.
+      const utxos = await counterOfferWallet.getUtxos()
+      const bchUtxos = utxos.bchUtxos
+      // Get the counter offers data for the current wallet address.
+      const { counterOffers } = await asyncLoad.getCounterOffersByAddress(bchWalletState.cashAddress)
+      // Filter the counter offers to only include the ones that are in the utxos.
+      const filteredCounterOffers = counterOffers.filter(val =>
+        bchUtxos.some(utxo => utxo.txid === val.counterOfferUtxo)
+      )
+
+      setCounterOffers(filteredCounterOffers)
+      setIsLoading(false)
+      // Load the token data for the counter offers in background.
+      await lazyLoadTokenData(filteredCounterOffers)
+      // Load the token icons for the counter offers in background.
+      await lazyLoadMutableData(filteredCounterOffers)
+    } catch (error) {
+      setIsLoading(false)
+      console.error('Error loading counter offers:', error)
+    }
+  }, [appData, lazyLoadTokenData, lazyLoadMutableData])
+
+  // Start to load the token icons when the component is mounted
+  useEffect(() => {
+    loadData()
+  }, [loadData])
+
+  // Handler for refresh button
+  const handleRefresh = useCallback(() => {
+    loadData()
+  }, [loadData])
+  // Generate the token cards for each token in the wallet.
+  const generateCards = () => {
+    return counterOffers.map(thisCounterOffer => (
+      <CounterOfferCard
+        appData={appData}
+        token={thisCounterOffer}
+        key={`${thisCounterOffer.id}`}
+        refreshTokens={loadData}
+      />
+    ))
+  }
+
+  return (
+    <>
+      <Container>
+        <Row>
+          <Col xs={6} style={{ textAlign: 'start' }}>
+            {!isLoading && (
+              <Row>
+                <Col xs={6}>
+                  <Button variant='success' onClick={handleRefresh}>
+                    <FontAwesomeIcon icon={faRedo} size='lg' /> Refresh
+                  </Button>
+                </Col>
+              </Row>
+            )}
+          </Col>
+        </Row>
+        <Row>
+          {appData.asyncInitSucceeded && (
+
+            <Col xs={12} style={{ display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
+              {/** Show spinner info if tokens are loaded but data is not loaded */
+                isLoading && (
+                  <div style={{ borderRadius: '10px', backgroundColor: '#f0f0f0', padding: '10px', display: 'flex', justifyContent: 'center', alignItems: 'center', width: 'fit-content' }}>
+                    <span style={{ marginRight: '10px' }}>Loading Counter Offers </span>
+                    <Spinner animation='border' />
+                  </div>
+                )
+              }
+              {/** Show spinner info if tokens are loaded but data is not loaded */
+                !isLoading && !dataAreLoaded && counterOffers.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 */
+                !isLoading && dataAreLoaded && !iconsAreLoaded && (
+                  <div style={{ borderRadius: '10px', backgroundColor: '#f0f0f0', padding: '10px', display: 'flex', justifyContent: 'center', alignItems: 'center', width: 'fit-content' }}>
+                    <span style={{ marginRight: '10px' }}>Loading Token Icons </span>
+                    <Spinner animation='border' />
+                  </div>
+                )
+              }
+
+            </Col>
+          )}
+        </Row>
+        <br />
+
+        <Row>
+          {generateCards()}
+        </Row>
+        {/** Display a message if no tokens are found */}
+        {!isLoading && counterOffers.length === 0 && (
+          <Row className='text-center'>
+            <span> No tokens found in wallet </span>
+          </Row>
+        )}
+
+      </Container>
+    </>
+  )
+}
+
+export default CounterOffers
@@ -0,0 +1,146 @@
+/*
+  This component renders as a button. When clicked, it opens a modal that
+  displays information about the token.
+
+  This is a functional component with as little state as possible.
+*/
+
+// Global npm libraries
+import React, { useState, useEffect } from 'react'
+import { Button, Modal, Container, Row, Col, Spinner } from 'react-bootstrap'
+
+// Takes a string as input. If it matches a pattern for a link, a JSX object is
+// returned with a link. Otherwise the original string is returned.
+function linkIfUrl (url) {
+  // Convert the URL into a link if it contains 'http'
+  if (url?.includes('http')) {
+    url = (<a href={url} target='_blank' rel='noreferrer'>{url}</a>)
+
+    //
+  } else if (url?.includes('ipfs://')) {
+    // Convert to a Filecoin link if its an IPFS reference.
+
+    const cid = url.substring(7)
+    url = (<a href={`https://${cid}.ipfs.dweb.link/data.json`} target='_blank' rel='noreferrer'>{url}</a>)
+  }
+
+  return url
+}
+
+function InfoButton (props) {
+  const [show, setShow] = useState(false)
+  const [mutableDataCid, setMutableDataCid] = useState(null)
+
+  const handleClose = () => {
+    setShow(false)
+    // props.instance.setState({ showModal: false })
+  }
+
+  const handleOpen = () => {
+    setShow(true)
+  }
+
+  // Convert the url property of the token to a link, if it matches common patterns.
+  let url = props.token.url
+  url = linkIfUrl(props.token.url)
+
+  // 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>
+      <Modal show={show} onHide={handleClose}>
+        <Modal.Header closeButton>
+          <Modal.Title>Token Information</Modal.Title>
+        </Modal.Header>
+        <Modal.Body>
+          <Container>
+            <Row>
+              <Col xs={4}><b>Ticker</b>:</Col>
+              <Col xs={8}>{props.token.ticker}</Col>
+            </Row>
+
+            <Row style={{ backgroundColor: '#eee' }}>
+              <Col xs={4}><b>Name</b>:</Col>
+              <Col xs={8}>{props.token.name}</Col>
+            </Row>
+
+            <Row>
+              <Col xs={4}><b>Token ID</b>:</Col>
+              <Col xs={8} style={{ wordBreak: 'break-all' }}>
+                <a href={`https://token.fullstack.cash/?tokenid=${props.token.tokenId}`} target='_blank' rel='noreferrer'>
+                  {props.token.tokenId}
+                </a>
+              </Col>
+            </Row>
+
+            <Row style={{ backgroundColor: '#eee' }}>
+              <Col xs={4}><b>Decimals</b>:</Col>
+              <Col xs={8}>{props.token.decimals}</Col>
+            </Row>
+
+            <Row>
+              <Col xs={4}><b>Token Type</b>:</Col>
+              <Col xs={8}>{props.token.tokenType}</Col>
+            </Row>
+
+            <Row style={{ backgroundColor: '#eee', wordBreak: 'break-all' }}>
+              <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>
+            )}
+            {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'
+                    variant='success'
+                  >
+                    View User Data
+                  </Button>
+                </Col>
+              </Row>
+            )}
+          </Container>
+        </Modal.Body>
+        <Modal.Footer />
+      </Modal>
+    </>
+  )
+}
+
+export default InfoButton
@@ -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 */}
@@ -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)

@@ -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
@@ -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
-  const handleRefresh = () => {
-    console.log('handling refresh')
-    loadNftOffers()
+  // Flag to prevent load data multiple times on component mount!
+  const componentMountRef = useRef(false)
+
+  // 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')
-    loadNftOffers()
+    // Peevent to run multiple times
+    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' }} />
@@ -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>
    </>
  )
@@ -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
@@ -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.Body style={{ textAlign: 'center' }}>
+        <Card className='shadow-sm'>
+          <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 && (
@@ -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>
      )}
@@ -6,6 +6,7 @@
 import React, { useCallback, useEffect, useState } from 'react'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faUser } from '@fortawesome/free-solid-svg-icons'
+import { Spinner } from 'react-bootstrap'

 export default function DMItem (props) {
  const { dm, profiles, selectedChannel, onChangeChannel } = props
@@ -97,6 +98,7 @@ export default function DMItem (props) {
          style={{ fontSize: '14px' }}
        >
          {getShortName(profile?.name) || 'Unknown User'}
+          {!profile?.name && <Spinner animation='border' size='sm' style={{ marginLeft: '5px' }} />}
        </div>
        {/*         <div
          className={`small ${isSelected ? 'text-white-50' : 'text-muted'} ${dm.unreadCount > 0 ? 'fw-bold' : ''}`}
@@ -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, bchWalletState } = 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({})
@@ -24,12 +31,88 @@ function NostrChat (props) {
  const [dmChannels, setDmChannels] = useState([])
  const [dmListLoaded, setDmListLoaded] = useState(false)

-  const [selectedChannel, setSelectedChannel] = useState(config.chatsId[0])
+  const [selectedChannel, setSelectedChannel] = useState(null)
  const [selectedChannelIsDm, setSelectedChannelIsDm] = useState(false)

+  const [deletedChats] = useState(appData.nostrQueries.deletedChats)
+
  const profilesRef = useRef({})
  const dmChannelsRef = useRef([])

+  // Reset states on change channel
+  const onChangeChannel = useCallback((ch) => {
+    if (selectedChannel === ch) return
+    const profiles = profilesRef.current
+    setSelectedChannelIsDm(!!profiles[ch])
+    setMessages([])
+    setLoadedMessages(false)
+    setSelectedChannel(ch)
+  }, [selectedChannel])
+
+  // Add a new DM to the list
+  const addPrivateMessage = useCallback(async (profile) => {
+    try {
+      const exist = dmChannelsRef.current.find(val => val === profile.pubKey)
+      setMessages([])
+      setLoadedMessages(false)
+      onChangeChannel(profile.pubKey)
+      if (exist) return
+      setDmChannels(currentChs => {
+        let newChs = [...currentChs]
+        newChs.push(profile.pubKey)
+        newChs = newChs.filter((val, i, list) => {
+          const existingIndex = list.findIndex(value => value === val)
+          return existingIndex === i
+        })
+        dmChannelsRef.current = newChs
+        return newChs
+      })
+      setChannelsData(currentChs => {
+        const newChs = { ...currentChs }
+        newChs[profile.pubKey] = profile
+        return newChs
+      })
+    } catch (error) {
+      console.warn(error)
+    }
+  }, [onChangeChannel])
+
+  // Define starter chat
+  useEffect(() => {
+    // Start dm if a initial chat is provided from props
+    const startDM = async (pubKey) => {
+      const npub = await appData.nostrQueries.hexToNpub(pubKey)
+
+      const defaultProfile = { name: npub } // default profile
+      profilesRef.current[pubKey] = defaultProfile // update ref , to prevent fetch this profile again.
+      // Fetch profile
+      const nostrProfile = await appData.nostrQueries.getProfile(pubKey)
+
+      const profile = nostrProfile || defaultProfile
+      // add public key formats to profile object
+      profile.pubKey = pubKey
+      profile.npub = npub
+      // Update profiles state
+      setProfiles(currentProfiles => {
+        const newProfiles = { ...currentProfiles }
+        newProfiles[pubKey] = profile
+        profilesRef.current = newProfiles
+        return newProfiles
+      })
+      await addPrivateMessage(profile)
+    }
+
+    if (selectedChannel) return
+    if (!startChannelChat) {
+      // Set group chat as initial chat
+      setSelectedChannel(config.chatsId[0])
+      setSelectedChannelIsDm(false)
+    } else if (dmListLoaded) {
+      // Set provided profile as initial chat
+      startDM(startChannelChat)
+    }
+  }, [appData, startChannelChat, dmListLoaded, addPrivateMessage, selectedChannel])
+
  // Handle read messages
  const onMsgRead = useCallback(async (ev) => {
    try {
@@ -102,91 +185,177 @@ function NostrChat (props) {
    }
  }, [appData, onMsgRead])

-  // Handle nostr pool for group channels
+  // Handle SSE subscription for group channels
  useEffect(() => {
    // fetch messages when channel selected and channel metadata are loaded
    if (!selectedChannel || !channelsLoaded || selectedChannelIsDm) return

-    // Load messages for group channel
-    const relays = nostrQueries.relays
-    if (relays.length === 0) {
-      return
-    }
+    // wait for deleted chats
+    if (!deletedChats || !Array.isArray(deletedChats)) 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])
-    pool.on('open', relay => {
-      relay.subscribe('REQ', { limit: 10, kinds: [42], '#e': [selectedChannel] })
-    })
+    // Track if EOSE has been called
+    let eoseCalled = false
+    let eoseTimeoutId = null

-    pool.on('eose', relay => {
-      if (!selectedChannelIsDm) {
-        setLoadedMessages(true)
+    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('event', (relay, subId, ev) => {
-      console.log('post retrieved from ', relay.url, ev.content)
-      onMsgRead(ev)
-    })
+    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 () => {
-      // Close pool on component unmount or selected channel changes
-      console.log('Close existing pool for group channel')
-      pool.close()
+      // 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 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, selectedChannelIsDm, nostrQueries, channelsLoaded])
+  }, [onMsgRead, selectedChannel, selectedChannelIsDm, nostrQueries, channelsLoaded, deletedChats])

-  // Handle nostr pool for dm channels
+  // Handle SSE subscription for dm channels
  useEffect(() => {
    // fetch messages when channel selected and channel metadata are loaded
-    console.log('selectedChannel', selectedChannel)
-    console.log('selectedChannelIsDm', selectedChannelIsDm)

    if (!selectedChannel || !selectedChannelIsDm) return
+
    const { nostrKeyPair } = bchWalletState
    const dmPubKey = selectedChannel
-    console.log('dmPubKey', selectedChannel)

-    // Load messages for group channel
-    const relays = nostrQueries.relays
-    if (relays.length === 0) {
-      return
-    }
+    // 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
+    ]

-    const pool = RelayPool(relays)
+    // Track if EOSE has been called
+    let eoseCalled = false
+    let eoseTimeoutId = null

-    // const pool = RelayPool([config.nostrRelay])
-    pool.on('open', relay => {
-      relay.subscribe('REQ', [
-        { limit: 10, kinds: [4], '#p': [nostrKeyPair.pubHex], authors: [dmPubKey] }, // received messages
-        { limit: 10, kinds: [4], '#p': [dmPubKey], authors: [nostrKeyPair.pubHex] } // sent messages
-      ])
+    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)
+      }
    })

-    pool.on('eose', relay => {
-      if (selectedChannelIsDm) {
+    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)

-    pool.on('event', (relay, subId, ev) => {
-      console.log('post retrieved from ', relay.url, ev.content)
-      // decrpt message
-      if (ev.pubkey === nostrKeyPair.pubHex) {
-        // Sent messages
-        decryptMsg({ ev, pubKey: dmPubKey })
-      } else {
-        // Received messages
-        decryptMsg({ ev, pubKey: ev.pubkey })
-      }
-    })
+    // Capture values for cleanup
+    const subscriptionsRefValue = subscriptionsRef.current
+    const restClientValue = restClient.current

    return () => {
-      // Close pool on component unmount or selected channel changes
-      console.log('Close existing pool for private channel')
-      pool.close()
+      // 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])

@@ -211,6 +380,7 @@ function NostrChat (props) {
      setDmChannels(currentChs => {
        const newChs = [...currentChs]
        newChs.push(profile.pubKey)
+
        dmChannelsRef.current = newChs
        return newChs
      })
@@ -224,48 +394,82 @@ function NostrChat (props) {
    }
  }, [nostrQueries, dmListLoaded])

-  // Keep live NPI04  for new dms
+  // Keep live subscription for new DMs
  useEffect(() => {
    if (!dmListLoaded || !channelsLoaded) return
    const { bchWalletState } = appData
    const { nostrKeyPair } = bchWalletState
-    const relays = nostrQueries.relays

-    const pool = RelayPool(relays)
-    // const pool = RelayPool([config.nostrRelay])
-    pool.on('open', relay => {
-      relay.subscribe('REQ', [
-        { limit: 0, kinds: [4], '#p': [nostrKeyPair.pubHex] } // received messages
-      ])
+    // 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)
+      }
    })

-    pool.on('event', (relay, subId, ev) => {
-      console.log('New message received', ev)
-      handleIncomingDms(ev.pubkey)
-    })
+    subscriptionsRef.current[subId] = subscription
+
+    // Capture values for cleanup
+    const subscriptionsRefValue = subscriptionsRef.current
+    const restClientValue = restClient.current

    return () => {
-      // Close pool on component unmount or selected channel changes
-      console.log('Close existing pool for private channel')
-      pool.close()
+      // 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 appData.nostrQueries.hexToNpub(pubKey)
+        const npub = await nostrQueries.hexToNpub(pubKey)

        const defaultProfile = { name: npub } // default profile
        profilesRef.current[pubKey] = defaultProfile // update ref , to prevent fetch this profile again.
        // Fetch profile
-        const nostrProfile = await appData.nostrQueries.getProfile(pubKey)
+        const nostrProfile = await nostrQueries.getProfile(pubKey)

        const profile = nostrProfile || defaultProfile
        // add public key formats to profile object
@@ -279,13 +483,10 @@ function NostrChat (props) {
          return newProfiles
        })
      }
-      setDmChannels(dms)
-      setDmListLoaded(true)
-      dmChannelsRef.current = dms
    }

-    loadCurrentDms()
-  }, [bchWalletState, appData.nostrQueries])
+    if (!dmListLoaded) loadCurrentDms()
+  }, [appData, dmListLoaded])

  // Load public channels data
  useEffect(() => {
@@ -313,42 +514,9 @@ function NostrChat (props) {
      }
    }

-    // loadMessages()
    loadChData()
  }, [selectedChannel, appData, groupChannels])

-  const addPrivateMessage = async (profile) => {
-    try {
-      const exist = dmChannels.find(val => val === profile.pubKey)
-      setMessages([])
-      setLoadedMessages(false)
-      onChangeChannel(profile.pubKey)
-      if (exist) return
-      setDmChannels(currentChs => {
-        const newChs = [...currentChs]
-        newChs.push(profile.pubKey)
-        dmChannelsRef.current = newChs
-        return newChs
-      })
-      setChannelsData(currentChs => {
-        const newChs = { ...currentChs }
-        newChs[profile.pubKey] = profile
-        return newChs
-      })
-    } catch (error) {
-      console.warn(error)
-    }
-  }
-
-  // Reset states on change channel
-  const onChangeChannel = useCallback((ch) => {
-    if (selectedChannel === ch) return
-    setSelectedChannelIsDm(!!profiles[ch])
-    setMessages([])
-    setLoadedMessages(false)
-    setSelectedChannel(ch)
-  }, [selectedChannel, profiles])
-
  return (
    <>
      <Container fluid className='h-100 p-0 mb-5 '>
@@ -9,11 +9,13 @@ 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, nostrQueries } = 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('')
@@ -57,25 +59,19 @@ function MessageInput (props) {
      const signedEvent = finalizeEvent(eventTemplate, privateKeyBin)
      console.log('signedEvent: ', signedEvent)

-      // Publish the post to each relay.
-      for (let i = 0; i < writeRelays.length; i++) {
-        const relayUrl = writeRelays[i]
+      // Publish the message via REST API (handles broadcasting to multiple relays)
+      try {
+        const result = await restClient.publishEvent(signedEvent)
+        console.log('result: ', result)

-        try {
-          // Connect to a relay.
-          const relay = await Relay.connect(relayUrl)
-          console.log(`connected to ${relay.url}`)
-
-          // Publish the message to the relay.
-          const result = await relay.publish(signedEvent)
-          console.log('result: ', result)
-
-          // Close the connection to the relay.
-          relay.close()
-        } catch (err) {
-          console.warn(`Skipping publishing to ${relayUrl} due to error: ${err}`)
+        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) {
@@ -111,25 +107,19 @@ function MessageInput (props) {
      const signedEvent = finalizeEvent(eventTemplate, privateKeyBin)
      console.log('signedEvent: ', signedEvent)

-      // Publish the post to each relay.
-      for (let i = 0; i < writeRelays.length; i++) {
-        const relayUrl = writeRelays[i]
+      // Publish the message via REST API (handles broadcasting to multiple relays)
+      try {
+        const result = await restClient.publishEvent(signedEvent)
+        console.log('result: ', result)

-        try {
-          // Connect to a relay.
-          const relay = await Relay.connect(relayUrl)
-          console.log(`connected to ${relay.url}`)
-
-          // Publish the message to the relay.
-          const result = await relay.publish(signedEvent)
-          console.log('result: ', result)
-
-          // Close the connection to the relay.
-          relay.close()
-        } catch (err) {
-          console.warn(`Skipping publishing to ${relayUrl} due to error: ${err}`)
+        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) {
@@ -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) => {
@@ -11,14 +11,13 @@
 */

 import React, { useState, useEffect, useCallback } from 'react'
-import { Container, Spinner, Dropdown } from 'react-bootstrap'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { faFilter } from '@fortawesome/free-solid-svg-icons'
+import { Container, Spinner } from 'react-bootstrap'
 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>
-          <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>
+        <FilterDropdown
+          selectedFilter={selectedFilter}
+          setSelectedFilter={setSelectedFilter}
+        />
      </div>

      {!loaded && (
@@ -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
@@ -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
-        currentList.push(['p', creator.pubkey, 'wss://nostr-relay.psfoundation.info', creatorName])
+        // add creator to the list (relay URL in tag is optional, REST API handles relay selection)
+        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
-      const psf = 'wss://nostr-relay.psfoundation.info'
-
-      // Generate a post.
+      // Generate a follow list event.
      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.
-      const relay = await Relay.connect(psf)
-      console.log(`connected to ${relay.url}`)
-
-      // Publish the message to the relay.
-      const result = await relay.publish(signedEvent)
+      // Publish the follow list via REST API (handles broadcasting to multiple relays)
+      const result = await restClient.publishEvent(signedEvent)
      console.log('result: ', result)

-      // Close the connection to the relay.
-      relay.close()
+      if (!result.accepted) {
+        throw new Error(`Failed to publish follow list: ${result.message || 'Unknown error'}`)
+      }
+
      setTimeout(() => {
        setOnFetch(false)
      }, 1000)
@@ -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) => {
-        try {
-          // Sign the post
-          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}`)
+      // Sign the post
+      const signedEvent = finalizeEvent(eventTemplate, privateKeyBin)
+      console.log('signedEvent: ', signedEvent)

-          // Publish the message to the relay.
-          const result = await relay.publish(signedEvent)
-          console.log('result: ', result)
+      // Publish the like via REST API (handles broadcasting to multiple relays)
+      try {
+        const result = await restClient.publishEvent(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}`)
+        if (!result.accepted) {
+          throw new Error(`Failed to publish like: ${result.message || 'Unknown error'}`)
        }
-      })
+      } catch (err) {
+        console.warn(`Error publishing like: ${err}`)
+        throw err
+      }

      await handleLikes(post, nostrKeyPair.pubHex)
      setLikesFetched(true)
@@ -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.
-      writeRelays.map(async (relayUrl) => {
-        try {
-          // Connect to a relay.
-          const relay = await Relay.connect(relayUrl)
-          console.log(`connected to ${relay.url}`)
+      // Publish the profile via REST API (handles broadcasting to multiple relays)
+      const result = await restClient.publishEvent(signedEvent)
+      console.log('result: ', result)

-          // Publish the message to the relay.
-          const result = await relay.publish(signedEvent)
-          console.log('result: ', result)
-
-          // Close the connection to the relay.
-          relay.close()
-        } catch (err) {
-          console.warn(`Skipping publishing to ${relayUrl} due to error: ${err}`)
-        }
-      })
+      if (!result.accepted) {
+        throw new Error(`Failed to publish profile: ${result.message || 'Unknown error'}`)
+      }

      setSuccessMsg('Post successfully published!')
      setOnFetch(false)
@@ -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.
-      writeRelays.map(async (relayUrl) => {
-        try {
-          // Connect to a relay.
-          const relay = await Relay.connect(relayUrl)
-          console.log(`connected to ${relay.url}`)
+      // Publish the post via REST API (handles broadcasting to multiple relays)
+      const result = await restClient.publishEvent(signedEvent)
+      console.log('result: ', result)

-          // Publish the message to the relay.
-          const result = await relay.publish(signedEvent)
-          console.log('result: ', result)
-
-          // Close the connection to the relay.
-          relay.close()
-        } catch (err) {
-          console.warn(`Skipping publishing to ${relayUrl} due to error: ${err}`)
-        }
-      })
+      if (!result.accepted) {
+        throw new Error(`Failed to publish post: ${result.message || 'Unknown error'}`)
+      }

      resetForm()
      setSuccessMsg('Post successfully published!')
@@ -3,24 +3,56 @@ Component for read nostr information.
 */

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

 function NFTForSale (props) {
-  const { appData, npub } = props
+  const { appData, profileAddresses } = props

  const [offers, setOffers] = useState([])
  const [offersAreLoaded, setOffersAreLoaded] = useState(false)
@@ -16,16 +16,8 @@ function NFTForSale (props) {
  const [dataAreLoaded, setDataAreLoaded] = useState(false)
  const [startAsync, setStartAsync] = useState(false)

-  const getAddressByNpub = useCallback(async () => {
-    const url = `${config.dexServer}/sm/npub/${npub}`
-    const response = await axios.get(url)
-    const addr = response.data.bchAddr
-    return addr
-  }, [npub])
-
  // Handler for refresh button
  const handleRefresh = () => {
-    console.log('handle refresh')
    loadNftOffers()
  }

@@ -52,8 +44,10 @@ function NFTForSale (props) {
  const getNftOffers = useCallback(async (page = 0) => {
    try {
      setOffersAreLoaded(false)
-      const addr = await getAddressByNpub(npub)
-      const url = `${config.dexServer}/offer/list/addr/${addr}`
+      const { bchAddr } = profileAddresses
+      if (!bchAddr) return
+
+      const url = `${config.dexServer}/offer/list/addr/${bchAddr}`
      const result = await axios.get(url)
      const rawOffers = result.data
      console.log('rawOffers: ', rawOffers)
@@ -74,7 +68,7 @@ function NFTForSale (props) {
      setOffersAreLoaded(true)
      throw err
    }
-  }, [processTokenData, getAddressByNpub, npub])
+  }, [processTokenData, profileAddresses])

  //  This function loads the token data .
  const lazyLoadTokenData = useCallback(async (tokens) => {
@@ -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(() => {
@@ -10,22 +10,25 @@ import CopyOnClick from '../../bch-wallet/copy-on-click.js'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faUser, faGlobe } from '@fortawesome/free-solid-svg-icons'
 import * as nip19 from 'nostr-tools/nip19'
+import { useNavigate } from 'react-router-dom'

 // Local libraries
 import NostrFormat from '../nostr-format'

 function ProfileRead (props) {
-  const { npub, appData } = props
-  const { onProfileRead } = props
+  const { npub, appData, onProfileRead, profileAddresses } = props
  const [profile, setProfile] = useState({})
+  const [pubKey, setPubKey] = useState({})
+
  const [loaded, setLoaded] = useState(false)
  const [imageError, setImageError] = useState({ picture: false, banner: false })
+  const navigate = useNavigate()

  useEffect(() => {
    const start = async () => {
      const pubHexData = nip19.decode(npub)
      const pubHex = pubHexData.data
-
+      setPubKey(pubHex)
      const profile = await appData.nostrQueries.getProfile(pubHex)
      if (profile) {
        onProfileRead(profile)
@@ -48,6 +51,13 @@ function ProfileRead (props) {
    setImageError(prev => ({ ...prev, [type]: false }))
  }

+  const handleMessage = () => {
+    console.log('appData', appData)
+    const { setStartChannelChat } = appData
+    setStartChannelChat(pubKey)
+    navigate('/nostr-chat')
+  }
+
  return (
    <Container>
      {/* Banner Section */}
@@ -107,6 +117,32 @@ function ProfileRead (props) {
            </span>
            <CopyOnClick walletProp='npub' appData={props.appData} value={npub} />
          </div>
+          {profileAddresses?.bchAddr && (
+            <div className='text-muted small mb-3 d-flex align-items-center flex-column flex-md-row'>
+              <span className='text-truncate me-2 mb-2 mb-md-0'>
+                <span className='d-md-none'>
+                  {`${profileAddresses?.bchAddr?.slice(0, 8)}...${profileAddresses?.bchAddr?.slice(-5)}`}
+                </span>
+                <span className='d-none d-md-inline'>
+                  {profileAddresses?.bchAddr}
+                </span>
+              </span>
+              <CopyOnClick walletProp='bchAddr' appData={props.appData} value={profileAddresses?.bchAddr} />
+            </div>
+          )}
+          {profileAddresses?.slpAddr && (
+            <div className='text-muted small mb-3 d-flex align-items-center flex-column flex-md-row'>
+              <span className='text-truncate me-2 mb-2 mb-md-0'>
+                <span className='d-md-none'>
+                  {`${profileAddresses?.slpAddr?.slice(0, 8)}...${profileAddresses?.slpAddr?.slice(-5)}`}
+                </span>
+                <span className='d-none d-md-inline'>
+                  {profileAddresses?.slpAddr}
+                </span>
+              </span>
+              <CopyOnClick walletProp='slpAddr' appData={props.appData} value={profileAddresses?.slpAddr} />
+            </div>
+          )}

          {/* About Section */}
          {profile.about && (
@@ -146,6 +182,8 @@ function ProfileRead (props) {
            variant='primary'
            className='px-3 px-md-4 py-2 rounded-pill fw-semibold'
            style={{ minWidth: '120px' }}
+            onClick={handleMessage}
+            disabled={!loaded}
          >
            <i className='bi bi-chat-dots me-2' />
            Message
@@ -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({
@@ -14,8 +14,8 @@ function SignMessage (props) {

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

@@ -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()
-    setAppData(newAppData)
+    await refreshTokenButtonRef.current.handleRefreshTokenBalance()
  }

  // 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()
-  }, [lazyLoadTokenIcons])
+    if (slpInitLoaded) {
+      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' }}>
-            {
-              !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>
-              )
-            }
+          {appData.asyncInitSucceeded && (
+            <Col xs={12} style={{ display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
+              {/** Show spinner info if tokens are loaded but data is not loaded */
+             !backgroundDataLoaded && !backgroundDataError && (
+               <div style={{ borderRadius: '10px', backgroundColor: '#f0f0f0', padding: '10px', display: 'flex', justifyContent: 'center', alignItems: 'center', width: 'fit-content' }}>
+                 <span style={{ marginRight: '10px' }}>Loading Tokens </span>
+                 <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>
    </>
@@ -6,8 +6,8 @@
 */

 // Global npm libraries
-import React, { useState } from 'react'
-import { Button, Modal, Container, Row, Col } from 'react-bootstrap'
+import React, { useState, useEffect } from 'react'
+import { Button, Modal, Container, Row, Col, Spinner } from 'react-bootstrap'

 // Takes a string as input. If it matches a pattern for a link, a JSX object is
 // returned with a link. Otherwise the original string is returned.
@@ -29,6 +29,7 @@ function linkIfUrl (url) {

 function InfoButton (props) {
  const [show, setShow] = useState(false)
+  const [mutableDataCid, setMutableDataCid] = useState(null)

  const handleClose = () => {
    setShow(false)
@@ -45,6 +46,33 @@ function InfoButton (props) {

  // console.log('props.token: ', props.token)

+  // Get Cid from url
+  const parseCid = (url) => {
+    // get the cid from the url format 'ipfs://bafybeicem27xbzs65uvbcgykcmscsgln3lmhbfrcoec3gdttkdgtxv5acq
+    if (url && url.includes('ipfs://')) {
+      const cid = url.split('ipfs://')[1]
+      return cid
+    }
+    return url
+  }
+  // Get token user data if it exists and verify if it contains media or markdown
+  useEffect(() => {
+    try {
+      console.log('props  token', props.token)
+      const userDataStr = props.token.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 />
@@ -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>

@@ -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>
                  )
@@ -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
@@ -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
      }
    </>
@@ -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',
@@ -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
-  const nostrQueriesRef = useRef(new NostrQueries({ relays: readRelays }))
+  // Nostr queries service (REST API handles relays server-side, pass empty array for compatibility)
+  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
  }
 }

@@ -15,6 +15,10 @@ import { bytesToHex } from '@noble/hashes/utils' // already an installed depende
 import { getPublicKey } from 'nostr-tools/pure'
 import * as nip19 from 'nostr-tools/nip19'

+import config from '../config'
+
+const SERVER = `${config.dexServer}/`
+
 class AsyncLoad {
  constructor () {
    this.BchWallet = false
@@ -90,6 +94,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 +134,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 +337,74 @@ 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
+    }
+  }
+
+  // Get the counter offers for a given address
+  async getCounterOffersByAddress (addr) {
+    try {
+      const options = {
+        method: 'GET',
+        url: `${SERVER}offer/list/counter-offer/${addr}`
+      }
+      const result = await axios.request(options)
+      return result.data
+    } catch (error) {
+      console.error('Error getting counter offers by address', error)
+      throw error
+    }
+  }
 }

 function sleep (ms) {
@@ -1,22 +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) {
@@ -29,160 +54,50 @@ export default class NostrQueries {
    return nip19.npubEncode(hex)
  }

-  // Load profile from nostr relays
-  // 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.
+  // Load profile from nostr relays via REST API
  async getProfile (pubHex) {
    try {
-      if (this.relays.length === 0) {
-        return false
-      }
      const existingProfile = this.loadedProfiles[pubHex]
      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] })
-          })
+      const subId = generateSubId('profile')
+      const filter = { limit: 5, kinds: [0], authors: [pubHex] }

-          pool.on('eose', relay => {
-            relay.close()
-            resolve(false)
-          })
+      const events = await this.restClient.queryEvents(subId, filter)

-          pool.on('event', (relay, subId, ev) => {
-            try {
-              const profile = JSON.parse(ev.content)
-              // console.log('profile', profile)
-              console.log(`Profile found  for ${pubHex} at ${relay.url}`)
-              resolve(profile)
-            } catch (error) {
-              resolve(false)
-            }
-            relay.close()
-          })
-          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) {
-          this.loadedProfiles[pubHex] = profile // Store profile
+      // Find the most recent profile event (kind 0 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 profileEvent = events[0]
+        try {
+          const profile = JSON.parse(profileEvent.content)
+          console.log(`Profile found for ${pubHex}`)
+          this.loadedProfiles[pubHex] = 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) {
-        return []
-      }
-      let feeds = await new Promise((resolve) => {
-        let list = []
-        const closedRelays = []
+      const subId = generateSubId('user-feeds')
+      const filter = { limit: 5, kinds: [1], authors: [pubHex] }

-        const pool = RelayPool(this.relays)
-
-        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)
-          }
-        })
-      })
+      let feeds = await this.restClient.queryEvents(subId, filter)

      // Remove duplicated feeds
      feeds = feeds.filter((val, i, list) => {
@@ -193,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)
-    }
-  }
-
-  // Get follow list by pubkey
-  async getFollowList (pubHex) {
-    if (this.relays.length === 0) {
+      console.warn(`Error fetching user feeds for ${pubHex}:`, error)
      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) {
-        return []
-      }
-      let likesRes = await new Promise((resolve) => {
-        const likes = []
-        const closedRelays = []
+      const subId = generateSubId('post-likes')
+      const filter = { kinds: [7], '#e': [postId] }

-        const pool = RelayPool(this.relays)
-        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)
-          }
-        })
-      })
+      let likesRes = await this.restClient.queryEvents(subId, filter)

      // 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 === '+'
@@ -307,129 +191,91 @@ 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) {
-        return false
-      }
      const existingChInfo = this.loadedChannelsInfo[channelId]
      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 => {
-            relay.close()
-            resolve(false)
-          })
+      const subId = generateSubId('channel-info')
+      const filter = { limit: 1, kinds: [41], '#e': [channelId] }

-          pool.on('event', (relay, subId, ev) => {
-            try {
-              const chInfo = JSON.parse(ev.content)
-              resolve(chInfo)
-            } catch (error) {
-              resolve(false)
-            }
-            relay.close()
-          })
-          pool.on('error', (relay) => {
-            relay.close()
-            resolve(false)
-          })
-        })
-        // Stop looking for profile if found
-        if (info) {
-          this.loadedChannelsInfo[channelId] = info
-          return info
+      const events = await this.restClient.queryEvents(subId, filter)
+
+      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 channelEvent = events[0]
+        try {
+          const chInfo = JSON.parse(channelEvent.content)
+          this.loadedChannelsInfo[channelId] = chInfo
+          return chInfo
+        } catch (error) {
+          console.warn(`Error parsing channel info for ${channelId}:`, error)
+          return false
        }
      }
+
+      return false
    } catch (error) {
-      console.warn(error)
+      console.warn(`Error fetching channel info for ${channelId}:`, error)
+      return false
    }
  }

-  // Get associated pub keys from kind 04 inbox
+  // Get associated pub keys from kind 04 inbox via REST API
  async getDms (pubKey) {
    try {
-      if (this.relays.length === 0) {
-        return []
+      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)
+        }
      }

-      let dms = 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: 100, kinds: [4], '#p': [pubKey] }, // received messages
-            { limit: 100, kinds: [4], authors: [pubKey] } // sent messages
-          ])
-        })
-
-        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)
-          if (ev.pubkey === pubKey) {
-            const pk = ev.tags[0][1]
-            list = [...list, pk]
-          } else {
-            list = [...list, ev.pubkey]
-          }
-        })
-        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
-      dms = dms.filter((val, i, list) => {
+      // 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)
+      console.warn(`Error fetching DMs for ${pubKey}:`, error)
+      return []
    }
  }

@@ -459,4 +305,74 @@ export default class NostrQueries {
      throw error
    }
  }
+
+  async getBlackList () {
+    try {
+      if (this.blackListFetched) return
+      const opts = {
+        method: 'GET',
+        url: 'https://blacklists.psfoundation.info/nostr-chat-blacklist.json',
+        headers: {
+          'Content-Type': 'application/json'
+        }
+      }
+
+      const result = await axios.request(opts)
+      const { data } = result
+      const { npubs } = data
+
+      // // Dev test mock npub for testing purposes
+      // const myNpubMock = 'npub1y3xq402pu9aqms3khetnt5gzm54t63pzcla56wwfmwshde0ws77qkff5gc'
+      // npubs.push(myNpubMock)
+      // //
+
+      this.blackListFetched = true
+      for (let i = 0; i < npubs.length; i++) {
+        const npub = npubs[i]
+        const pubKey = this.npubToHex(npub)
+        this.blackList.push(pubKey)
+      }
+      console.log('BlackList ', this.blackList)
+
+      return data
+    } catch (error) {
+      console.log('Error on getBlackList()')
+      throw error
+    }
+  }
+
+  // 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
+    }
+  }
 }
@@ -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
@@ -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.
-      const relay = await Relay.connect(relayWs, {
-        /* global WebSocket */
-        webSocket: WebSocket
-      })
-      // console.log(`connected to ${relay.url}`)
+      // Publish the message via REST API
+      const result = await this.restClient.publishEvent(signedEvent)

-      // Publish the message to the relay.
-      await relay.publish(signedEvent)
-
-      // Close the connection to the relay.
-      relay.close()
+      if (!result.accepted) {
+        throw new Error(`Failed to publish event: ${result.message || 'Unknown error'}`)
+      }

      // const eventId = await this.bchNostr.post.uploadToNostr(inObj)
Author	SHA1	Message	Date
Chris Troutner	d31a7f5e73	Merge pull request #82 from Permissionless-Software-Foundation/dh-ctr-offr-page feat(offers): Created Counter Offers page	2025-11-25 19:01:13 -08:00
Daniel Gonzalez	b973f7101a	feat(offers): Created Counter Offers page	2025-11-25 20:56:03 -04:00
Chris Troutner	313df177e9	Merge pull request #80 from Permissionless-Software-Foundation/ct-unstable Dependency Overrides	2025-11-20 05:48:03 -08:00
Chris Troutner	2c34ea5c2e	fixing merge conflicts	2025-11-20 05:29:59 -08:00
Chris Troutner	aa2d92bfaf	Merge pull request #79 from Permissionless-Software-Foundation/dh-counter-offer-data feat(offer): Added more Counter Offer data	2025-11-20 05:28:08 -08:00
Chris Troutner	e9e9982de0	Updated package-lock	2025-11-19 19:10:26 -08:00
Chris Troutner	5a3010ffce	fix(deps): Fixing dependency conflicts	2025-11-19 19:05:04 -08:00
Daniel Gonzalez	40467014f0	feat(offer): Added more Counter Offer data	2025-11-19 21:30:41 -04:00
Chris Troutner	d94b3fc853	Merge pull request #78 from Permissionless-Software-Foundation/dh-counter-offers-page feat():Counter Offers Page: Set up test environment	2025-11-17 17:24:31 -08:00
Daniel Gonzalez	51ed5601fa	feat():Counter Offers Page: Set up test environment	2025-11-17 18:00:52 -04:00
Chris Troutner	d72d98a2d7	Merge pull request #77 from Permissionless-Software-Foundation/ct-unstable fix(nft card): Seller link only works if npub is defined	2025-11-14 11:15:37 -08:00
Chris Troutner	7237cb6c6a	fix(nft card): Seller link only works if npub is defined	2025-11-14 11:14:55 -08:00
Chris Troutner	93c8eb42d3	Merge pull request #76 from Permissionless-Software-Foundation/dh-seller-link feat(sell): Added link to Seller profile	2025-11-14 08:43:01 -08:00
Daniel Gonzalez	fa3c71f0a1	feat(sell): Added link to Seller profile	2025-11-13 17:07:41 -04:00
Chris Troutner	34a6adbf56	Merge pull request #75 from Permissionless-Software-Foundation/nostr-api Nostr: Switching from websockets to API	2025-11-05 09:39:59 -08:00
Chris Troutner	f303b95741	fix(nostr): Better subscript management and preventing race conditions	2025-11-05 09:38:06 -08:00
Chris Troutner	55054b4e51	Fixing merge conflicts	2025-11-05 07:44:43 -08:00
Chris Troutner	9f7b11fbc4	Merge pull request #74 from Permissionless-Software-Foundation/dh-filter-posts feat(nostr): Filter out posts from deletedPosts database	2025-11-05 07:32:44 -08:00
Chris Troutner	cffeb76603	feat(Nostr): Switching to use of API from websockets	2025-11-05 07:31:54 -08:00
Daniel Gonzalez	9f6c0d3fc7	feat(nostr): Filter out posts from deletedPosts database	2025-11-04 19:39:01 -04:00
Daniel Gonzalez	dfb0bca2ec	moved deleted chats requests from async load to nostr queries	2025-11-04 19:31:21 -04:00
Chris Troutner	efdfb7971b	Merge pull request #73 from Permissionless-Software-Foundation/dh-filter-chats feat(chat): Filter out chat messages from deletedChat database	2025-11-04 08:48:22 -08:00
Daniel Gonzalez	8c59bdf6d8	feat(chat): Filter out chat messages from deletedChat database	2025-11-03 15:12:46 -04:00
Chris Troutner	143def9164	Merge pull request #72 from Permissionless-Software-Foundation/dh-update-btn feat(update): Added update button	2025-10-25 11:23:40 -07:00
Daniel Gonzalez	b58309d82a	feat(update): Added update button	2025-10-24 19:59:48 -04:00
Chris Troutner	61a5ad7166	Merge pull request #71 from Permissionless-Software-Foundation/dh-load-nft-db feat(nft): Load NFT card from bch-dex DB	2025-10-21 12:57:18 -07:00
Daniel Gonzalez	3b1b6248ab	feat(nft): Load NFT card from bch-dex DB	2025-10-20 18:38:58 -04:00
Chris Troutner	cd44f28f28	Merge pull request #70 from Permissionless-Software-Foundation/ct-unstable Syncing with upstream bch-wallet-web-spa	2025-10-19 14:55:23 -07:00
Chris Troutner	5d7994cefe	Syncing with upstream bch-wallet-web-spa	2025-10-19 14:53:01 -07:00
Chris Troutner	ae4916e8df	Merge pull request #18 from Permissionless-Software-Foundation/ct-unstable Ct unstable	2025-10-19 14:48:30 -07:00
Chris Troutner	fe108caf33	Merge branch 'master' into ct-unstable	2025-10-19 14:47:09 -07:00
Chris Troutner	131a41fcb4	Merge pull request #17 from Permissionless-Software-Foundation/dh-down-servers fix(server): Web Wallet needs to handle down servers	2025-10-19 14:41:43 -07:00
Daniel Gonzalez	f25ac56cdb	fix(server): Web Wallet needs to handle down servers	2025-10-18 15:46:29 -04:00
Chris Troutner	0fb8bc586b	Merge pull request #69 from Permissionless-Software-Foundation/ct-unstable fix(category): Using Misc as default category	2025-10-14 07:47:39 -07:00
Chris Troutner	4f8a6540e5	fix(category): Using Misc as default category	2025-10-14 07:46:21 -07:00
Chris Troutner	b29ff5fb1f	Merge branch 'master' into ct-unstable	2025-10-14 07:17:47 -07:00
Chris Troutner	9e576cbe83	Merge pull request #16 from Permissionless-Software-Foundation/dh-load-times fix(load): Load BCH & SLP info in the background	2025-10-14 07:13:20 -07:00
Daniel Gonzalez	e3b3b76430	fix(load): Load BCH & SLP info in the background	2025-10-13 17:34:50 -04:00
Chris Troutner	f8f46fcad8	Merge pull request #68 from Permissionless-Software-Foundation/dh-categories-ui feat(NFTs): Added categories dropdown to nfts page	2025-10-12 16:42:04 -07:00
Daniel Gonzalez	8c00d5d079	feat(NFTs): Added categories dropdown to nfts page	2025-10-11 18:00:43 -04:00
Chris Troutner	4e665cd738	Merge pull request #67 from Permissionless-Software-Foundation/dh-pagination feat(NFTs): Added pagination controls for NFTs	2025-10-09 07:22:05 -07:00
Daniel Gonzalez	af3dca0445	feat(NFTs): Added pagination controls for NFTs	2025-10-08 20:21:55 -04:00
Chris Troutner	e1d1cee1f1	Merge pull request #66 from Permissionless-Software-Foundation/upstream-merge Upstream merge	2025-10-03 06:18:46 -07:00
Daniel Gonzalez	6d763be032	Fixed merge conflicts	2025-10-02 15:44:26 -04:00
Chris Troutner	dc6e6d956c	Merge branch 'master' into ct-unstable	2025-09-20 09:37:13 -07:00
Chris Troutner	612f2edf70	Merge pull request #15 from Permissionless-Software-Foundation/dh-user-data feat(userdata): Added user data page functionality	2025-09-20 07:24:23 -07:00
Daniel Gonzalez	408dc0d418	feat(userdata): Added user data page functionality	2025-09-19 15:31:12 -04:00
Chris Troutner	9b6e080b02	Merge pull request #65 from Permissionless-Software-Foundation/dh-user-addrs feat(profile): listing BCH and SLP addresses on user profile	2025-09-18 06:54:08 -07:00
Daniel Gonzalez	404f230cce	feat(profile): listing BCH and SLP addresses on user profile	2025-09-17 18:19:54 -04:00
Chris Troutner	a81eee2dda	Merge pull request #64 from Permissionless-Software-Foundation/dh-user-data-style fix(userdata): Fixed markdown text styling on user data page	2025-09-16 15:33:49 -07:00
Daniel Gonzalez	1ffba5c210	fix(userdata): Fixed markdown text styling on user data page	2025-09-16 16:18:59 -04:00
Chris Troutner	d30e9d6bfd	Merge pull request #63 from Permissionless-Software-Foundation/dh-blacklist feat(nostr): Removed entries from authors on the npub blacklist	2025-09-10 05:36:52 -07:00
Daniel Gonzalez	ed56fe9e38	feat(nostr): Removed entries from authors on the npub blacklist	2025-09-09 18:27:27 -04:00
Chris Troutner	fa623aa4eb	Merge pull request #62 from Permissionless-Software-Foundation/dh-profile-dm feat(nostr): Added functionality to message button in profile	2025-09-09 07:13:06 -07:00
Daniel Gonzalez	96f874f93d	feat(nostr): Added functionality to message button in profile	2025-09-08 13:07:48 -04:00
Chris Troutner	360be9f875	Adding LLM file	2025-06-19 17:22:28 -07:00