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

fix(Nostr DM): Trying to fix reliability  issues with Nostr DMs

.env.development

@@ -0,0 +1,5 @@
+# Development environment variables
+# These are automatically loaded when running 'npm start'
+
+REACT_APP_DEX_SERVER=http://localhost:5700
+REACT_APP_NOSTR_REST_API_URL=http://localhost:5942

.env.production

@@ -0,0 +1,5 @@
+# Production environment variables
+# These are automatically loaded when running 'npm run build'
+
+REACT_APP_DEX_SERVER=https://dex-api.fullstackcash.net
+REACT_APP_NOSTR_REST_API_URL=https://nostr-relay-api.fullstackcash.net

dev-docs/README.md

@@ -1,6 +1,10 @@
 # Developer Docs
 
-This file contains notes taken during software development. These notes may eventually be edited into informaiton that goes into the top-level README, or other documentation.
+This file contains notes taken during software development. These notes may eventually be edited into information that goes into the top-level README, or other documentation.
+
+## Change notes
+
+- [reliable-nostr-dms.md](./reliable-nostr-dms.md) — Why nostr-chat DMs failed to load, and the frontend changes for short subscription IDs, GET history, and chat reliability.
 
 ## Main Features of this App
 

dev-docs/reliable-nostr-dms.md

@@ -0,0 +1,76 @@
+# Reliable Nostr DMs (Frontend)
+
+## Problem
+
+On the nostr-chat page, the DM sidebar could list conversations (kind-4 history existed on relays), but opening a conversation often showed **no messages**. Sending a DM also often failed to appear in the UI until a full refresh — and sometimes not even then.
+
+Logs from the REST2NOSTR proxy showed:
+
+- `GET /req/dms-…` returning multiple kind-4 events (inbox listing worked)
+- `POST /req/dm-{64-char-pubkey}-…` SSE subscriptions finishing immediately after relay `NOTICE` / close (conversation load failed)
+
+The channel-info URL (`kinds:[41]`) is **not** the DM fetch path; it only loads NIP-28 group channel metadata.
+
+## Root cause
+
+[NIP-01](https://nips.nostr.com/1) requires subscription IDs to be at most **64 characters**.
+
+The chat page built SSE subscription IDs like:
+
+```text
+dm-{64-char-peer-pubkey}-{timestamp}-{random}
+```
+
+That alone is already ~90 characters. The same pattern was used for group chat (`group-{channelId}-…`). Relays reject overlong `REQ` subscription IDs, so the SSE stream ended with no events.
+
+Other Nostr pages (`profile`, `user-feeds`, `global-feeds`, likes, follow list) already used short prefixes and were unaffected.
+
+Additionally:
+
+- Conversation history depended entirely on SSE `onEvent` (no GET bootstrap).
+- `selectedChannelIsDm` was inferred from `profiles[ch]`, so opening a DM before the profile finished loading could skip the DM subscription path.
+- Outbound messages were not shown until an SSE echo arrived.
+
+## Changes
+
+### Short opaque subscription IDs
+
+[`src/services/nostr-rest-client.js`](../src/services/nostr-rest-client.js) — `generateSubId(prefix)`:
+
+- Accepts a short semantic prefix (`dm`, `group`, `dm-notify`, `profile`, …).
+- Produces `{prefix}-{timestampBase36}-{random}` capped under a client-safe length.
+- Strips accidental embedded 64-char hex (pubkey / event id) if a caller still embeds one.
+
+Chat call sites now use `generateSubId('dm')` and `generateSubId('group')` instead of embedding hex IDs.
+
+### GET history + live-only SSE
+
+[`src/services/nostr-queries.js`](../src/services/nostr-queries.js):
+
+- `getDmMessages(myPub, peerPub)` — kind-4 conversation history via GET `/req`
+- `getChannelMessages(channelId)` — kind-42 group history via GET `/req`
+
+[`src/components/app-body/nostr-chat/index.js`](../src/components/app-body/nostr-chat/index.js):
+
+1. On channel select, load history with those helpers.
+2. Decrypt / render, then set `loadedMessages`.
+3. Open SSE with `limit: 0` (and `since` when history exists) for live updates only.
+
+### Chat reliability polish
+
+- DM vs group detection uses known DM / group channel membership (not only loaded profiles).
+- After a successful publish, the outbound message is shown immediately via `onMsgRead` (optimistic UI).
+- Subscription cleanup uses a single `subscription.close()` path (avoids double DELETE / abort noise).
+
+## Side effects
+
+| Area | Impact |
+|---|---|
+| Feeds / profile / likes / follow | Unchanged (already short sub-ids; still GET queries) |
+| Publish (`/event`) | Unchanged |
+| Group chat | Same reliability/efficiency pattern as DMs |
+| REST contract | Unchanged paths and response shapes |
+
+## Related
+
+- REST2NOSTR companion doc: `nostr/REST2NOSTR/dev-docs/reliable-subscription-ids.md`

package.json

@@ -7,9 +7,9 @@
     "@fortawesome/free-regular-svg-icons": "6.7.2",
     "@fortawesome/free-solid-svg-icons": "6.7.2",
     "@fortawesome/react-fontawesome": "0.2.2",
-    "@noble/hashes": "^1.8.0",
+    "@noble/hashes": "1.8.0",
     "axios": "0.27.2",
-    "bch-dex-lib": "2.0.3",
+    "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": [
       {

src/App.css

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

src/App.js

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

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

@@ -3,18 +3,39 @@
 */
 
 // Global npm libraries
-import React from 'react'
-import { 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>
     </>

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

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

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

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

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

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

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

@@ -6,6 +6,7 @@
 // Global npm libraries
 import React from 'react'
 import ServerSelectView from './select-server-view'
+import RelaySelectionView from './relay-selection-view'
 
 function ConfigurationView (props) {
   const { appData } = props
@@ -13,6 +14,7 @@ function ConfigurationView (props) {
   return (
     <>
       <ServerSelectView appData={appData} />
+      <RelaySelectionView appData={appData} />
     </>
   )
 }

src/components/app-body/configuration/relay-selection-view.js

@@ -0,0 +1,333 @@
+/*
+  This component is a View that allows the user to manage Nostr relay settings.
+*/
+
+// Global npm libraries
+import React, { useState } from 'react'
+import { Row, Col, Form, Card, Button } from 'react-bootstrap'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faShareAlt, faTrashAlt } from '@fortawesome/free-solid-svg-icons'
+function RelaySelectionView (props) {
+  const { appData } = props
+  const { relaysData, updateRelaysData, restoreRelaysData } = appData
+  console.log('relaysData', relaysData)
+
+  const [newRelayAddress, setNewRelayAddress] = useState('')
+
+  const addRelay = (newRelay) => {
+    const exist = relaysData.find(relay => relay.address === newRelay)
+    if (!exist) {
+      relaysData.push({ address: newRelay, read: true, write: true })
+      updateRelaysData(relaysData)
+    }
+  }
+  // Delete relay from relaysData array
+  const deleteRelay = (relayToDelete) => {
+    const index = relaysData.findIndex(relay => relay.address === relayToDelete.address)
+    if (index !== -1) {
+      relaysData.splice(index, 1)
+      updateRelaysData(relaysData)
+    }
+  }
+  const handleReadToggle = (relayToToggleRead) => {
+    const index = relaysData.findIndex(relay => relay.address === relayToToggleRead.address)
+    if (index !== -1) {
+      relaysData[index].read = !relaysData[index].read
+      updateRelaysData(relaysData)
+    }
+  }
+  const handleWriteToggle = (relayToToggleWrite) => {
+    const index = relaysData.findIndex(relay => relay.address === relayToToggleWrite.address)
+    if (index !== -1) {
+      relaysData[index].write = !relaysData[index].write
+      updateRelaysData(relaysData)
+    }
+  }
+  return (
+    <>
+      <Card className='m-3'>
+        <Card.Body>
+          <Row>
+            <Col style={{ textAlign: 'center' }}>
+              <h2>Nostr Relay Configuration</h2>
+              <p>
+                Manage your Nostr relay connections. Configure read and write permissions for each relay.
+              </p>
+            </Col>
+          </Row>
+          <hr />
+
+          <Row className='mb-3'>
+            <Col className='text-end'>
+              <Button
+                onClick={() => restoreRelaysData()}
+                variant='outline-secondary'
+                style={{ minWidth: '120px' }}
+              >
+                Restore defaults
+              </Button>
+            </Col>
+          </Row>
+
+          <Row>
+            <Col>
+              <div
+                className='relay-table-container' style={{
+                  backgroundColor: 'transparent',
+                  borderRadius: '12px',
+                  padding: '20px',
+                  boxShadow: '0 2px 8px rgba(0,0,0,0.1)'
+                }}
+              >
+                <div
+                  className='relay-table-header' style={{
+                    display: 'flex',
+                    justifyContent: 'space-between',
+                    alignItems: 'center',
+                    marginBottom: '20px',
+                    paddingBottom: '15px',
+                    borderBottom: '2px solid #e9ecef'
+                  }}
+                >
+                  <h5 style={{ margin: 0, color: '#495057', fontWeight: '600' }}>Relay Connections</h5>
+                  <span style={{
+                    fontSize: '0.85em',
+                    color: '#6c757d',
+                    backgroundColor: '#e9ecef',
+                    padding: '4px 12px',
+                    borderRadius: '20px'
+                  }}
+                  >
+                    {relaysData.length} relays
+                  </span>
+                </div>
+
+                <div className='relay-list'>
+                  {relaysData.map((relay, index) => (
+                    <div
+                      key={`relay-${index}`} style={{
+                        backgroundColor: 'white',
+                        borderRadius: '8px',
+                        padding: '16px',
+                        marginBottom: '12px',
+                        border: '1px solid #e9ecef',
+                        transition: 'all 0.2s ease',
+                        boxShadow: '0 1px 3px rgba(0,0,0,0.05)'
+                      }}
+                    >
+                      <div style={{
+                        display: 'flex',
+                        justifyContent: 'space-between',
+                        alignItems: 'center',
+                        flexWrap: 'wrap',
+                        gap: '12px'
+                      }}
+                      >
+                        {/* Relay Address */}
+                        <div style={{ flex: '1', minWidth: '200px' }}>
+                          <div style={{
+                            fontFamily: 'monospace',
+                            fontSize: '0.9em',
+                            color: '#495057',
+                            fontWeight: '500',
+                            wordBreak: 'break-all'
+                          }}
+                          >
+                            {relay.address}
+                          </div>
+                        </div>
+
+                        {/* Controls */}
+                        <div style={{
+                          display: 'flex',
+                          alignItems: 'center',
+                          gap: '16px',
+                          flexWrap: 'wrap'
+                        }}
+                        >
+                          {/* Read/Write Toggles */}
+                          <div style={{
+                            display: 'flex',
+                            alignItems: 'center',
+                            gap: '12px',
+                            backgroundColor: '#f8f9fa',
+                            padding: '8px 12px',
+                            borderRadius: '6px',
+                            border: '1px solid #dee2e6'
+                          }}
+                          >
+                            <div style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
+                              <span style={{
+                                fontSize: '0.8em',
+                                color: '#6c757d',
+                                fontWeight: '500',
+                                minWidth: '35px'
+                              }}
+                              >
+                                Read
+                              </span>
+                              <Form.Check
+                                type='switch'
+                                onClick={() => handleReadToggle(relay)}
+                                checked={relay.read}
+                                className='mb-0'
+                                style={{ margin: 0 }}
+                              />
+                            </div>
+                            <div style={{ display: 'flex', alignItems: 'center', gap: '8px' }}>
+                              <span style={{
+                                fontSize: '0.8em',
+                                color: '#6c757d',
+                                fontWeight: '500',
+                                minWidth: '35px'
+                              }}
+                              >
+                                Write
+                              </span>
+                              <Form.Check
+                                type='switch'
+                                onClick={() => handleWriteToggle(relay)}
+                                checked={relay.write}
+                                className='mb-0'
+                                style={{ margin: 0 }}
+                              />
+                            </div>
+                          </div>
+
+                          {/* Action Buttons */}
+                          <div style={{ display: 'flex', gap: '8px' }}>
+                            <Button
+                              variant='outline-primary'
+                              size='sm'
+                              className='d-flex align-items-center gap-1'
+                              style={{
+                                minWidth: '65px',
+                                fontSize: '0.8em',
+                                padding: '4px 8px',
+                                borderWidth: '1px'
+                              }}
+                            >
+                              <FontAwesomeIcon icon={faShareAlt} size='xs' />
+                              Share
+                            </Button>
+                            <Button
+                              onClick={() => deleteRelay(relay)}
+                              variant='outline-danger'
+                              size='sm'
+                              className='d-flex align-items-center gap-1'
+                              style={{
+                                minWidth: '65px',
+                                fontSize: '0.8em',
+                                padding: '4px 8px',
+                                borderWidth: '1px'
+                              }}
+                            >
+                              <FontAwesomeIcon icon={faTrashAlt} size='xs' />
+                              Delete
+                            </Button>
+                          </div>
+                        </div>
+                      </div>
+                    </div>
+                  ))}
+                </div>
+              </div>
+            </Col>
+          </Row>
+
+          <Row className='mt-4'>
+            <Col>
+              <div
+                className='add-relay-container' style={{
+                  backgroundColor: 'white',
+                  borderRadius: '12px',
+                  padding: '20px',
+                  border: '1px solid #e9ecef',
+                  boxShadow: '0 2px 8px rgba(0,0,0,0.1)'
+                }}
+              >
+                <div
+                  className='add-relay-header' style={{
+                    marginBottom: '16px',
+                    paddingBottom: '12px',
+                    borderBottom: '2px solid #e9ecef'
+                  }}
+                >
+                  <h6 style={{
+                    margin: 0,
+                    color: '#495057',
+                    fontWeight: '600',
+                    fontSize: '1rem'
+                  }}
+                  >
+                    Add New Relay
+                  </h6>
+                  <p style={{
+                    margin: '4px 0 0 0',
+                    fontSize: '0.85em',
+                    color: '#6c757d'
+                  }}
+                  >
+                    Enter the URL of a Nostr relay to add it to your configuration
+                  </p>
+                </div>
+
+                <div
+                  className='add-relay-form' style={{
+                    display: 'flex',
+                    gap: '12px',
+                    alignItems: 'end'
+                  }}
+                >
+                  <div style={{ flex: '1' }}>
+                    <Form.Label
+                      htmlFor='newRelayAddress'
+                      style={{
+                        fontSize: '0.9em',
+                        fontWeight: '500',
+                        color: '#495057',
+                        marginBottom: '8px'
+                      }}
+                    >
+                      Relay Address
+                    </Form.Label>
+                    <Form.Control
+                      type='text'
+                      id='newRelayAddress'
+                      placeholder='wss://your-relay-address.com'
+                      value={newRelayAddress}
+                      onChange={(e) => setNewRelayAddress(e.target.value)}
+                      style={{
+                        fontFamily: 'monospace',
+                        fontSize: '0.9em',
+                        border: '1px solid #dee2e6',
+                        borderRadius: '6px',
+                        padding: '10px 12px'
+                      }}
+                    />
+                  </div>
+                  <Button
+                    onClick={() => addRelay(newRelayAddress)}
+                    variant='primary'
+                    style={{
+                      minWidth: '80px',
+                      height: '38px',
+                      borderRadius: '6px',
+                      fontSize: '0.9em',
+                      fontWeight: '500',
+                      padding: '8px 16px'
+                    }}
+                  >
+                    Add
+                  </Button>
+                </div>
+              </div>
+            </Col>
+          </Row>
+        </Card.Body>
+      </Card>
+    </>
+  )
+}
+
+export default RelaySelectionView

src/components/app-body/counter-offers/cancel-counter-offer-btn.js

@@ -0,0 +1,184 @@
+/*
+  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, Row, Col, Spinner } from 'react-bootstrap'
+import Sweeper from 'bch-token-sweep'
+
+function CancelCounterOfferBtn (props) {
+  const [show, setShow] = useState(false)
+  const [statusMsg, setStatusMsg] = useState('')
+  const [hideSpinner, setHideSpinner] = useState(false)
+  const [isProcessing, setIsProcessing] = useState(false)
+  const [showConfirmation, setShowConfirmation] = useState(true) // show the confirmation view
+
+  // Update wallet state function
+  const updateWalletState = async () => {
+    const wallet = props.appData.wallet
+    const bchBalance = await wallet.getBalance({ bchAddress: wallet.walletInfo.cashAddress })
+    await wallet.initialize()
+    const slpTokens = await wallet.listTokens(wallet.walletInfo.cashAddress)
+    props.appData.updateBchWalletState({ walletObj: { bchBalance, slpTokens }, appData: props.appData })
+  }
+
+  // Handle cancel/sweep function
+  const handleCancel = async () => {
+    try {
+      console.log('Canceling Counter Offer')
+
+      // Hide confirmation and show processing
+      setShowConfirmation(false)
+      setHideSpinner(false)
+      setStatusMsg('')
+      setIsProcessing(true)
+
+      // Get the keypair that holds Counter Offer UTXOs.
+      // This uses the same derivation path as used in the counter offers page (index 1)
+      const bchDexLib = props.appData.dexLib
+      const keyPair = await bchDexLib.take.util.getKeyPair(1)
+      const wif = keyPair.wif
+
+      // Get wallet info for sweeping
+      const walletWif = props.appData.wallet.walletInfo.privateKey
+      const toAddr = props.appData.wallet.slpAddress
+
+      // Instance the Sweep library and populate UTXOs from network
+      const sweep = new Sweeper(wif, walletWif, props.appData.wallet)
+      await sweep.populateObjectFromNetwork()
+
+      // Constructing the sweep transaction
+      const hex = await sweep.sweepTo(toAddr)
+      const txid = await props.appData.wallet.ar.sendTx(hex)
+
+      // Generate success status message
+      const newStatusMsg = (
+        <>
+          <p>Sweep succeeded!</p>
+          <p>Counter Offer has been canceled.</p>
+          <p>Transaction ID: {txid}</p>
+          <p>
+            <a href={`https://blockchair.com/bitcoin-cash/transaction/${txid}`} target='_blank' rel='noreferrer'>
+              TX on Blockchair BCH Block Explorer
+            </a>
+          </p>
+          <p>
+            <a href={`https://token.fullstack.cash/transactions/?txid=${txid}`} target='_blank' rel='noreferrer'>
+              TX on token explorer
+            </a>
+          </p>
+        </>
+      )
+
+      setHideSpinner(true)
+      setStatusMsg(newStatusMsg)
+      setIsProcessing(false)
+
+      // Update wallet state to reflect the changes
+      await updateWalletState()
+
+      // Refresh the counter offers list if refreshTokens function is provided
+      if (props.refreshTokens) {
+        // Small delay to ensure blockchain state is updated
+        setTimeout(() => {
+          props.refreshTokens()
+        }, 2000)
+      }
+    } catch (err) {
+      console.error('Error in handleCancel(): ', err)
+      setHideSpinner(true)
+      setIsProcessing(false)
+      setStatusMsg(<b style={{ color: 'red' }}>{`Error: ${err.message}`}</b>)
+    }
+  }
+
+  const handleClose = () => {
+    // Deny close if the cancel is in progress.
+    if (isProcessing) {
+      return
+    }
+
+    setShow(false)
+    setStatusMsg('')
+    setHideSpinner(false)
+    setIsProcessing(false)
+    setShowConfirmation(true) // Reset confirmation state for next time
+  }
+
+  const handleOpen = () => {
+    setShow(true)
+    // Don't start the cancel process immediately - wait for user confirmation
+  }
+
+  return (
+    <>
+      <Button variant='danger' onClick={handleOpen} disabled={isProcessing}>Cancel</Button>
+      <Modal show={show} onHide={handleClose}>
+        <Modal.Header closeButton>
+          <Modal.Title>Cancel Counter Offer</Modal.Title>
+        </Modal.Header>
+        <Modal.Body>
+          {showConfirmation
+            ? (
+              <Container>
+                <Row>
+                  <Col style={{ textAlign: 'center' }}>
+                    <p>Are you sure you want to cancel this Counter Offer?</p>
+                    <p style={{ color: '#666', fontSize: '0.9em' }}>
+                      This action will sweep the Counter Offer UTXOs back to your wallet.
+                    </p>
+                  </Col>
+                </Row>
+              </Container>
+              )
+            : (
+              <Container>
+                <Row>
+                  {!hideSpinner && (
+                    <Col style={{ display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
+                      <span style={{ marginRight: '10px' }}>Canceling Counter Offer...</span>
+                      <Spinner animation='border' />
+                    </Col>
+                  )}
+                </Row>
+                <br />
+                {statusMsg && (
+                  <Row>
+                    <Col style={{ textAlign: 'center' }}>{statusMsg}</Col>
+                  </Row>
+                )}
+              </Container>
+              )}
+        </Modal.Body>
+        <Modal.Footer>
+          {showConfirmation && (
+            <Row style={{ width: '100%' }}>
+              <Col xs={12} className='text-center'>
+                <Button
+                  variant='secondary'
+                  style={{ minWidth: '100px', marginRight: '10px' }}
+                  onClick={handleClose}
+                >
+                  No, Keep Open
+                </Button>
+                <Button
+                  variant='danger'
+                  style={{ minWidth: '100px' }}
+                  onClick={handleCancel}
+                >
+                  Yes, Cancel It
+                </Button>
+              </Col>
+            </Row>
+          )}
+        </Modal.Footer>
+      </Modal>
+    </>
+  )
+}
+
+export default CancelCounterOfferBtn

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

@@ -0,0 +1,90 @@
+/*
+  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, appData, refreshTokens } = 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}
+                    appData={appData}
+                    refreshTokens={refreshTokens}
+                  />
+                </Col>
+
+              </Row>
+            </Container>
+          </Card.Body>
+        </Card>
+      </Col>
+    </>
+  )
+}
+
+export default CounterOfferCard

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

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

src/components/app-body/counter-offers/info-button.js

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

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

@@ -8,7 +8,7 @@ import React, { useState, useEffect, useCallback } from 'react'
 import { Container, Row, Col, Table, Button, Spinner } from 'react-bootstrap'
 import axios from 'axios'
 import { DatatableWrapper, TableBody, TableHeader } from 'react-bs-datatable'
-
+import AsyncLoad from '../../../services/async-load'
 // Local libraries
 import config from '../../../config'
 import WaitingModal from '../../waiting-modal'
@@ -48,7 +48,7 @@ const TABLE_HEADERS = [
   }
 ]
 
-function Offers (props) {
+function Fungible (props) {
   const [appData] = useState(props.appData)
   const [offers, setOffers] = useState([])
 
@@ -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({
@@ -228,4 +237,4 @@ function Offers (props) {
   )
 }
 
-export default Offers
+export default Fungible

src/components/app-body/index.js

@@ -15,20 +15,22 @@ import GetBalance from './balance'
 import Wallet from './bch-wallet'
 import Placeholder2 from './placeholder2'
 import Placeholder3 from './placeholder3'
-// import ServerSelectView from './servers/select-server-view'
+import ServerSelectView from './configuration/select-server-view.js'
 // import SelectServerButton from './servers/select-server-button'
 import NftsForSale from './nfts-for-sale'
 import BchSend from './bch-send'
 import SlpTokens from './slp-tokens'
 import SweepWif from './sweep/index.js'
 import SignMessage from './sign/index.js'
-import ServerSelectView from './configuration/select-server-view'
+import ConfigurationView from './configuration/index.js'
 import NostrPost from './nostr/nostr-post/index.js'
 import Profile from './nostr/profile/index.js'
 import Feeds from './nostr/feeds/index.js'
 import ContentCreators from './nostr/content-creators/index.js'
 import UserDataReview from './user-data-review'
-import Offers from './offers'
+import Fungible from './fungible'
+import NostrChat from './nostr-chat'
+import CounterOffers from './counter-offers'
 function AppBody (props) {
   // Dependency injection through props
   const appData = props.appData
@@ -47,13 +49,15 @@ function AppBody (props) {
         <Route path='/servers' element={<ServerSelectView appData={appData} />} />
         <Route path='/sweep' element={<SweepWif appData={appData} />} />
         <Route path='/sign' element={<SignMessage appData={appData} />} />
-        <Route path='/configuration' element={<ServerSelectView appData={appData} />} />
+        <Route path='/configuration' element={<ConfigurationView appData={appData} />} />
         <Route path='/nostr-post' element={<NostrPost appData={appData} />} />
         <Route path='/profile/:npub' element={<Profile appData={appData} />} />
         <Route path='/feeds' element={<Feeds appData={appData} />} />
         <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='/fungible' element={<Fungible 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 */}
       {/* {appData.currentPath !== '/servers' && <SelectServerButton linkTo='/servers' appData={appData} />} */}

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

@@ -6,10 +6,10 @@
 // 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
-  console.log('props: ', props)
   const [show, setShow] = useState(false) // show the modal
   const [onFetch, setOnFetch] = useState(false) // show the spinner
   const [error, setError] = useState(false) // show the error message
@@ -45,10 +45,19 @@ function BuyButton (props) {
 
       // Generate a counter offer.
       const bchDexLib = appData.dexLib
-      const { offerData, partialHex } = await bchDexLib.take.takeOffer(
+      const { offerData, partialHex, counterOfferUtxo } = await bchDexLib.take.takeOffer(
         targetOffer
       )
 
+      // Get counter offer data
+      const asyncLoad = new AsyncLoad()
+      const { takerAddr, takerNpub, counterOfferAddr } = await asyncLoad.getCounterOfferMetadata(appData)
+
+      offerData.takerAddr = takerAddr
+      offerData.takerNpub = takerNpub
+      offerData.counterOfferAddr = counterOfferAddr
+      offerData.counterOfferUtxo = counterOfferUtxo.txid
+
       progress.push(<p key='progress-msg2'>Uploading counter offer to Nostr...</p>)
       setProgressMsg(progress)
 

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

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

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

@@ -11,7 +11,7 @@
 */
 
 // Global npm libraries
-import React, { useState, useEffect, useCallback } from 'react'
+import React, { useState, useEffect, useCallback, useRef } from 'react'
 import { Container, Row, Col, Button, Spinner } from 'react-bootstrap'
 import axios from 'axios'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
@@ -20,6 +20,7 @@ import { faRedo } from '@fortawesome/free-solid-svg-icons'
 // Local libraries
 import config from '../../../config'
 import TokenCard from './token-card'
+import FilterDropdown from './filter-dropdown'
 
 // Global variables and constants
 const SERVER = config.dexServer
@@ -33,11 +34,26 @@ function NftsForSale (props) {
   const [offersAreLoaded, setOffersAreLoaded] = useState(false)
   const [iconsAreLoaded, setIconsAreLoaded] = useState(false)
   const [dataAreLoaded, setDataAreLoaded] = useState(false)
+  const [currentPage, setCurrentPage] = useState(0)
+  const [lastLoadedPage, setLastLoadedPage] = useState(0)
+  const [totalPages, setTotalPages] = useState(0)
+  const [selectedFilter, setSelectedFilter] = useState('Misc')
 
-  // Handler for refresh button
-  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
@@ -59,21 +75,46 @@ function NftsForSale (props) {
     }
   }, [appData])
 
+  // Function to process token metadata (iconUrl , userData , tokenData).
+  const processOfferMetadata = useCallback(async (offer) => {
+    try {
+      // Token icon
+      if (offer.tokenIconUrl) {
+        offer.icon = offer.tokenIconUrl
+        offer.iconAlreadyDownloaded = true
+        offer.userData = JSON.parse(offer.userDataStr)
+        offer.mutableFromBackend = true
+        offer.mutableDataSource = 'backend'
+      }
+      // tokenData
+      if (offer.tokenData) {
+        offer.tokenDataFromBackend = true
+        offer.tokenDataSource = 'backend'
+      }
+
+      return offer
+    } catch (error) {
+      return offer
+    }
+  }, [])
+
   //  Fetch offers
   const getNftOffers = useCallback(async (page = 0) => {
     try {
       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 +125,7 @@ function NftsForSale (props) {
       setOffersAreLoaded(true)
       throw err
     }
-  }, [processTokenData])
+  }, [processTokenData, processOfferMetadata])
 
   //  This function loads the token data .
   const lazyLoadTokenData = useCallback(async (tokens) => {
@@ -94,8 +135,10 @@ function NftsForSale (props) {
       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
+        // Skip if already has tokenData (from backend or cache)
+        if (thisToken.dataAlreadyDownloaded || thisToken.tokenData) {
+          continue
+        }
 
         // Try to get token data.
         const tokenData = await appData.wallet.getTokenData(thisToken.tokenId)
@@ -103,6 +146,7 @@ function NftsForSale (props) {
         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.tokenDataSource = 'blockchain'
         }
 
         // Mark token to prevent fetch token data again.
@@ -153,6 +197,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 +206,8 @@ 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
+          thisToken.mutableDataSource = 'blockchain'
         }
 
         // Mark token to prevent fetch token icon again.
@@ -177,15 +223,23 @@ function NftsForSale (props) {
   //  Check if token data exists in the cache and add it to the tokens object.
   const reviewNftCachedData = useCallback(async (offers) => {
     const cacheData = appData.nftForSaleCacheData
-    console.log(`Token data from cache: ${JSON.stringify(cacheData, null, 2)}`)
+    // console.log(`Token data from cache: ${JSON.stringify(cacheData, null, 2)}`)
+
     // Map all offers
     for (let i = 0; i < offers.length; i++) {
       const thisToken = offers[i]
+      // console.log(`Review offers:`,thisToken)
+
       const cacheToken = cacheData[thisToken.tokenId]
       // If cache data exists, add it to the token object
-      if (cacheToken) {
-        thisToken.tokenData = cacheToken.tokenData
+      // Only use cache if backend didn't provide the data
+      if (cacheToken && !thisToken.icon) {
         thisToken.icon = cacheToken.tokenIcon
+        thisToken.mutableDataSource = 'cache'
+      }
+      if (cacheToken && !thisToken.tokenData) {
+        thisToken.tokenData = cacheToken.tokenData
+        thisToken.tokenDataSource = 'cache'
       }
     }
   }, [appData])
@@ -195,23 +249,27 @@ function NftsForSale (props) {
     // Map all offers
     for (let i = 0; i < offers.length; i++) {
       const thisToken = offers[i]
-      // save token icon and token data in cache
-      const newTokenCacheData = {
-        tokenIcon: thisToken.icon,
-        tokenData: thisToken.tokenData
-      }
 
-      console.log('newTokenCacheData: ', newTokenCacheData)
+      // Only cache if we fetched it ourselves (not from backend)
+      // Backend data is already "cached" server-side, no need to duplicate
+
+      if (thisToken.tokenDataFromBackend && thisToken.mutableFromBackend) continue
+
+      const newTokenCacheData = {}
+
+      if (!thisToken.tokenDataFromBackend) newTokenCacheData.tokenData = thisToken.tokenData
+      if (!thisToken.mutableFromBackend) newTokenCacheData.tokenIcon = thisToken.icon
+
       appData.updateNFTCachedData(thisToken.tokenId, newTokenCacheData)
     }
   }, [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 +291,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 +326,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 +369,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 +384,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 +420,121 @@ function NftsForSale (props) {
         </Row>
       )}
 
+      {/* Pagination Controls */}
+      {offersAreLoaded && totalPages > 1 && (
+        <div
+          style={{
+            position: 'fixed',
+            bottom: '70px',
+            left: '50%',
+            transform: 'translateX(-50%)',
+            zIndex: 1000,
+            background: 'rgba(255, 255, 255, 0.95)',
+            backdropFilter: 'blur(10px)',
+            borderRadius: '25px',
+            padding: '12px 20px',
+            boxShadow: '0 8px 32px rgba(0, 0, 0, 0.1)',
+            border: '1px solid rgba(255, 255, 255, 0.2)',
+            display: 'flex',
+            alignItems: 'center',
+            gap: '16px',
+            minWidth: '280px',
+            justifyContent: 'center'
+          }}
+        >
+          <Button
+            variant='outline-primary'
+            size='sm'
+            onClick={handlePreviousPage}
+            disabled={currentPage === 0}
+            style={{
+              borderRadius: '20px',
+              padding: '8px 16px',
+              border: '2px solid #007bff',
+              background: currentPage === 0 ? 'transparent' : '#007bff',
+              color: currentPage === 0 ? '#6c757d' : 'white',
+              fontWeight: '500',
+              fontSize: '14px',
+              transition: 'all 0.3s ease',
+              minWidth: '80px',
+              opacity: currentPage === 0 ? 0.5 : 1,
+              cursor: currentPage === 0 ? 'not-allowed' : 'pointer'
+            }}
+            onMouseEnter={(e) => {
+              if (currentPage > 0) {
+                e.target.style.background = '#0056b3'
+                e.target.style.transform = 'translateY(-1px)'
+                e.target.style.boxShadow = '0 4px 12px rgba(0, 123, 255, 0.3)'
+              }
+            }}
+            onMouseLeave={(e) => {
+              if (currentPage > 0) {
+                e.target.style.background = '#007bff'
+                e.target.style.transform = 'translateY(0)'
+                e.target.style.boxShadow = 'none'
+              }
+            }}
+          >
+            ← Previous
+          </Button>
+
+          <div
+            style={{
+              display: 'flex',
+              alignItems: 'center',
+              gap: '8px',
+              fontSize: '14px',
+              fontWeight: '500',
+              color: '#495057'
+            }}
+          >
+            <span style={{ color: '#007bff', fontWeight: '600' }}>
+              {currentPage + 1}
+            </span>
+            <span style={{ color: '#6c757d' }}>of</span>
+            <span style={{ color: '#495057', fontWeight: '600' }}>
+              {totalPages}
+            </span>
+          </div>
+
+          <Button
+            variant='outline-primary'
+            size='sm'
+            onClick={handleNextPage}
+            disabled={currentPage >= totalPages - 1}
+            style={{
+              borderRadius: '20px',
+              padding: '8px 16px',
+              border: '2px solid #007bff',
+              background: currentPage >= totalPages - 1 ? 'transparent' : '#007bff',
+              color: currentPage >= totalPages - 1 ? '#6c757d' : 'white',
+              fontWeight: '500',
+              fontSize: '14px',
+              transition: 'all 0.3s ease',
+              minWidth: '80px',
+              opacity: currentPage >= totalPages - 1 ? 0.5 : 1,
+              cursor: currentPage >= totalPages - 1 ? 'not-allowed' : 'pointer'
+            }}
+            onMouseEnter={(e) => {
+              if (currentPage < totalPages - 1) {
+                e.target.style.background = '#0056b3'
+                e.target.style.transform = 'translateY(-1px)'
+                e.target.style.boxShadow = '0 4px 12px rgba(0, 123, 255, 0.3)'
+              }
+            }}
+            onMouseLeave={(e) => {
+              if (currentPage < totalPages - 1) {
+                e.target.style.background = '#007bff'
+                e.target.style.transform = 'translateY(0)'
+                e.target.style.boxShadow = 'none'
+              }
+            }}
+          >
+            Next →
+          </Button>
+        </div>
+      )}
+
       {!offersAreLoaded && (
         <Row className='d-block text-center'>
           <Spinner animation='border' variant='primary' style={{ maegin: '0 auto' }} />

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

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

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

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

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

@@ -10,16 +10,16 @@ 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
+  console.log('token', token)
   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 +27,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 +55,6 @@ function TokenCard (props) {
             <Card.Title style={{ textAlign: 'center', marginTop: '10px' }}>
               <h4>{token.ticker}</h4>
             </Card.Title>
-
             <Container>
               <Row>
                 <Col>
@@ -66,7 +71,7 @@ function TokenCard (props) {
 
               <Row className='text-center'>
                 <Col>
-                  <InfoButton token={token} disabled={!token.tokenData} />
+                  <InfoButton token={token} disabled={!token.tokenData} {...props} />
                 </Col>
 
                 {!hideBuyBtn && (

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

@@ -0,0 +1,105 @@
+/*
+  Component for displaying channel item
+*/
+
+// Global npm libraries
+import React, { useCallback, useEffect, useState } from 'react'
+import { Spinner } from 'react-bootstrap'
+
+export default function ChannelItem (props) {
+  const { channel, selectedChannel, onChangeChannel, channelsData } = props
+  const [chInfo, setChInfo] = useState()
+
+  const getShortName = useCallback((str) => {
+    return str.slice(0, 8) + '...' + str.slice(-5)
+  }, [])
+
+  useEffect(() => {
+    if (!chInfo && channelsData[channel]) {
+      setChInfo(channelsData[channel])
+    }
+  }, [chInfo, channelsData, channel])
+
+  const handleClick = () => {
+    if (onChangeChannel) {
+      onChangeChannel(channel)
+    }
+  }
+
+  return (
+    <div
+      className={`d-flex align-items-center p-2 rounded-3 mb-2 cursor-pointer ${selectedChannel === channel ? 'bg-primary text-white' : ''}`}
+      style={{
+        cursor: 'pointer',
+        transition: 'all 0.2s ease',
+        backgroundColor: selectedChannel === channel ? '#0d6efd' : 'transparent',
+        border: '1px solid transparent'
+      }}
+      onClick={handleClick}
+      onMouseEnter={(e) => {
+        if (selectedChannel !== channel) {
+          e.currentTarget.style.backgroundColor = '#e9ecef'
+          e.currentTarget.style.borderColor = '#dee2e6'
+        }
+      }}
+      onMouseLeave={(e) => {
+        if (selectedChannel !== channel) {
+          e.currentTarget.style.backgroundColor = 'transparent'
+          e.currentTarget.style.borderColor = 'transparent'
+        }
+      }}
+    >
+      {/* Channel Avatar/Icon */}
+      <div className='me-3 flex-shrink-0 d-flex align-items-center'>
+        {chInfo?.picture
+          ? (
+            <img
+              src={chInfo.picture}
+              alt={chInfo.name || 'Channel'}
+              className='rounded-circle'
+              style={{ width: '32px', height: '32px' }}
+            />
+            )
+          : (
+            <div
+              className='rounded-circle d-flex align-items-center justify-content-center'
+              style={{
+                width: '32px',
+                height: '32px',
+                backgroundColor: '#e9ecef',
+                color: '#6c757d',
+                fontSize: '14px'
+              }}
+            >
+              #
+            </div>
+            )}
+      </div>
+
+      {/* Channel Info */}
+      <div className='flex-grow-1 min-w-0'>
+        <div
+          className={`${selectedChannel === channel ? 'text-white' : 'text-dark'} fw-medium`}
+          style={{ fontSize: '14px' }}
+        >
+          {chInfo?.name || getShortName(channel)}
+        </div>
+        {!chInfo?.name && (
+          <div
+            className={`small ${selectedChannel === channel ? 'text-white-50' : 'text-muted'}`}
+            style={{ fontSize: '12px' }}
+          >
+            Loading channel...
+          </div>
+        )}
+      </div>
+
+      {/* Loading indicator */}
+      {!chInfo?.name && (
+        <div className='ms-2'>
+          <Spinner animation='border' size='sm' />
+        </div>
+      )}
+    </div>
+  )
+}

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

@@ -0,0 +1,29 @@
+/*
+  Component for displaying the list of available channels
+*/
+
+// Global npm libraries
+import React from 'react'
+import { ListGroup } from 'react-bootstrap'
+import ChannelItem from './channel-item'
+function ChannelList (props) {
+  const { groupChannels, selectedChannel } = props
+
+  if (!groupChannels || groupChannels.length === 0) {
+    return (
+      <div className='text-muted small' style={{ fontStyle: 'italic' }}>
+        No channels available
+      </div>
+    )
+  }
+
+  return (
+    <ListGroup variant='flush' className='bg-transparent'>
+      {groupChannels.map((channel, i) => (
+        <ChannelItem key={`channel${i}`} channel={channel} selectedChannel={selectedChannel} {...props} />
+      ))}
+    </ListGroup>
+  )
+}
+
+export default ChannelList

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

@@ -0,0 +1,53 @@
+/*
+  Component for the chat header displaying chat info
+*/
+
+// Global npm libraries
+import React, { useState, useCallback, useEffect } from 'react'
+import { Spinner } from 'react-bootstrap'
+function ChatHeader (props) {
+  const { selectedChannel, channelsData, selectedChannelIsDm, profiles } = props
+  const [chInfo, setChInfo] = useState() // channel data
+  const getShortName = useCallback((str) => {
+    if (str.length < 20) return str
+    return str.slice(0, 4) + '...' + str.slice(-4)
+  }, [])
+
+  // Restore ch info
+  useEffect(() => {
+    setChInfo(null)
+  }, [selectedChannel])
+
+  // get channel info
+  useEffect(() => {
+    // Public channel
+    if (!chInfo && !selectedChannelIsDm && channelsData[selectedChannel]) {
+      setChInfo(channelsData[selectedChannel])
+    }
+    // Dm Channel
+    if (!chInfo && selectedChannelIsDm && profiles[selectedChannel]) {
+      setChInfo(profiles[selectedChannel])
+    }
+  }, [chInfo, channelsData, selectedChannel, profiles, selectedChannelIsDm])
+  return (
+    <div className='p-3 d-flex justify-content-between align-items-center' style={{ backgroundColor: '#ffffff' }}>
+      {chInfo &&
+        <div className='d-flex justify-content-center align-items-center'>
+          {chInfo.picture && <img src={chInfo.picture} alt={chInfo.name} style={{ width: '50px', marginRight: '10px', borderRadius: '50%' }} />}
+          <div className='flex-grow-1'>
+            <h5 className='mb-1 text-dark'>{getShortName(chInfo?.name || selectedChannel)}</h5>
+            <small className='text-muted'>{chInfo?.about || ''}</small>
+          </div>
+
+        </div>}
+
+      {!chInfo &&
+        <div className='flex-grow-1 ps-4'>
+          <Spinner animation='border' size='sm' />
+
+        </div>}
+    </div>
+  )
+}
+
+export default ChatHeader

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

@@ -0,0 +1,49 @@
+/*
+  Component for the main chat area
+*/
+
+// Global npm libraries
+import React from 'react'
+
+// Local libraries
+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
+
+  return (
+    <>
+      {!selectedChannel && (
+        <div className='h-100 d-flex align-items-center justify-content-center' style={{ backgroundColor: '#f8f9fa', minHeight: '200px' }}>
+          <div className='text-center text-muted'>
+            <Spinner animation='border' size='sm' />
+          </div>
+        </div>
+      )}
+
+      {selectedChannel && (
+        <div className='h-100 d-flex flex-column' style={{ backgroundColor: '#f8f9fa' }}>
+          {/* Chat Header */}
+          <div>
+            <ChatHeader selectedChannel={selectedChannel} {...props} />
+          </div>
+
+          {/* Messages Area */}
+          <div className='flex-grow-1 overflow-auto'>
+            <MessageList messages={messages} {...props} />
+          </div>
+
+          {/* Message Input */}
+          <div className='border-top border-tertiary'>
+            <MessageInput {...props} />
+          </div>
+        </div>
+      )}
+    </>
+  )
+}
+
+export default ChatMain

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

@@ -0,0 +1,48 @@
+/*
+  Component for the chat sidebar channels
+*/
+
+// Global npm libraries
+import React from 'react'
+
+// Local libraries
+import ChannelList from './channel-list'
+import DMList from './dm-list'
+
+function ChatSidebar (props) {
+  const { dmChannels, profiles } = props
+
+  return (
+    <div className='h-100 d-flex flex-column' style={{ backgroundColor: '#ffffff', borderRight: '1px solid #e9ecef' }}>
+      {/* Channels Section */}
+      <div className='flex-grow-1 d-flex flex-column'>
+        <div className='p-4 flex-grow-1'>
+          <div className='d-flex justify-content-between align-items-center mb-3'>
+            <h5 className='mb-0 text-dark fw-semibold' style={{ fontSize: '16px', letterSpacing: '0.5px' }}>
+              Channels
+            </h5>
+          </div>
+          <ChannelList
+            {...props}
+          />
+
+          {/* DMs Section */}
+          <div className='mt-4 pt-4 border-top'>
+            <div className='d-flex justify-content-between align-items-center mb-3'>
+              <h5 className='mb-0 text-dark fw-semibold' style={{ fontSize: '16px', letterSpacing: '0.5px' }}>
+                DMs
+              </h5>
+            </div>
+            <DMList
+              dms={dmChannels}
+              profiles={profiles}
+              {...props}
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+  )
+}
+
+export default ChatSidebar

src/components/app-body/nostr-chat/date-separator.js

@@ -0,0 +1,49 @@
+/*
+  Component for displaying date separators between message groups.
+*/
+
+// Global npm libraries
+import React from 'react'
+
+function DateSeparator (props) {
+  const { date } = props
+
+  // Format date for display
+  const formatDate = (dateString) => {
+    const date = new Date(dateString)
+    const today = new Date()
+    const yesterday = new Date(today)
+    yesterday.setDate(yesterday.getDate() - 1)
+
+    if (date.toDateString() === today.toDateString()) {
+      return 'Today'
+    } else if (date.toDateString() === yesterday.toDateString()) {
+      return 'Yesterday'
+    } else {
+      return date.toLocaleDateString('en-US', {
+        weekday: 'long',
+        year: 'numeric',
+        month: 'long',
+        day: 'numeric'
+      })
+    }
+  }
+
+  return (
+    <div className='text-center my-4'>
+      <div
+        className='d-inline-block px-3 py-1 rounded-pill'
+        style={{
+          backgroundColor: '#e9ecef',
+          color: '#6c757d',
+          fontSize: '12px',
+          fontWeight: '500'
+        }}
+      >
+        {formatDate(date)}
+      </div>
+    </div>
+  )
+}
+
+export default DateSeparator

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

@@ -0,0 +1,129 @@
+/*
+  Component for displaying direct message item
+*/
+
+// Global npm libraries
+import React, { useCallback, useEffect, useState } from 'react'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faUser } from '@fortawesome/free-solid-svg-icons'
+import { Spinner } from 'react-bootstrap'
+
+export default function DMItem (props) {
+  const { dm, profiles, selectedChannel, onChangeChannel } = props
+  const { pubKey } = dm
+
+  const [profile, setProfile] = useState(profiles[pubKey])
+  const isSelected = selectedChannel === pubKey
+
+  useEffect(() => {
+    const profile = profiles[pubKey]
+
+    if (profile) {
+      setProfile(profile)
+    }
+  }, [profiles, pubKey])
+
+  const getShortName = useCallback((str) => {
+    if (!str || !str.startsWith('npub')) return str
+
+    const prefix = 'npub'
+    const first4 = str.slice(prefix.length, prefix.length + 4)
+    const last4 = str.slice(-4)
+
+    return `${prefix}:${first4}...${last4}`
+  }, [])
+
+  const handleClick = () => {
+    if (onChangeChannel) {
+      onChangeChannel(pubKey)
+    }
+  }
+
+  return (
+    <div
+      className={`d-flex align-items-center p-2 rounded-3 mb-2 cursor-pointer ${isSelected ? 'bg-primary text-white' : ''}`}
+      style={{
+        cursor: 'pointer',
+        transition: 'all 0.2s ease',
+        backgroundColor: isSelected ? '#0d6efd' : 'transparent',
+        border: '1px solid transparent'
+      }}
+      onClick={handleClick}
+      onMouseEnter={(e) => {
+        if (!isSelected) {
+          e.currentTarget.style.backgroundColor = '#e9ecef'
+          e.currentTarget.style.borderColor = '#dee2e6'
+        }
+      }}
+      onMouseLeave={(e) => {
+        if (!isSelected) {
+          e.currentTarget.style.backgroundColor = 'transparent'
+          e.currentTarget.style.borderColor = 'transparent'
+        }
+      }}
+    >
+      {/* User Avatar */}
+      <div className='me-3 flex-shrink-0 d-flex align-items-center'>
+        {profile?.picture
+          ? (
+            <img
+              src={profile.picture}
+              alt={`${profile.name || 'User'} Avatar`}
+              className='rounded-circle'
+              style={{ width: '32px', height: '32px' }}
+              onError={(e) => {
+                e.target.style.display = 'none'
+                e.target.nextSibling.style.display = 'flex'
+              }}
+            />
+            )
+          : <FontAwesomeIcon
+              icon={faUser}
+              className='rounded-circle d-flex align-items-center justify-content-center'
+              style={{
+                width: '32px',
+                height: '32px',
+                backgroundColor: profile?.picture ? 'transparent' : '#e9ecef',
+                color: profile?.picture ? 'transparent' : '#6c757d',
+                fontSize: '14px',
+                display: profile?.picture ? 'none' : 'flex'
+              }}
+            />}
+      </div>
+
+      {/* User Info */}
+      <div className='flex-grow-1 min-w-0'>
+        <div
+          className={`${isSelected ? 'text-white' : 'text-dark'} ${dm.unreadCount > 0 ? 'fw-bold' : 'fw-medium'}`}
+          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' : ''}`}
+          style={{ fontSize: '12px' }}
+        >
+          No messages yet
+        </div> */}
+      </div>
+
+      {/* Unread indicator */}
+      {/* {dm.unreadCount > 0 && (
+        <div className='ms-2'>
+          <span
+            className='badge rounded-pill'
+            style={{
+              backgroundColor: isSelected ? '#ffffff' : '#dc3545',
+              color: isSelected ? '#0d6efd' : '#ffffff',
+              fontSize: '10px',
+              minWidth: '18px'
+            }}
+          >
+            {dm.unreadCount > 99 ? '99+' : dm.unreadCount}
+          </span>
+        </div>
+      )} */}
+    </div>
+  )
+}

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

@@ -0,0 +1,50 @@
+/*
+  Component for displaying a list of direct messages
+*/
+
+// Global npm libraries
+import React from 'react'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faUser } from '@fortawesome/free-solid-svg-icons'
+import DMItem from './dm-item'
+import { Spinner } from 'react-bootstrap'
+
+function DMList (props) {
+  const { dmChannels, profiles, selectedChannel, onChangeChannel, dmListLoaded } = props
+
+  if (dmChannels.length === 0 && dmListLoaded) {
+    return (
+      <div className='text-center p-3'>
+        <div className='text-muted mb-2'>
+          <FontAwesomeIcon icon={faUser} style={{ fontSize: '24px', opacity: 0.5 }} />
+        </div>
+        <div className='text-muted small'>No direct messages yet</div>
+        <div className='text-muted small' style={{ fontSize: '11px' }}>
+          Start a conversation to see it here
+        </div>
+      </div>
+    )
+  }
+
+  return (
+    <div className='dm-list'>
+      {dmChannels.map((pubKey) => (
+        <DMItem
+          key={pubKey}
+          dm={{ pubKey }}
+          profiles={profiles}
+          selectedChannel={selectedChannel}
+          onChangeChannel={onChangeChannel}
+          {...props}
+        />
+      ))}
+      {!dmListLoaded && (
+        <div className='text-center'>
+          <Spinner animation='border' />
+        </div>
+      )}
+    </div>
+  )
+}
+
+export default DMList

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

@@ -0,0 +1,538 @@
+/*
+  Component for Nostr Chat functionality
+*/
+
+// Global npm libraries
+import React, { useCallback, useEffect, useState, useRef } from 'react'
+import { Container, Row, Col } from 'react-bootstrap'
+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'
+
+function NostrChat (props) {
+  const { appData } = props
+  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({})
+  const [channelsData, setChannelsData] = useState({})
+  const [channelsLoaded, setChannelsLoaded] = useState(false)
+  const [groupChannels] = useState(config.chatsId)
+  const [dmChannels, setDmChannels] = useState([])
+  const [dmListLoaded, setDmListLoaded] = useState(false)
+
+  const [selectedChannel, setSelectedChannel] = useState(null)
+  const [selectedChannelIsDm, setSelectedChannelIsDm] = useState(false)
+
+  const [deletedChats] = useState(appData.nostrQueries.deletedChats)
+
+  const profilesRef = useRef({})
+  const dmChannelsRef = useRef([])
+  const groupChannelsRef = useRef(config.chatsId)
+
+  // True if channel id is a known DM peer (not a configured group channel).
+  const isDmChannel = useCallback((ch) => {
+    if (!ch) return false
+    if (groupChannelsRef.current.includes(ch)) return false
+    return dmChannelsRef.current.includes(ch) || !!profilesRef.current[ch]
+  }, [])
+
+  // Close one tracked SSE subscription (single cleanup path).
+  const closeTrackedSubscription = useCallback((subId) => {
+    const subscriptions = subscriptionsRef.current
+    if (subscriptions[subId]) {
+      subscriptions[subId].close()
+      delete subscriptions[subId]
+    }
+  }, [])
+
+  // Reset states on change channel
+  const onChangeChannel = useCallback((ch) => {
+    if (selectedChannel === ch) return
+    setSelectedChannelIsDm(isDmChannel(ch))
+    setMessages([])
+    setLoadedMessages(false)
+    setSelectedChannel(ch)
+  }, [selectedChannel, isDmChannel])
+
+  // 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)
+      setSelectedChannelIsDm(true)
+      setSelectedChannel(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)
+    }
+  }, [])
+
+  // 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 {
+      // Update messages list
+      setMessages(current => {
+        // ignore existing messages
+        const exist = current.find(val => val.id === ev.id)
+        if (exist) return current
+
+        const newMsgs = [...current]
+        newMsgs.push(ev)
+
+        // Sort messages by timestamp
+        newMsgs.sort((a, b) => b.created_at - a.created_at)
+        return newMsgs.reverse()
+      })
+
+      // Fetch message owner profile
+      const pubKey = ev.pubkey
+      const existProfile = profilesRef.current[ev.pubkey]
+      if (existProfile) {
+        return
+      }
+      const npub = await appData.nostrQueries.hexToNpub(pubKey)
+
+      console.log(`Trying to get ${pubKey} profile.`)
+
+      const defaultProfile = { name: 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
+      })
+    } catch (error) {
+      console.warn(error)
+    }
+  }, [appData])
+
+  const decryptMsg = useCallback(async ({ ev, pubKey }) => {
+    try {
+      const encryptedMsg = ev.content
+      const senderPubKey = pubKey
+
+      const { nostrKeyPair } = appData.bchWalletState
+      const { nostrQueries } = appData
+      const decryptData = {
+        receiverPrivKey: nostrKeyPair.privHex,
+        senderPubKey,
+        encryptedMsg
+      }
+
+      const decrptedMsg = await nostrQueries.decryptMsg(decryptData)
+
+      ev.content = decrptedMsg
+      onMsgRead(ev)
+    } catch (error) {
+      console.warn(error)
+    }
+  }, [appData, onMsgRead])
+
+  // Load group history via GET, then SSE for live messages only
+  useEffect(() => {
+    if (!selectedChannel || !channelsLoaded || selectedChannelIsDm) return
+    if (!deletedChats || !Array.isArray(deletedChats)) return
+
+    let cancelled = false
+    const subId = generateSubId('group')
+
+    const loadGroup = async () => {
+      try {
+        const history = await nostrQueries.getChannelMessages(selectedChannel, 50)
+        if (cancelled) return
+
+        for (const ev of history) {
+          const onBlackList = nostrQueries.blackList.find((val) => val === ev.pubkey)
+          const isDeleted = deletedChats.find((val) => val.eventId === ev.id)
+          if (!onBlackList && !isDeleted) {
+            onMsgRead(ev)
+          }
+        }
+
+        if (!cancelled) {
+          setLoadedMessages(true)
+        }
+
+        if (cancelled) return
+
+        const newest = history.reduce((max, ev) => Math.max(max, ev.created_at || 0), 0)
+        const liveFilter = {
+          limit: 0,
+          kinds: [42],
+          '#e': [selectedChannel],
+          ...(newest > 0 ? { since: newest } : {})
+        }
+
+        const subscription = restClient.current.createSubscription(subId, liveFilter, {
+          onEvent: (ev) => {
+            console.log('Group post retrieved from REST API', ev.content)
+            const onBlackList = nostrQueries.blackList.find((val) => val === ev.pubkey)
+            const isDeleted = deletedChats.find((val) => val.eventId === ev.id)
+            if (!onBlackList && !isDeleted) {
+              onMsgRead(ev)
+            }
+          },
+          onEose: () => {},
+          onClosed: (message) => {
+            console.log('Group channel subscription closed:', message)
+          },
+          onError: (error) => {
+            console.warn('Group channel subscription error:', error)
+          }
+        })
+
+        if (cancelled) {
+          subscription.close()
+          return
+        }
+
+        subscriptionsRef.current[subId] = subscription
+      } catch (error) {
+        console.warn('Error loading group messages:', error)
+        if (!cancelled) setLoadedMessages(true)
+      }
+    }
+
+    loadGroup()
+
+    return () => {
+      cancelled = true
+      console.log('Close existing subscription for group channel')
+      closeTrackedSubscription(subId)
+    }
+  }, [onMsgRead, selectedChannel, selectedChannelIsDm, nostrQueries, channelsLoaded, deletedChats, closeTrackedSubscription])
+
+  // Load DM history via GET, then SSE for live messages only
+  useEffect(() => {
+    if (!selectedChannel || !selectedChannelIsDm) return
+
+    let cancelled = false
+    const { nostrKeyPair } = bchWalletState
+    const dmPubKey = selectedChannel
+    const subId = generateSubId('dm')
+
+    const loadDm = async () => {
+      try {
+        const history = await nostrQueries.getDmMessages(nostrKeyPair.pubHex, dmPubKey, 50)
+        if (cancelled) return
+
+        for (const ev of history) {
+          if (ev.pubkey === nostrKeyPair.pubHex) {
+            await decryptMsg({ ev, pubKey: dmPubKey })
+          } else {
+            await decryptMsg({ ev, pubKey: ev.pubkey })
+          }
+        }
+
+        if (!cancelled) {
+          setLoadedMessages(true)
+        }
+
+        if (cancelled) return
+
+        const newest = history.reduce((max, ev) => Math.max(max, ev.created_at || 0), 0)
+        const liveFilters = [
+          {
+            limit: 0,
+            kinds: [4],
+            '#p': [nostrKeyPair.pubHex],
+            authors: [dmPubKey],
+            ...(newest > 0 ? { since: newest } : {})
+          },
+          {
+            limit: 0,
+            kinds: [4],
+            '#p': [dmPubKey],
+            authors: [nostrKeyPair.pubHex],
+            ...(newest > 0 ? { since: newest } : {})
+          }
+        ]
+
+        const subscription = restClient.current.createSubscription(subId, liveFilters, {
+          onEvent: (ev) => {
+            console.log('DM post retrieved from REST API', ev.content)
+            if (ev.pubkey === nostrKeyPair.pubHex) {
+              decryptMsg({ ev, pubKey: dmPubKey })
+            } else {
+              decryptMsg({ ev, pubKey: ev.pubkey })
+            }
+          },
+          onEose: () => {},
+          onClosed: (message) => {
+            console.log('DM channel subscription closed:', message)
+          },
+          onError: (error) => {
+            console.warn('DM channel subscription error:', error)
+          }
+        })
+
+        if (cancelled) {
+          subscription.close()
+          return
+        }
+
+        subscriptionsRef.current[subId] = subscription
+      } catch (error) {
+        console.warn('Error loading DM messages:', error)
+        if (!cancelled) setLoadedMessages(true)
+      }
+    }
+
+    loadDm()
+
+    return () => {
+      cancelled = true
+      console.log('Close existing subscription for private channel')
+      closeTrackedSubscription(subId)
+    }
+  }, [selectedChannel, selectedChannelIsDm, nostrQueries, bchWalletState, decryptMsg, closeTrackedSubscription])
+
+  const handleIncomingDms = useCallback(async (pubKey) => {
+    try {
+      if (!dmListLoaded) return
+      const exist = dmChannelsRef.current.find(val => val === pubKey)
+      if (exist) return
+
+      let profile = await nostrQueries.getProfile(pubKey)
+      const npub = nostrQueries.hexToNpub(pubKey)
+      if (!profile) profile = { name: npub }
+      // add public key formats to profile object
+      profile.pubKey = pubKey
+      profile.npub = npub
+      setProfiles(currentProfiles => {
+        const newProfiles = { ...currentProfiles }
+        newProfiles[pubKey] = profile
+        profilesRef.current = newProfiles
+        return newProfiles
+      })
+      setDmChannels(currentChs => {
+        const newChs = [...currentChs]
+        newChs.push(profile.pubKey)
+
+        dmChannelsRef.current = newChs
+        return newChs
+      })
+      setChannelsData(currentChs => {
+        const newChs = { ...currentChs }
+        newChs[profile.pubKey] = profile
+        return newChs
+      })
+    } catch (error) {
+      console.warn(error)
+    }
+  }, [nostrQueries, dmListLoaded])
+
+  // Keep live subscription for new DMs
+  useEffect(() => {
+    if (!dmListLoaded || !channelsLoaded) return
+    const { bchWalletState } = appData
+    const { nostrKeyPair } = bchWalletState
+
+    const subId = generateSubId('dm-notify')
+    const filter = { limit: 0, kinds: [4], '#p': [nostrKeyPair.pubHex] }
+
+    const subscription = restClient.current.createSubscription(subId, filter, {
+      onEvent: (ev) => {
+        console.log('New message received from REST API', ev)
+        handleIncomingDms(ev.pubkey)
+      },
+      onEose: () => {},
+      onClosed: (message) => {
+        console.log('DM notification subscription closed:', message)
+      },
+      onError: (error) => {
+        console.warn('DM notification subscription error:', error)
+      }
+    })
+
+    subscriptionsRef.current[subId] = subscription
+
+    return () => {
+      console.log('Close existing subscription for DM notifications')
+      closeTrackedSubscription(subId)
+    }
+  }, [handleIncomingDms, appData, dmListLoaded, channelsLoaded, closeTrackedSubscription])
+
+  // Load Dm channels
+  useEffect(() => {
+    const loadCurrentDms = async () => {
+      const { nostrQueries, bchWalletState } = appData
+      const { nostrKeyPair } = bchWalletState
+      const dms = await appData.nostrQueries.getDms(nostrKeyPair.pubHex)
+      setDmChannels(currentChs => {
+        let newChs = [...currentChs, ...dms]
+        newChs = newChs.filter((val, i, list) => {
+          const existingIndex = list.findIndex(value => value === val)
+          return existingIndex === i
+        })
+        dmChannelsRef.current = newChs
+        return newChs
+      })
+      setDmListLoaded(true)
+
+      console.log('dm list', dms)
+
+      for (let i = 0; i < dms.length; i++) {
+        const pubKey = dms[i]
+        const npub = await nostrQueries.hexToNpub(pubKey)
+
+        const defaultProfile = { name: npub } // default profile
+        profilesRef.current[pubKey] = defaultProfile // update ref , to prevent fetch this profile again.
+        // Fetch profile
+        const nostrProfile = await nostrQueries.getProfile(pubKey)
+
+        const profile = nostrProfile || defaultProfile
+        // add public key formats to profile object
+        profile.pubKey = pubKey
+        profile.npub = npub
+        // Update profiles state
+        setProfiles(currentProfiles => {
+          const newProfiles = { ...currentProfiles }
+          newProfiles[pubKey] = profile
+          profilesRef.current = newProfiles
+          return newProfiles
+        })
+      }
+    }
+
+    if (!dmListLoaded) loadCurrentDms()
+  }, [appData, dmListLoaded])
+
+  // Load public channels data
+  useEffect(() => {
+    const loadChData = async () => {
+      const loadedChannels = []
+      for (let i = 0; i < groupChannels.length; i++) {
+        const ch = groupChannels[i]
+
+        const exist = loadedChannels.find((val) => { return val === ch })
+        if (exist) { continue }
+        // Fech profile.
+        let channelData = await appData.nostrQueries.getChannelInfo(ch)
+        console.log('channelData', channelData)
+        // Set short id as name
+        if (!channelData) channelData = { name: ch.slice(0, 8) + '...' + ch.slice(-5) }
+        loadedChannels.push(channelData)
+
+        // Update channels data state
+        setChannelsData(currentChs => {
+          const newChs = { ...currentChs }
+          newChs[ch] = channelData
+          return newChs
+        })
+        setChannelsLoaded(true)
+      }
+    }
+
+    loadChData()
+  }, [selectedChannel, appData, groupChannels])
+
+  return (
+    <>
+      <Container fluid className='h-100 p-0 mb-5 '>
+        <Row className='h-100 g-0'>
+          <Col xs={12} md={4} lg={3} className='h-100'>
+            <ChatSidebar
+              groupChannels={groupChannels}
+              dmChannels={dmChannels}
+              selectedChannel={selectedChannel}
+              selectedChannelIsDm={selectedChannelIsDm}
+              profiles={profiles}
+              channelsData={channelsData}
+              onChangeChannel={onChangeChannel}
+              dmListLoaded={dmListLoaded && channelsLoaded}
+              {...props}
+            />
+          </Col>
+          <Col xs={12} md={8} lg={9} className='h-100 pe-2'>
+            <ChatMain
+              loadedMessages={loadedMessages}
+              selectedChannel={selectedChannel}
+              selectedChannelIsDm={selectedChannelIsDm}
+              messages={messages}
+              profiles={profiles}
+              channelsData={channelsData}
+              dmListLoaded={dmListLoaded && channelsLoaded}
+              onChangeChannel={onChangeChannel}
+              addPrivateMessage={addPrivateMessage}
+              onMsgRead={onMsgRead}
+              {...props}
+            />
+          </Col>
+        </Row>
+      </Container>
+    </>
+  )
+}
+
+export default NostrChat

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

@@ -0,0 +1,195 @@
+/*
+  Component for the message input area
+*/
+
+// Global npm libraries
+import React, { useState, useEffect } from 'react'
+import { Form, Button, InputGroup } from 'react-bootstrap'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faPaperPlane } from '@fortawesome/free-solid-svg-icons'
+import { finalizeEvent } from 'nostr-tools/pure'
+import { hexToBytes } from '@noble/hashes/utils' // already an installed dependency
+import NostrRestClient from '../../../services/nostr-rest-client.js'
+
+function MessageInput (props) {
+  const { appData, selectedChannel, profiles, selectedChannelIsDm, onMsgRead } = props
+  const { bchWalletState, nostrQueries } = appData
+  // Initialize REST client for publishing
+  const restClient = new NostrRestClient()
+  const [isDm, setIsDm] = useState(false)
+  const [dmProfile, setDmProfile] = useState(false)
+  const [message, setMessage] = useState('')
+  const [onFetch, setOnFetch] = useState(false)
+
+  // Define input type between private or public
+  useEffect(() => {
+    const dmTo = profiles[selectedChannel]
+    // Prefer explicit DM channel flag; fall back to profile presence
+    const privateChat = selectedChannelIsDm || !!dmTo
+    setIsDm(privateChat)
+    setDmProfile(dmTo || (privateChat ? { pubKey: selectedChannel } : false))
+  }, [selectedChannel, profiles, selectedChannelIsDm])
+
+  const handleSubmitPrivate = async (e) => {
+    e.preventDefault()
+
+    try {
+      setOnFetch(true)
+      console.log('dm To : ', dmProfile)
+
+      const { nostrKeyPair } = bchWalletState
+      const peerPubKey = dmProfile?.pubKey || selectedChannel
+      // Convert private key to binary
+      const privateKeyBin = hexToBytes(nostrKeyPair.privHex)
+      const plaintext = message
+
+      const encryptedMsg = await nostrQueries.encryptMsg({
+        senderPrivKey: nostrKeyPair.privHex,
+        receiverPubKey: peerPubKey,
+        message: plaintext
+      })
+
+      console.log('encryptedMsg', encryptedMsg)
+      // Generate a post.
+      const eventTemplate = {
+        kind: 4,
+        created_at: Math.floor(Date.now() / 1000),
+        tags: [['p', peerPubKey]],
+        content: encryptedMsg
+      }
+      console.log(`eventTemplate: ${JSON.stringify(eventTemplate, null, 2)}`)
+
+      // Sign the post
+      const signedEvent = finalizeEvent(eventTemplate, privateKeyBin)
+      console.log('signedEvent: ', signedEvent)
+
+      // Publish the message via REST API (handles broadcasting to multiple relays)
+      try {
+        const result = await restClient.publishEvent(signedEvent)
+        console.log('result: ', result)
+
+        if (!result.accepted) {
+          throw new Error(`Failed to publish: ${result.message || 'Unknown error'}`)
+        }
+      } catch (err) {
+        console.warn(`Error publishing message: ${err}`)
+        throw err
+      }
+
+      // Show the outbound message immediately (do not wait for SSE echo)
+      if (onMsgRead) {
+        onMsgRead({
+          ...signedEvent,
+          content: plaintext
+        })
+      }
+
+      setMessage('')
+      setOnFetch(false)
+    } catch (error) {
+      console.warn(error)
+      setOnFetch(false)
+    }
+  }
+
+  // Post on nostr network
+  const handleSubmitPublic = async (e) => {
+    e.preventDefault()
+    try {
+      setOnFetch(true)
+
+      const { nostrKeyPair } = bchWalletState
+
+      // Convert private key to binary
+      const privateKeyBin = hexToBytes(nostrKeyPair.privHex)
+      const plaintext = message
+
+      // Generate a post.
+      const eventTemplate = {
+        kind: 42,
+        created_at: Math.floor(Date.now() / 1000),
+        tags: [['e', selectedChannel, 'root']],
+        content: plaintext
+      }
+      console.log(`eventTemplate: ${JSON.stringify(eventTemplate, null, 2)}`)
+
+      // Sign the post
+      const signedEvent = finalizeEvent(eventTemplate, privateKeyBin)
+      console.log('signedEvent: ', signedEvent)
+
+      // Publish the message via REST API (handles broadcasting to multiple relays)
+      try {
+        const result = await restClient.publishEvent(signedEvent)
+        console.log('result: ', result)
+
+        if (!result.accepted) {
+          throw new Error(`Failed to publish: ${result.message || 'Unknown error'}`)
+        }
+      } catch (err) {
+        console.warn(`Error publishing message: ${err}`)
+        throw err
+      }
+
+      // Show the outbound message immediately
+      if (onMsgRead) {
+        onMsgRead(signedEvent)
+      }
+
+      setMessage('')
+      setOnFetch(false)
+    } catch (error) {
+      console.warn(error)
+      setOnFetch(false)
+    }
+  }
+
+  const onChange = (e) => {
+    setMessage(e.target.value)
+  }
+  return (
+    <div className='p-3' style={{ backgroundColor: '#ffffff' }}>
+      <Form onSubmit={isDm ? handleSubmitPrivate : handleSubmitPublic}>
+        <InputGroup>
+          <Form.Control
+            as='textarea'
+            rows={3}
+            placeholder='Type a message...'
+            className='border-1 bg-transparent text-dark'
+            style={{
+              backgroundColor: '#f8f9fa',
+              border: '4px solid rgb(235, 232, 232)',
+              borderRadius: '12px',
+              padding: '12px 16px',
+              fontSize: '14px',
+              resize: 'none',
+              minHeight: '60px',
+              maxHeight: '120px'
+            }}
+            value={message}
+            onChange={onChange}
+            disabled={onFetch}
+          />
+
+          <Button
+            type='submit'
+            variant='link'
+            className='text-dark border-0 bg-transparent ms-2'
+            style={{
+              color: '#6c757d',
+              transition: 'color 0.2s ease',
+              alignSelf: 'flex-end',
+              marginBottom: '8px'
+            }}
+            title='Send message'
+            disabled={onFetch}
+
+          >
+            <FontAwesomeIcon icon={faPaperPlane} />
+          </Button>
+        </InputGroup>
+      </Form>
+    </div>
+  )
+}
+
+export default MessageInput

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

@@ -0,0 +1,123 @@
+/*
+  Component for displaying a single chat message
+*/
+
+// Global npm libraries
+import React, { useEffect, useState } from 'react'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faUser } from '@fortawesome/free-solid-svg-icons'
+import { Spinner } from 'react-bootstrap'
+import NostrFormat from '../../app-body/nostr/nostr-format'
+import ProfileMenu from './profile-menu'
+
+function MessageItem (props) {
+  const { message, profiles, selectedChannel } = props
+  const [profile, setProfile] = useState(null)
+
+  const [isDm, setIsDm] = useState(false)
+
+  // Define type between private or public
+  useEffect(() => {
+    const dmTo = profiles[selectedChannel]
+    setIsDm(!!dmTo)
+  }, [selectedChannel, profiles])
+
+  // Format timestamp
+  const formatTime = (timestamp) => {
+    return new Date(timestamp).toLocaleTimeString([], {
+      hour: '2-digit',
+      minute: '2-digit',
+      hour12: true
+    })
+  }
+
+  useEffect(() => {
+    if (profiles[message.pubkey]) {
+      setProfile(profiles[message.pubkey])
+    }
+  }, [profiles, message])
+
+  return (
+    <div className='mb-3 d-flex align-items-start'>
+      {/* Message Content */}
+      <div className='flex-grow-1'>
+        <div
+          className='text-dark p-3 rounded-3'
+          style={{
+            backgroundColor: '#ffffff',
+            border: '1px solid #e9ecef',
+            boxShadow: '0 1px 2px rgba(0, 0, 0, 0.05)',
+            maxWidth: '85%',
+            wordWrap: 'break-word'
+          }}
+        >
+          <div className='d-flex align-items-center mb-2'>
+            {/* Avatar */}
+            <div className='me-2 flex-shrink-0'>
+              {profile?.picture
+                ? (
+                  <ProfileMenu
+                    profile={profile}
+                    isDm={isDm}
+                    {...props}
+                  >
+                    <img
+                      src={profile.picture}
+                      alt={`${profile.name} Avatar`}
+                      className='rounded-circle'
+                      style={{ width: '24px', height: '24px' }}
+                      onError={(e) => {
+                        e.target.style.display = 'none'
+                        e.target.nextSibling.style.display = 'block'
+                      }}
+                    />
+                  </ProfileMenu>
+                  )
+                : (
+                  <ProfileMenu
+                    profile={profile}
+                    isDm={isDm}
+                    {...props}
+
+                  >
+                    <FontAwesomeIcon
+                      icon={faUser}
+                      className='rounded-circle d-flex align-items-center justify-content-center'
+                      style={{
+                        width: '24px',
+                        height: '24px',
+                        backgroundColor: '#e9ecef',
+                        color: '#6c757d',
+                        fontSize: '12px',
+                        display: message.avatar ? 'none' : 'flex'
+                      }}
+                    />
+                  </ProfileMenu>
+                  )}
+            </div>
+            {!profile && <span className='fw-bold text-dark me-2'>{message.pubkey}<Spinner animation='border' size='sm' /></span>}
+            {profile && profile.name && (
+              <ProfileMenu
+                profile={profile}
+                isDm={isDm}
+                {...props}
+              >
+                <span className='fw-bold text-dark me-2'>
+                  {profile.name}
+                </span>
+              </ProfileMenu>
+            )}
+
+            <small className='text-muted'>{formatTime(message.created_at * 1000)}</small>
+          </div>
+          <div style={{ lineHeight: '1.4', wordBreak: 'break-all' }}>
+            <NostrFormat content={message.content} />
+
+          </div>
+        </div>
+      </div>
+    </div>
+  )
+}
+
+export default MessageItem

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

@@ -0,0 +1,110 @@
+/*
+  Component for displaying the list of chat messages
+*/
+
+// Global npm libraries
+import React, { useEffect, useState, useCallback, useRef } from 'react'
+
+// Local libraries
+import MessageItem from './message-item'
+import DateSeparator from './date-separator'
+import { Spinner } from 'react-bootstrap'
+
+function MessageList (props) {
+  const { messages, loadedMessages } = props
+  console.log('loadedMessages', loadedMessages)
+  const [groupedMessages, setGroupedMessages] = useState({})
+  const msgContainerRef = useRef()
+  // Group messages by date
+  const groupMessagesByDate = useCallback((messages) => {
+    const grouped = {}
+    messages.forEach((message, i) => {
+      const date = new Date(message.created_at * 1000).toDateString()
+      if (!grouped[date]) {
+        grouped[date] = []
+      }
+      grouped[date].push(message)
+    })
+
+    return grouped
+  }, [])
+
+  useEffect(() => {
+    const grouped = groupMessagesByDate(messages)
+
+    setGroupedMessages(grouped)
+
+    // Scroll to end of the message container.
+    // Wait few seconds before load render.
+    setTimeout(() => {
+      if (msgContainerRef.current) {
+        msgContainerRef.current.scrollTo({
+          top: msgContainerRef.current.scrollHeight - msgContainerRef.current.clientHeight,
+          behavior: 'smooth'
+        })
+        msgContainerRef.current = null // scroll one time
+      }
+    }, 1000)
+  }, [messages, groupMessagesByDate])
+
+  return (
+    <>
+      <style>
+        {`
+          .hide-scrollbar::-webkit-scrollbar {
+            width: 0 !important;
+            display: none !important;
+          }
+          .hide-scrollbar {
+            -ms-overflow-style: none !important;
+            scrollbar-width: none !important;
+          }
+        `}
+      </style>
+      <div
+        className='h-100 overflow-auto hide-scrollbar'
+        style={{
+          backgroundColor: '#f8f9fa',
+          height: 'calc(100vh - 200px)',
+          maxHeight: 'calc(100vh - 200px)'
+        }}
+      >
+        {loadedMessages && (!messages || messages.length === 0) && (
+          <div className='h-100 d-flex align-items-center justify-content-center ' style={{ minHeight: '50vh' }}>
+            <div className='text-center text-muted'>
+              <p>No messages yet. Start the conversation!</p>
+            </div>
+          </div>
+        )}
+
+        {loadedMessages && messages && messages.length > 0 && (
+          <div ref={msgContainerRef} className='p-3' style={{ overflowY: 'auto', maxHeight: '50vh' }}>
+            {Object.entries(groupedMessages).map(([date, dateMessages]) => (
+              <div key={date}>
+                <DateSeparator date={date} />
+                {dateMessages.map((message, index) => (
+                  <MessageItem
+                    key={`${message.id}-${index}`}
+                    message={message}
+                    totalMessages={messages.length}
+                    messageIndex={index}
+                    {...props}
+
+                  />
+                ))}
+              </div>
+            ))}
+          </div>
+        )}
+        {!loadedMessages &&
+          <div className='p-3' style={{ minHeight: '50vh', display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
+            <Spinner animation='border' size='md' />
+
+          </div>}
+
+      </div>
+    </>
+  )
+}
+
+export default MessageList

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

@@ -0,0 +1,66 @@
+/*
+  Component for displaying a profile menu
+*/
+
+// Global npm libraries
+import React from 'react'
+import Dropdown from 'react-bootstrap/Dropdown'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faMessage, faUser } from '@fortawesome/free-solid-svg-icons'
+
+function ProfileMenu (props) {
+  const { profile, children, addPrivateMessage, isDm, dmListLoaded } = props
+
+  const handlePrivateMessage = () => {
+    addPrivateMessage(profile)
+  }
+
+  const handleUserProfile = () => {
+    const profileUrl = `${window.location.origin}/profile/${profile.npub}#single-view`
+    window.open(profileUrl, '_blank')
+  }
+
+  return (
+    <>
+      <style>
+        {`
+          .dropdown-toggle-no-arrow::after {
+            display: none !important;
+          }
+        `}
+      </style>
+
+      <Dropdown>
+        <Dropdown.Toggle
+          as='div'
+          className='d-inline-block dropdown-toggle-no-arrow'
+          style={{
+            cursor: 'pointer',
+            '--bs-btn-padding-x': '0',
+            '--bs-btn-padding-y': '0'
+          }}
+        >
+          {children}
+        </Dropdown.Toggle>
+
+        <Dropdown.Menu className='shadow-sm' style={{ minWidth: '180px' }}>
+          <Dropdown.Header className='text-muted fw-bold'>
+            Profile Options
+          </Dropdown.Header>
+          {!isDm && (
+            <Dropdown.Item onClick={handlePrivateMessage} disabled={!dmListLoaded}>
+              <FontAwesomeIcon icon={faMessage} className='me-2' />
+              Private Message
+            </Dropdown.Item>
+          )}
+          <Dropdown.Item onClick={handleUserProfile}>
+            <FontAwesomeIcon icon={faUser} className='me-2' />
+            User Profile
+          </Dropdown.Item>
+        </Dropdown.Menu>
+      </Dropdown>
+    </>
+  )
+}
+
+export default ProfileMenu

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

@@ -11,15 +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 { RelayPool } from 'nostr'
+import FilterDropdown from './filter-dropdown'
 
 // Global variables and constants
 const SERVER = config.dexServer
@@ -31,66 +29,20 @@ function ContentCreators (props) {
 
   const [followList, setFollowList] = useState([])
 
+  // Get the list of profiles followed by the user.
+  // It aggregates all the followers from all the relays.
   const getFollowList = useCallback(async () => {
-    const list = await new Promise((resolve, reject) => {
-      let list = []
-      const { nostrKeyPair } = appData.bchWalletState
+    const { nostrKeyPair } = appData.bchWalletState
 
-      const pool = RelayPool(config.nostrRelays)
-      // const pool = RelayPool([config.nostrRelay])
-      pool.on('open', relay => {
-        relay.subscribe('subid', { limit: 1, kinds: [3], authors: [nostrKeyPair.pubHex] })
-      })
-
-      pool.on('eose', relay => {
-        console.log('Closing Relay')
-        relay.close()
-        /** This ensures to return an empty array if no records are found!
-         *  Applies for new users that don't have a follow list
-        */
-        resolve(list)
-      })
-
-      pool.on('event', (relay, subId, ev) => {
-        console.log('Received event:', ev)
-        list = ev.tags
-        resolve(list)
-      })
-    })
-
-    console.log('Follow List', list)
+    const pubKeyHex = nostrKeyPair.pubHex
+    const list = await appData.nostrQueries.getFollowList(pubKeyHex)
     setFollowList(list)
   }, [appData])
 
-  const loadProfile = useCallback(async (pubKey) => {
-    return new Promise((resolve) => {
-      // const pool = RelayPool(config.nostrRelays)
-      const pool = RelayPool([config.nostrRelay])
-      pool.on('open', relay => {
-        relay.subscribe('subid', { limit: 5, kinds: [0], authors: [pubKey] })
-      })
-
-      pool.on('eose', relay => {
-        console.log('Closing Relay')
-        relay.close()
-        resolve(false)
-      })
-
-      pool.on('event', (relay, subId, ev) => {
-        try {
-          const profile = JSON.parse(ev.content)
-          // console.log('profile', profile)
-          resolve(profile)
-        } catch (error) {
-          resolve(false)
-        }
-      })
-    })
-  }, [])
-
   useEffect(() => {
     const loadCreators = async () => {
       try {
+        console.log('loadCreators()')
         const creatorsRes = await axios.get(`${SERVER}/sm/list/all/0`)
         const creators = creatorsRes.data
         // console.log('creators', creators)
@@ -100,8 +52,9 @@ function ContentCreators (props) {
         for (let i = 0; i < creators.length; i++) {
           try {
             const creator = creators[i]
-            const profile = await loadProfile(creator.pubkey)
-
+            const profileRes = await appData.nostrQueries.getProfile(creator.pubkey)
+            let profile = profileRes
+            if (!profileRes) profile = {}
             // the folowing lines should re-render the ContentCard
             setCreators(prevCreators => {
               const updatedCreators = [...prevCreators]
@@ -121,7 +74,7 @@ function ContentCreators (props) {
       loadCreators()
       getFollowList()
     }
-  }, [loaded, followList, getFollowList, loadProfile])
+  }, [loaded, getFollowList, appData])
 
   const filteredCreators = useCallback(() => {
     if (!creators || creators.length === 0) {
@@ -147,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 && (

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

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

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

@@ -1,13 +1,15 @@
 import React, { useState, useEffect } from 'react'
 import { Spinner } from 'react-bootstrap'
 import { finalizeEvent } from 'nostr-tools/pure'
-import { Relay } from 'nostr-tools/relay'
 import { hexToBytes } from '@noble/hashes/utils'
+import NostrRestClient from '../../../../services/nostr-rest-client.js'
 
 function FollowBtn (props) {
   const [onFetch, setOnFetch] = useState(false)
   const [isFollowing, setIsFollowing] = useState(false)
   const { creator, appData, creatorProfile, followList, refreshFollowList } = props
+  // Initialize REST client for publishing
+  const restClient = new NostrRestClient()
 
   useEffect(() => {
     const isFollowing = followList.find(item => item[1] === creator.pubkey)
@@ -27,8 +29,8 @@ function FollowBtn (props) {
       if (!existing) {
         const creatorName = creatorProfile.name || ''
 
-        // add creator to the list
-        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)

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

@@ -1,6 +1,7 @@
 /**
  * Component for displaying nostr posts
  */
+
 // Global npm libraries
 import React, { useCallback, useEffect, useState } from 'react'
 import { Card, Spinner } from 'react-bootstrap'
@@ -8,74 +9,53 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faUser, faHeart as faHeartSolid } from '@fortawesome/free-solid-svg-icons'
 import { faHeart } from '@fortawesome/free-regular-svg-icons'
 import * as nip19 from 'nostr-tools/nip19'
-import NostrFormat from '../nostr-format'
 import { finalizeEvent } from 'nostr-tools/pure'
-import { Relay } from 'nostr-tools/relay'
 import { hexToBytes } from '@noble/hashes/utils' // already an installed dependency
-import { RelayPool } from 'nostr'
+import NostrRestClient from '../../../../services/nostr-rest-client.js'
+
+// Local libraries
+import CopyOnClick from '../../bch-wallet/copy-on-click.js'
+import NostrFormat from '../nostr-format'
 
 function FeedCard (props) {
   const { post, appData, profiles } = props
   const { nostrKeyPair } = appData.bchWalletState
+  // Initialize REST client for publishing
+  const restClient = new NostrRestClient()
 
   const [profile, setProfile] = useState(profiles[post.pubkey])
 
   const [npub, setNpub] = useState('')
-  const [isClicked, setIsClicked] = useState(false)
   const [isLiked, setIsLiked] = useState(false)
   const [likesCount, setLikesCount] = useState(null)
   const [likesFetched, setLikesFetched] = useState(false)
+  const [profilePictureError, setProfilePictureError] = useState(false)
 
   // function to fetch a post likes reaction
   const handleLikes = useCallback(async (post, userPubKey) => {
     try {
-      const psf = 'wss://nostr-relay.psfoundation.info'
-      const res = await new Promise((resolve) => {
-        let likesCnt = 0
-        let userLikedCnt = 0
-        const pool = RelayPool([psf])
-        pool.on('open', relay => {
-          relay.subscribe('subid', { kinds: [7], '#e': [post.id] })
-        })
+      // Get all post likes events
+      const likesArr = await appData.nostrQueries.getPostLikes(post.id)
+      const likesCount = likesArr.length
 
-        pool.on('eose', relay => {
-          relay.close()
-          resolve({
-            count: likesCnt,
-            userLiked: userLikedCnt > 0
-          })
-        })
-
-        pool.on('event', (relay, subId, ev) => {
-          try {
-            // Count likes
-            if (ev.content === '+') {
-              likesCnt++
-              // Count user likes
-              if (ev.pubkey === userPubKey) {
-                userLikedCnt++
-              }
-            }
-            // Count dislikes
-            if (ev.content === '-') {
-              likesCnt--
-              // Count user dislikes.
-              if (ev.pubkey === userPubKey) {
-                userLikedCnt--
-              }
-            }
-          } catch (error) {
-            // skip error
-          }
-        })
-      })
-      setLikesCount(res.count)
-      setIsLiked(res.userLiked)
+      // Verify if the users pubkey is in the likes array
+      const userLikedPost = likesArr.find(val => { return val.pubkey === userPubKey })
+      setLikesCount(likesCount)
+      setIsLiked(userLikedPost)
       setLikesFetched(true)
     } catch (error) {
       console.warn(error)
     }
-  }, [])
+  }, [appData])
+
+  const handleProfilePictureError = () => {
+    setProfilePictureError(true)
+  }
+
+  const handleProfilePictureLoad = () => {
+    setProfilePictureError(false)
+  }
+
   // Get npub from pubkey
   useEffect(() => {
     const npub = nip19.npubEncode(post.pubkey)
@@ -94,13 +74,6 @@ function FeedCard (props) {
     }
   }, [profiles, post])
 
-  // copy to clipboard
-  const copyToClipboard = useCallback((value) => {
-    setIsClicked(true)
-    appData.appUtil.copyToClipboard(value)
-    setTimeout(() => setIsClicked(false), 200)
-  }, [appData])
-
   // get short npub
   const getShortNpub = useCallback((npub) => {
     return npub.slice(0, 8) + '...' + npub.slice(-5)
@@ -116,9 +89,6 @@ function FeedCard (props) {
       // Convert private key to binary
       const privateKeyBin = hexToBytes(nostrKeyPair.privHex)
 
-      // Relay list
-      const psf = 'wss://nostr-relay.psfoundation.info'
-
       // Define if like or dislike
       let content = '+'
       if (isLiked) { content = '-' }
@@ -128,8 +98,8 @@ function FeedCard (props) {
         kind: 7,
         created_at: Math.floor(Date.now() / 1000),
         tags: [
-          ['e', post.id, psf],
-          ['p', psf, nostrKeyPair.pubHex]
+          ['e', post.id],
+          ['p', nostrKeyPair.pubHex]
         ],
         content
       }
@@ -139,16 +109,18 @@ function FeedCard (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 like via REST API (handles broadcasting to multiple relays)
+      try {
+        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()
+        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)
@@ -158,6 +130,11 @@ function FeedCard (props) {
     }
   }
 
+  const goToProfile = () => {
+    const profileUrl = `${window.location.origin}/profile/${npub}#single-view`
+    window.open(profileUrl, '_blank')
+  }
+
   return (
     <Card className='mb-4 bg-light rounded-4 shadow-sm border-0'>
       <Card.Body className='p-3'>
@@ -170,13 +147,27 @@ function FeedCard (props) {
               background: 'linear-gradient(45deg, #6c757d, #495057)'
             }}
           >
-            <FontAwesomeIcon icon={faUser} size='1x' color='#7c7c7d' />
+            {profile?.picture && !profilePictureError
+              ? (
+                <img
+                  src={profile.picture}
+                  alt='Profile'
+                  className='rounded-circle w-100 h-100'
+                  style={{ objectFit: 'cover', cursor: 'pointer' }}
+                  onError={handleProfilePictureError}
+                  onLoad={handleProfilePictureLoad}
+                  onClick={goToProfile}
+                />
+                )
+              : (
+                <FontAwesomeIcon icon={faUser} size='1x' color='#7c7c7d' style={{ cursor: 'pointer' }} onClick={goToProfile} />
+                )}
           </div>
           <div className='flex-grow-1'>
             <div className='fw-bold mb-1'>
-              {profile && profile.name && <span>{profile.name}</span>}
+              {profile && profile.name && <span style={{ cursor: 'pointer' }} onClick={goToProfile}>{profile.name}</span>}
               {!profile?.name && (
-                <span>
+                <span style={{ cursor: 'pointer' }} onClick={goToProfile}>
                   {post.pubkey.slice(0, 8) + '...'}
                   {!profile?.loaded && <Spinner animation='border' size='sm' className='ms-2' />}
                 </span>
@@ -188,14 +179,20 @@ function FeedCard (props) {
                   title='Copy to clipboard'
                   style={{
                     cursor: 'pointer',
-                    transform: isClicked ? 'scale(0.95)' : 'scale(1)',
                     transition: 'transform 0.1s ease',
-                    display: 'inline-block'
+                    display: 'inline-block',
+                    marginRight: '5px'
                   }}
-                  onClick={() => copyToClipboard(npub)}
+                  onClick={goToProfile}
+
                 >
                   {getShortNpub(npub)}
                 </span>
+                <CopyOnClick
+                  walletProp='npub'
+                  appData={props.appData}
+                  value={npub}
+                />
               </small>
             )}
           </div>

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

@@ -4,41 +4,21 @@
 // Global npm libraries
 import React, { useEffect, useState } from 'react'
 import { Container, Spinner } from 'react-bootstrap'
-import { RelayPool } from 'nostr'
 
 // Local libraries
-import config from '../../../../config'
 import FeedCard from './feed-card'
 
 function Following (props) {
   const { appData, posts, profiles } = props
+  const { nostrQueries } = appData
   const [followingPosts, setFollowingPosts] = useState([])
   const [loaded, setLoaded] = useState(false)
 
   useEffect(() => {
     const getFollowingPosts = async () => {
-      const followingList = await new Promise((resolve, reject) => {
-        let list = []
-        const { nostrKeyPair } = appData.bchWalletState
-
-        const pool = RelayPool(config.nostrRelays)
-        pool.on('open', relay => {
-          relay.subscribe('subid', { limit: 1, kinds: [3], authors: [nostrKeyPair.pubHex] })
-        })
-
-        pool.on('eose', relay => {
-          relay.close()
-          /** This ensures to return an empty array if no records are found!
-           *  Applies for new users that don't have a follow list
-          */
-          resolve(list)
-        })
-
-        pool.on('event', (relay, subId, ev) => {
-          list = ev.tags
-          resolve(list)
-        })
-      })
+      console.log('getFollowingPosts')
+      const { nostrKeyPair } = appData.bchWalletState
+      const followingList = await nostrQueries.getFollowList(nostrKeyPair.pubHex)
 
       // Filter posts by following list
       let filteredPosts = []
@@ -55,7 +35,7 @@ function Following (props) {
       setLoaded(true)
     }
     getFollowingPosts()
-  }, [appData, posts])
+  }, [appData, posts, nostrQueries])
 
   return (
     <Container className='mt-4 mb-5' style={{ marginBottom: '50px' }}>

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

@@ -3,95 +3,52 @@
 */
 
 // Global npm libraries
-import React, { useState, useEffect, useCallback } from 'react'
+import React, { useState, useEffect } from 'react'
 import { Container, Nav, Tab, Spinner } from 'react-bootstrap'
-import { RelayPool } from 'nostr'
 
 // Local libraries
 import Feed from './feed'
 import Following from './following'
-import config from '../../../../config'
 
 function Feeds (props) {
   const { appData } = props
   const [activeTab, setActiveTab] = useState(appData.lastFeedTab)
 
-  const { bchWalletState } = appData
   const [posts, setPosts] = useState([])
   const [loaded, setLoaded] = useState(false)
   const [profiles, setProfiles] = useState({})
 
-  // function to fetch profile and set it to profiles state
-  const fetchProfile = useCallback((pubkey) => {
-    // no fetch profile again if it exist
-    setProfiles(currentProfiles => {
-      if (currentProfiles[pubkey]) {
-        return currentProfiles
-      }
-      return currentProfiles
-    })
+  // Load data on component mount.
+  useEffect(() => {
+    const loadData = async () => {
+      // Get feeds
+      const feeds = await appData.nostrQueries.getGlobalFeeds()
+      setPosts(feeds)
+      setLoaded(true)
 
-    const pool = RelayPool(config.nostrRelays)
-    pool.on('open', relay => {
-      relay.subscribe('subid', { limit: 5, kinds: [0], authors: [pubkey] })
-    })
+      const loadedProfiles = [] // fetched profiles ( this will be used for prevent load the same profile multiple times.)
+      // Map feeds and get feed owner profile.
+      for (let i = 0; i < feeds.length; i++) {
+        const pubKey = feeds[i].pubkey
 
-    pool.on('eose', relay => {
-      relay.close()
-      try {
-      // Mark unknown profiles. From this way we can know which profile was fetched and not found.
-        setProfiles(currentProfiles => {
-          if (!currentProfiles[pubkey]) {
-            const newProfiles = { ...currentProfiles }
-            newProfiles[pubkey] = { loaded: true }
-            return newProfiles
-          }
-          return currentProfiles
-        })
-      } catch (error) {
-        // skip error
-      }
-    })
+        const exist = loadedProfiles.find((val) => { return val === pubKey })
+        if (exist) { continue }
+        // Fech profile.
+        const profile = await appData.nostrQueries.getProfile(pubKey)
+        loadedProfiles.push(pubKey) // mark as loaded
 
-    pool.on('event', (relay, subId, ev) => {
-      try {
-        // update profiles data
-        const profile = JSON.parse(ev.content)
+        // Update profile state
         setProfiles(currentProfiles => {
           const newProfiles = { ...currentProfiles }
-          newProfiles[pubkey] = profile
+          newProfiles[pubKey] = profile
           return newProfiles
         })
-      } catch (error) {
-        // skip error
       }
-    })
-  }, [])
-
-  // Get global feed posts
-  useEffect(() => {
-    const start = () => {
-      const pool = RelayPool(config.nostrRelays)
-      pool.on('open', relay => {
-        relay.subscribe('REQ', { limit: 10, kinds: [1], '#t': ['slpdex-socialmedia'] })
-      })
-
-      pool.on('eose', relay => {
-        setLoaded(true)
-        relay.close()
-      })
-
-      pool.on('event', async (relay, subId, ev) => {
-        setPosts(currentPosts => [...currentPosts, ev])
-        // fetch post profile and set it to profiles state
-        fetchProfile(ev.pubkey)
-      })
     }
-
     if (!loaded) {
-      start()
+      loadData()
     }
-  }, [bchWalletState, loaded, fetchProfile])
+  }, [loaded, appData])
 
   const onChangeTab = (tab) => {
     setActiveTab(tab)

src/components/app-body/nostr/nostr-format.js

@@ -26,7 +26,7 @@ const NostrFormat = ({ content }) => {
   }
 
   return (
-    <div dangerouslySetInnerHTML={{ __html: formatContent(content) }} />
+    <div style={{ overflow: 'auto' }} dangerouslySetInnerHTML={{ __html: formatContent(content) }} />
   )
 }
 

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

@@ -7,15 +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 { RelayPool } from 'nostr'
+import NostrRestClient from '../../../../services/nostr-rest-client.js'
 
 // Local libraries
-import config from '../../../../config'
 
 function ProfilePost (props) {
-  const { bchWalletState } = props.appData
+  const { appData } = props
+  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)
@@ -34,40 +35,19 @@ function ProfilePost (props) {
 
   useEffect(() => {
     // Get Last post from
-    const getLastPost = () => {
-      const { nostrKeyPair } = bchWalletState
-
-      const psf = 'wss://nostr-relay.psfoundation.info'
-
-      const pool = RelayPool([psf])
-      pool.on('open', relay => {
-        relay.subscribe('subid', { limit: 1, kinds: [0], authors: [nostrKeyPair.pubHex] })
-        setFormLoaded(true)
-      })
-
-      pool.on('eose', relay => {
-        console.log('Closing Relay')
-        setFormLoaded(true)
-        relay.close()
-      })
-
-      pool.on('event', (relay, subId, ev) => {
-        console.log('Received event:', ev)
-        // setPosts(currentPosts => [...currentPosts, ev])
-        try {
-          const data = JSON.parse(ev.content)
-          console.log('data', data)
-          setFormData(data)
-        } catch (error) {
-
-        }
-      })
+    const getLastProfilePost = async () => {
+      const { nostrKeyPair } = appData.bchWalletState
+      const lastProfile = await appData.nostrQueries.getProfile(nostrKeyPair.pubHex)
+      if (lastProfile) {
+        setFormData(lastProfile)
+      }
+      setFormLoaded(true)
     }
 
     if (!formLoaded) {
-      getLastPost()
+      getLastProfilePost()
     }
-  }, [bchWalletState, formLoaded])
+  }, [appData, formLoaded])
 
   const handleInputChange = (e) => {
     const { name, value } = e.target
@@ -110,23 +90,13 @@ function ProfilePost (props) {
       const signedEvent = finalizeEvent(eventTemplate, privateKeyBin)
       console.log('signedEvent: ', signedEvent)
 
-      // Publish the post to each relay.
-      config.nostrRelays.map(async (relayUrl) => {
-        try {
-          // Connect to a relay.
-          const relay = await Relay.connect(relayUrl)
-          console.log(`connected to ${relay.url}`)
+      // Publish the 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)

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

@@ -7,16 +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
-import config from '../../../../config'
 
 function PublicPost (props) {
   const [accordionKey, setAccordionKey] = useState('0')
   const [onFetch, setOnFetch] = useState(false)
   const { bchWalletState } = props.appData
+  // Initialize REST client for publishing
+  const restClient = new NostrRestClient()
   const [formData, setFormData] = useState({
     content: ''
   })
@@ -63,23 +64,13 @@ function PublicPost (props) {
       const signedEvent = finalizeEvent(eventTemplate, privateKeyBin)
       console.log('signedEvent: ', signedEvent)
 
-      // Publish the post to each relay.
-      config.nostrRelays.map(async (relayUrl) => {
-        try {
-          // Connect to a relay.
-          const relay = await Relay.connect(relayUrl)
-          console.log(`connected to ${relay.url}`)
+      // Publish the 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!')

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

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

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

@@ -8,19 +8,13 @@ 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)
   const [iconsAreLoaded, setIconsAreLoaded] = useState(false)
   const [dataAreLoaded, setDataAreLoaded] = useState(false)
-
-  const getAddressByNpub = useCallback(async () => {
-    const url = `${config.dexServer}/sm/npub/${npub}`
-    const response = await axios.get(url)
-    const addr = response.data.bchAddr
-    return addr
-  }, [npub])
+  const [startAsync, setStartAsync] = useState(false)
 
   // Handler for refresh button
   const handleRefresh = () => {
@@ -46,12 +40,37 @@ function NFTForSale (props) {
     }
   }, [appData])
 
+  // Function to process token metadata (iconUrl , userData , tokenData).
+  const processOfferMetadata = useCallback(async (offer) => {
+    try {
+      // Token icon
+      if (offer.tokenIconUrl) {
+        offer.icon = offer.tokenIconUrl
+        offer.iconAlreadyDownloaded = true
+        offer.userData = JSON.parse(offer.userDataStr)
+        offer.mutableFromBackend = true
+        offer.mutableDataSource = 'backend'
+      }
+      // tokenData
+      if (offer.tokenData) {
+        offer.tokenDataFromBackend = true
+        offer.tokenDataSource = 'backend'
+      }
+
+      return offer
+    } catch (error) {
+      return offer
+    }
+  }, [])
+
   //  Fetch offers
   const getNftOffers = useCallback(async (page = 0) => {
     try {
       setOffersAreLoaded(false)
-      const addr = await getAddressByNpub(npub)
-      const url = `${config.dexServer}/offer/list/addr/${addr}`
+      const { 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)
@@ -61,7 +80,8 @@ function NFTForSale (props) {
       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)
@@ -72,7 +92,7 @@ function NFTForSale (props) {
       setOffersAreLoaded(true)
       throw err
     }
-  }, [processTokenData, getAddressByNpub, npub])
+  }, [processTokenData, processOfferMetadata, profileAddresses])
 
   //  This function loads the token data .
   const lazyLoadTokenData = useCallback(async (tokens) => {
@@ -82,8 +102,10 @@ function NFTForSale (props) {
       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
+        // Skip if already has tokenData (from backend or cache)
+        if (thisToken.dataAlreadyDownloaded || thisToken.tokenData) {
+          continue
+        }
 
         // Try to get token data.
         const tokenData = await appData.wallet.getTokenData(thisToken.tokenId)
@@ -91,6 +113,7 @@ function NFTForSale (props) {
         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.tokenDataSource = 'blockchain'
         }
 
         // Mark token to prevent fetch token data again.
@@ -149,7 +172,8 @@ 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
+          thisToken.mutableDataSource = 'blockchain'
         }
 
         // Mark token to prevent fetch token icon again.
@@ -165,15 +189,23 @@ function NFTForSale (props) {
   //  Check if token data exists in the cache and add it to the tokens object.
   const reviewNftCachedData = useCallback(async (offers) => {
     const cacheData = appData.nftForSaleCacheData
-    console.log(`Token data from cache: ${JSON.stringify(cacheData, null, 2)}`)
+    // console.log(`Token data from cache: ${JSON.stringify(cacheData, null, 2)}`)
+
     // Map all offers
     for (let i = 0; i < offers.length; i++) {
       const thisToken = offers[i]
+      // console.log(`Review offers:`,thisToken)
+
       const cacheToken = cacheData[thisToken.tokenId]
       // If cache data exists, add it to the token object
-      if (cacheToken) {
-        thisToken.tokenData = cacheToken.tokenData
+      // Only use cache if backend didn't provide the data
+      if (cacheToken && !thisToken.icon) {
         thisToken.icon = cacheToken.tokenIcon
+        thisToken.mutableDataSource = 'cache'
+      }
+      if (cacheToken && !thisToken.tokenData) {
+        thisToken.tokenData = cacheToken.tokenData
+        thisToken.tokenDataSource = 'cache'
       }
     }
   }, [appData])
@@ -183,13 +215,17 @@ function NFTForSale (props) {
     // Map all offers
     for (let i = 0; i < offers.length; i++) {
       const thisToken = offers[i]
-      // save token icon and token data in cache
-      const newTokenCacheData = {
-        tokenIcon: thisToken.icon,
-        tokenData: thisToken.tokenData
-      }
 
-      console.log('newTokenCacheData: ', newTokenCacheData)
+      // Only cache if we fetched it ourselves (not from backend)
+      // Backend data is already "cached" server-side, no need to duplicate
+
+      if (thisToken.tokenDataFromBackend && thisToken.mutableFromBackend) continue
+
+      const newTokenCacheData = {}
+
+      if (!thisToken.tokenDataFromBackend) newTokenCacheData.tokenData = thisToken.tokenData
+      if (!thisToken.mutableFromBackend) newTokenCacheData.tokenIcon = thisToken.icon
+
       appData.updateNFTCachedData(thisToken.tokenId, newTokenCacheData)
     }
   }, [appData])
@@ -197,6 +233,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)
@@ -214,13 +251,17 @@ 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(() => {
-    console.log('loading nfts for sale')
-    loadNftOffers()
-  }, [loadNftOffers])
+    // Prevent to load data twice
+    if (!startAsync) {
+      console.log('loading nfts for sale')
+      loadNftOffers()
+      setStartAsync(true)
+    }
+  }, [loadNftOffers, startAsync])
 
   // Get Cid from url
   const parseCid = (url) => {

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

@@ -1,6 +1,8 @@
 /**
- * Component for read nostr information kind 0
+ * Component to read nostr information kind 0 (normal posts)
+ *
  */
+
 // Global npm libraries
 import React, { useEffect, useState } from 'react'
 import { Container, Button } from 'react-bootstrap'
@@ -8,46 +10,30 @@ 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 config from '../../../../config'
 import NostrFormat from '../nostr-format'
-import { RelayPool } from 'nostr'
 
 function ProfileRead (props) {
-  const { npub } = props
-  const { setProfile } = props
-  const [post, setPost] = useState({})
+  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 = () => {
+    const start = async () => {
       const pubHexData = nip19.decode(npub)
       const pubHex = pubHexData.data
-
-      const pool = RelayPool(config.nostrRelays)
-      pool.on('open', relay => {
-        relay.subscribe('subid', { limit: 5, kinds: [0], authors: [pubHex] })
-        setLoaded(true)
-      })
-
-      pool.on('eose', relay => {
-        console.log('Closing Relay')
-        relay.close()
-      })
-
-      pool.on('event', (relay, subId, ev) => {
-        console.log('Received event:', ev)
-        try {
-          const profile = JSON.parse(ev.content)
-          console.log('Profile:', profile)
-          setPost(profile)
-          setProfile(profile)
-        } catch (error) {
-          console.error('Error parsing profile:', error)
-        }
-      })
+      setPubKey(pubHex)
+      const profile = await appData.nostrQueries.getProfile(pubHex)
+      if (profile) {
+        onProfileRead(profile)
+        setProfile(profile)
+      }
 
       setLoaded(true)
     }
@@ -55,7 +41,7 @@ function ProfileRead (props) {
     if (!loaded && npub) {
       start()
     }
-  }, [loaded, setProfile, npub])
+  }, [loaded, onProfileRead, npub, appData])
 
   const handleImageError = (type) => {
     setImageError(prev => ({ ...prev, [type]: true }))
@@ -65,13 +51,20 @@ 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 */}
-      {post.banner && !imageError.banner && (
+      {profile.banner && !imageError.banner && (
         <div className='position-relative'>
           <img
-            src={post.banner}
+            src={profile.banner}
             alt='Profile banner'
             className='w-100 rounded-4 shadow-sm'
             style={{ height: '200px', objectFit: 'cover' }}
@@ -84,10 +77,10 @@ function ProfileRead (props) {
       <div className='d-flex flex-column flex-md-row align-items-center gap-4 mb-5 p-3 p-md-5 bg-light rounded-4 shadow-sm'>
         {/* Profile Picture */}
         <div style={{ width: '120px', height: '120px' }} className='mb-3 mb-md-0'>
-          {post.picture && !imageError.picture
+          {profile.picture && !imageError.picture
             ? (
               <img
-                src={post.picture}
+                src={profile.picture}
                 alt='Profile'
                 className='rounded-circle shadow w-100 h-100'
                 style={{ objectFit: 'cover' }}
@@ -111,7 +104,7 @@ function ProfileRead (props) {
 
         {/* Profile Information */}
         <div className='flex-grow-1 text-center text-md-start mb-3 mb-md-0 d-flex flex-column align-items-center align-items-md-start'>
-          <h3 className='mb-2 fw-bold'>{post.name || 'username'}</h3>
+          <h3 className='mb-2 fw-bold'>{profile.name || 'username'}</h3>
 
           <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'>
@@ -124,26 +117,52 @@ 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 */}
-          {post.about && (
+          {profile.about && (
             <div className='fs-6 text-secondary'>
-              <NostrFormat content={post.about} />
+              <NostrFormat content={profile.about} />
             </div>
           )}
 
           {/* Website Link */}
-          {post.website && (
+          {profile.website && (
             <div className='mb-3 d-flex align-items-center gap-2'>
               <FontAwesomeIcon icon={faGlobe} className='text-muted' size='sm' />
               <a
-                href={post.website.startsWith('http') ? post.website : `https://${post.website}`}
+                href={profile.website.startsWith('http') ? profile.website : `https://${profile.website}`}
                 target='_blank'
                 rel='noopener noreferrer'
                 className='text-decoration-none text-muted small'
                 style={{ wordBreak: 'break-all' }}
               >
-                {post.website}
+                {profile.website}
               </a>
             </div>
           )}
@@ -163,6 +182,8 @@ function ProfileRead (props) {
             variant='primary'
             className='px-3 px-md-4 py-2 rounded-pill fw-semibold'
             style={{ minWidth: '120px' }}
+            onClick={handleMessage}
+            disabled={!loaded}
           >
             <i className='bi bi-chat-dots me-2' />
             Message

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

@@ -6,48 +6,38 @@ import React, { useEffect, useState } from 'react'
 import { Container, Card, Spinner } from 'react-bootstrap'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faUser } from '@fortawesome/free-solid-svg-icons'
-import { RelayPool } from 'nostr'
-import * as nip19 from 'nostr-tools/nip19'
 
 // Local libraries
-import config from '../../../../config'
 import NostrFormat from '../nostr-format'
 
 function PublicRead (props) {
-  const { npub } = props
-  const { bchWalletState } = props.appData
+  const { npub, appData } = props
+  const { bchWalletState } = appData
   const [posts, setPosts] = useState([])
   const [loaded, setLoaded] = useState(false)
+  const [profilePictureError, setProfilePictureError] = useState(false)
 
   useEffect(() => {
     // Get Last post from a author
-    const start = () => {
-      const pubHexData = nip19.decode(npub)
-      const pubHex = pubHexData.data
-      console.log('pubhex', pubHex)
-
-      const pool = RelayPool(config.nostrRelays)
-      pool.on('open', relay => {
-        relay.subscribe('subid', { limit: 5, kinds: [1], authors: [pubHex] })
-        setLoaded(true)
-      })
-
-      pool.on('eose', relay => {
-        console.log('Closing Relay')
-        setLoaded(true)
-        relay.close()
-      })
-
-      pool.on('event', (relay, subId, ev) => {
-        console.log('Received event:', ev)
-        setPosts(currentPosts => [...currentPosts, ev])
-      })
+    const start = async () => {
+      const pubKeyHex = appData.nostrQueries.npubToHex(npub)
+      const feeds = await appData.nostrQueries.getUserFeeds(pubKeyHex)
+      setPosts(feeds)
+      setLoaded(true)
     }
 
     if (!loaded && npub) {
       start()
     }
-  }, [bchWalletState, loaded, npub])
+  }, [bchWalletState, loaded, npub, appData])
+
+  const handleProfilePictureError = () => {
+    setProfilePictureError(true)
+  }
+
+  const handleProfilePictureLoad = () => {
+    setProfilePictureError(false)
+  }
 
   return (
     <Container className='mt-4 mb-5'>
@@ -76,7 +66,20 @@ function PublicRead (props) {
                       background: 'linear-gradient(45deg, #6c757d, #495057)'
                     }}
                   >
-                    <FontAwesomeIcon icon={faUser} size='1x' color='#7c7c7d' />
+                    {props.profile?.picture && !profilePictureError
+                      ? (
+                        <img
+                          src={props.profile.picture}
+                          alt='Profile'
+                          className='rounded-circle w-100 h-100'
+                          style={{ objectFit: 'cover' }}
+                          onError={handleProfilePictureError}
+                          onLoad={handleProfilePictureLoad}
+                        />
+                        )
+                      : (
+                        <FontAwesomeIcon icon={faUser} size='1x' color='#7c7c7d' />
+                        )}
                   </div>
                   <div className='flex-grow-1'>
                     <div className='fw-bold mb-1'>{props.profile?.name}</div>

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

@@ -14,8 +14,8 @@ function SignMessage (props) {
 
   const [sign, setSign] = useState('')
   const [msg, setMsg] = useState('')
-  const [bchAddr] = useState(wallet.walletInfo.cashAddress)
-  const [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)
 

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

@@ -13,11 +13,17 @@ import TokenCard from './token-card'
 import RefreshTokenBalance from './refresh-tokens'
 
 const SlpTokens = (props) => {
-  const [appData, setAppData] = useState(props.appData)
+  const { appData } = props
   const [iconsAreLoaded, setIconsAreLoaded] = useState(false)
+  const [dataAreLoaded, setDataAreLoaded] = useState(false)
   const [tokens, setTokens] = useState([])
 
   const refreshTokenButtonRef = React.useRef()
+  const { slpInitLoaded, asyncBackgroundFinished } = props.appData.asyncBackGroundInitState
+
+  // Background bch data loaded finished
+  const backgroundDataLoaded = slpInitLoaded || asyncBackgroundFinished
+  const backgroundDataError = !slpInitLoaded && asyncBackgroundFinished
 
   // Update the tokens state when the appData changes
   useEffect(() => {
@@ -30,8 +36,7 @@ const SlpTokens = (props) => {
   // within the wallet app.
   // This function triggers the on-click function within the refresh-tokens.js button.
   const refreshTokens = async () => {
-    const newAppData = await refreshTokenButtonRef.current.handleRefreshTokenBalance()
-    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>
     </>

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

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

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

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

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

@@ -105,30 +105,6 @@ const SweepWif = (props) => {
     }
   }
 
-  const handleCancelCounterOffers = async () => {
-    try {
-      console.log('Executing handleCancelCounterOffers()')
-
-      // Set modal initial state
-      // setShowModal(true)
-      // setHideSpinner(false)
-      // setStatusMsg('')
-
-      // Get the keypair that holds Counter Offer UTXOs.
-      const bchDexLib = appData.dexLib
-      const keyPair = await bchDexLib.take.util.getKeyPair(1)
-      const wif = keyPair.wif
-      // console.log(`WIF: ${wif}`)
-
-      // Sweep the private key holding the Counter Offer UTXOs.
-      setWifToSweep(wif)
-
-      await handleSweep()
-    } catch (err) {
-      console.error('Error in handleCancelCounterOffers(): ', err)
-    }
-  }
-
   // Modal component
   const getModal = () => (
     <Modal show={showModal} size='lg' onHide={() => setShowModal(false)}>
@@ -207,28 +183,6 @@ const SweepWif = (props) => {
           </Col>
         </Row>
 
-        <br />
-        <br />
-        <hr />
-
-        <Row>
-          <Col>
-            <p>
-              When a Buy order is created, the coins (UTXO) to pay for it are
-              moved to a secondary address. Clicking the button below will
-              sweep those funds back into this main wallet. This will also
-              cancel/invalidate all open Counter Offers that you've created.
-            </p>
-          </Col>
-        </Row>
-
-        <Row style={{ textAlign: 'center' }}>
-          <Col>
-            <Button onClick={handleCancelCounterOffers}>
-              Sweep DEX Trading Wallet
-            </Button>
-          </Col>
-        </Row>
       </Container>
       {showModal && getModal()}
     </>

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

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

src/components/nav-menu/index.js

@@ -51,13 +51,21 @@ function NavMenu (props) {
               </NavLink>
 
               <NavLink
-                className={currentPath === '/offers' ? 'nav-link-active' : 'nav-link-inactive'}
-                to='/offers'
+                className={currentPath === '/fungible' ? 'nav-link-active' : 'nav-link-inactive'}
+                to='/fungible'
                 onClick={handleClickEvent}
               >
                 Fungible Tokens
               </NavLink>
 
+              <NavLink
+                className={currentPath === '/counter-offers' ? 'nav-link-active' : 'nav-link-inactive'}
+                to='/counter-offers'
+                onClick={handleClickEvent}
+              >
+                Counter Offers
+              </NavLink>
+
               <hr />
 
               <NavLink
@@ -88,6 +96,13 @@ function NavMenu (props) {
               >
                 Content Creators
               </NavLink>
+              <NavLink
+                className={currentPath === '/nostr-chat' ? 'nav-link-active' : 'nav-link-inactive'}
+                to='/nostr-chat'
+                onClick={handleClickEvent}
+              >
+                Nostr Chat
+              </NavLink>
 
               <hr />
 

src/components/starter-views.js

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

src/config/index.js

@@ -14,15 +14,26 @@ const config = {
   ghRepo: 'https://github.com/Permissionless-Software-Foundation/bch-dex-taker-v2',
   radicleUrl: 'https://app.radicle.network/seeds/maple.radicle.garden/rad:git:hnrkd5cjwwb5tzx37hq9uqm5ubon7ee468xcy/remotes/hyyycncbn9qzqmobnhjq9rry6t4mbjiadzjoyhaknzxjcz3cxkpfpc',
 
-  dexServer: 'https://dex-api.fullstack.cash',
+  // dexServer: 'https://dex-api.fullstackcash.net',
   // dexServer: 'http://localhost:5700',
+  dexServer: process.env.REACT_APP_DEX_SERVER || 'https://dex-api.fullstackcash.net',
 
   nostrTopic: 'bch-dex-test-topic-02',
-  nostrRelay: 'wss://nostr-relay.psfoundation.info',
+
+  // REST API endpoint for Nostr relay interactions (primary interface)
+  nostrRestApiUrl:
+    process.env.REACT_APP_NOSTR_REST_API_URL ||
+    'https://nostr-relay-api.psfoundation.info',
+
+  // Legacy relay URLs kept for reference (may be used in tags, but actual connections use REST API)
+  nostrRelay: 'wss://nostr.fullstackcash.net',
   nostrRelays: [
-    'wss://nostr-relay.psfoundation.info',
+    'wss://nostr.fullstackcash.net',
     'wss://nos.lol',
     'wss://relay.damus.io'
+  ],
+  chatsId: [
+    '32b0ebc01c984008977fbe476e064946990df75525331b24b37bbba5e89f4039'
   ]
 
 }

src/hooks/state.js

@@ -1,25 +1,31 @@
-import { useState } from 'react'
+import { useRef, useState } from 'react'
 // import { useQueryParam, StringParam } from 'use-query-params'
 import useLocalStorageState from 'use-local-storage-state'
 import AppUtil from '../util'
+import NostrQueries from '../services/nostr-queries'
 
 import { useLocation } from 'react-router-dom'
 
 function useAppState () {
   const location = useLocation()
-
+  // Default local storage object
+  const localStorageDefault = {
+    serverUrl: 'https://free-bch.fullstack.cash', // Default server
+    relays: [
+      { address: 'wss://nostr-relay.psfoundation.info', read: true, write: true },
+      { address: 'wss://relay.damus.io', read: true, write: true }
+    ],
+    nftData: {},
+    lastFeedTab: 'feed'
+  }
   // Load Local storage Data
   const [lsState, setLSState, { removeItem }] = useLocalStorageState('bchWalletState-template', {
     ssr: true,
-    defaultValue: {
-      serverUrl: 'https://free-bch.fullstack.cash' // Default server
-    },
-    nftData: {},
-    lastFeedTab: 'feed'
+    defaultValue: localStorageDefault
+
   })
 
   console.log('lsState: ', lsState)
-
   // Initialize  data states
   const [serverUrl, setServerUrl] = useState(lsState.serverUrl) // Default server url
   const [menuState, setMenuState] = useState(0)
@@ -27,7 +33,7 @@ function useAppState () {
   const [servers, setServers] = useState([])
   const [dexLib, setDexLib] = useState(false)
   const [nostr, setNostr] = useState(false)
-  const [lastFeedTab, setLastFeedTab] = useState(lsState.lastFeedTab || 'feed')
+  const [lastFeedTab, setLastFeedTab] = useState(lsState.lastFeedTab || localStorageDefault.lastFeedTab)
 
   // Startup state management
   const [asyncInitStarted, setAsyncInitStarted] = useState(false)
@@ -41,9 +47,25 @@ 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 || {})
 
+  // Relays
+  const [relaysData, setRelaysData] = useState(lsState.relays || localStorageDefault.relays) // All relays data
+  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 (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.
   // properties are enumerated here for the purpose of documentation.
@@ -96,7 +118,7 @@ function useAppState () {
         return newBchWalletState
       })
 
-    // console.log(`New wallet state: ${JSON.stringify(bchWalletState, null, 2)}`)
+      // console.log(`New wallet state: ${JSON.stringify(bchWalletState, null, 2)}`)
     } catch (err) {
       console.error('Error in App.js updateBchWalletState()')
       throw err
@@ -114,6 +136,60 @@ function useAppState () {
     updateLocalStorage({ nftData: allCacheData }) // Update the local storage
   }
 
+  // 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
+    // get the relay addresses with read set to true
+    const readRelays = relaysData.filter(relay => relay.read).map(relay => relay.address)
+    setReadRelays(readRelays)
+    console.log('readRelays: ', readRelays)
+    // get the relay addresses with write set to true
+    const writeRelays = relaysData.filter(relay => relay.write).map(relay => relay.address)
+    setWriteRelays(writeRelays)
+    console.log('writeRelays: ', writeRelays)
+    // 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 (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)
+    updateLocalStorage({ relays: relaysData })
+    // get the relay addresses with read set to true
+    const readRelays = relaysData.filter(relay => relay.read).map(relay => relay.address)
+    setReadRelays(readRelays)
+    console.log('readRelays: ', readRelays)
+    // get the relay addresses with write set to true
+    const writeRelays = relaysData.filter(relay => relay.write).map(relay => relay.address)
+    setWriteRelays(writeRelays)
+    console.log('writeRelays: ', writeRelays)
+    // 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 {
     serverUrl,
     setServerUrl,
@@ -156,7 +232,17 @@ function useAppState () {
     lastFeedTab,
     setLastFeedTab,
     isSingleView,
-    setIsSingleView
+    setIsSingleView,
+    nostrQueries: nostrQueriesRef.current,
+    relaysData,
+    updateRelaysData,
+    restoreRelaysData,
+    readRelays,
+    writeRelays,
+    startChannelChat,
+    setStartChannelChat,
+    asyncBackGroundInitState,
+    updateBackGroundInitState
   }
 }
 

src/services/async-load.js

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

src/services/nostr-queries.js

@@ -0,0 +1,428 @@
+/**
+ *  Nostr class for query into relay pools
+ *  Refactored to use REST API instead of WebSocket
+ */
+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 }) {
+    // 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) {
+    // No-op for backward compatibility (REST API handles relays server-side)
+    this.relays = []
+  }
+
+  npubToHex (npub) {
+    const pubHexData = nip19.decode(npub)
+    const pubHex = pubHexData.data
+    return pubHex
+  }
+
+  hexToNpub (hex) {
+    return nip19.npubEncode(hex)
+  }
+
+  // Load profile from nostr relays via REST API
+  async getProfile (pubHex) {
+    try {
+      const existingProfile = this.loadedProfiles[pubHex]
+      if (existingProfile) {
+        console.log(`Returning profile from cache :  ${existingProfile.name}`)
+        return existingProfile
+      }
+
+      const subId = generateSubId('profile')
+      const filter = { limit: 5, kinds: [0], authors: [pubHex] }
+
+      const events = await this.restClient.queryEvents(subId, filter)
+
+      // 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 fetching profile for ${pubHex}:`, error)
+      return false
+    }
+  }
+
+  // Get Feeds by user pubkey via REST API
+  async getUserFeeds (pubHex) {
+    try {
+      const subId = generateSubId('user-feeds')
+      const filter = { limit: 5, kinds: [1], authors: [pubHex] }
+
+      let feeds = await this.restClient.queryEvents(subId, filter)
+
+      // 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 user feeds for ${pubHex}:`, error)
+      return []
+    }
+  }
+
+  // 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 {
+      const subId = generateSubId('post-likes')
+      const filter = { kinds: [7], '#e': [postId] }
+
+      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 === '+'
+      })
+
+      // Get dislikes
+      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 fetching post likes for ${postId}:`, error)
+      return []
+    }
+  }
+
+  async getChannelInfo (channelId) {
+    try {
+      const existingChInfo = this.loadedChannelsInfo[channelId]
+      if (existingChInfo) {
+        console.log(`Returning ch info from cache :  ${existingChInfo.name}`)
+        return existingChInfo
+      }
+
+      const subId = generateSubId('channel-info')
+      const filter = { limit: 1, kinds: [41], '#e': [channelId] }
+
+      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 fetching channel info for ${channelId}:`, error)
+      return false
+    }
+  }
+
+  // Get associated pub keys from kind 04 inbox via REST API
+  async getDms (pubKey) {
+    try {
+      const subId = generateSubId('dms')
+      // Use array of filters for multiple conditions
+      const filters = [
+        { limit: 100, kinds: [4], '#p': [pubKey] }, // received messages
+        { limit: 100, kinds: [4], authors: [pubKey] } // sent messages
+      ]
+
+      const events = await this.restClient.queryEvents(subId, filters)
+
+      const list = []
+      for (const ev of events) {
+        if (ev.pubkey === pubKey) {
+          // Sent message - get recipient from tags
+          if (ev.tags && ev.tags.length > 0 && ev.tags[0][0] === 'p') {
+            list.push(ev.tags[0][1])
+          }
+        } else {
+          // Received message - get sender pubkey
+          list.push(ev.pubkey)
+        }
+      }
+
+      // Remove duplicated pubkeys
+      const dms = list.filter((val, i, list) => {
+        const existingIndex = list.findIndex(value => value === val)
+        return existingIndex === i
+      })
+
+      return dms
+    } catch (error) {
+      console.warn(`Error fetching DMs for ${pubKey}:`, error)
+      return []
+    }
+  }
+
+  /**
+   * Load DM conversation history between myPub and peerPub (kind 4).
+   * Prefer this GET query over SSE for initial history.
+   */
+  async getDmMessages (myPub, peerPub, limit = 50) {
+    try {
+      const subId = generateSubId('dm-hist')
+      const filters = [
+        { limit, kinds: [4], '#p': [myPub], authors: [peerPub] },
+        { limit, kinds: [4], '#p': [peerPub], authors: [myPub] }
+      ]
+
+      let events = await this.restClient.queryEvents(subId, filters)
+
+      events = events.filter((val, i, list) => {
+        const existingIndex = list.findIndex(value => value.id === val.id)
+        return existingIndex === i
+      })
+
+      events.sort((a, b) => a.created_at - b.created_at)
+      return events || []
+    } catch (error) {
+      console.warn(`Error fetching DM messages for ${peerPub}:`, error)
+      return []
+    }
+  }
+
+  /**
+   * Load group channel message history (kind 42).
+   */
+  async getChannelMessages (channelId, limit = 50) {
+    try {
+      const subId = generateSubId('ch-hist')
+      const filter = { limit, kinds: [42], '#e': [channelId] }
+
+      let events = await this.restClient.queryEvents(subId, filter)
+
+      events = events.filter((val, i, list) => {
+        const existingIndex = list.findIndex(value => value.id === val.id)
+        return existingIndex === i
+      })
+
+      events.sort((a, b) => a.created_at - b.created_at)
+      return events || []
+    } catch (error) {
+      console.warn(`Error fetching channel messages for ${channelId}:`, error)
+      return []
+    }
+  }
+
+  async encryptMsg (inObj = {}) {
+    try {
+      const { senderPrivKey, receiverPubKey, message } = inObj
+      const privateKeyBin = hexToBytes(senderPrivKey)
+      const encryptedMsg = await nip04.encrypt(privateKeyBin, receiverPubKey, message)
+      console.log('encryptedMsg', encryptedMsg)
+      return encryptedMsg
+    } catch (error) {
+      console.warn(error)
+      throw error
+    }
+  }
+
+  async decryptMsg (inObj = {}) {
+    try {
+      console.log(inObj)
+      const { receiverPrivKey, senderPubKey, encryptedMsg } = inObj
+      const privateKeyBin = hexToBytes(receiverPrivKey)
+      const decryptedMsg = await nip04.decrypt(privateKeyBin, senderPubKey, encryptedMsg)
+      console.log('decryptedMsg', decryptedMsg)
+      return decryptedMsg
+    } catch (error) {
+      console.warn(error)
+      throw error
+    }
+  }
+
+  async getBlackList () {
+    try {
+      if (this.blackListFetched) return
+      const opts = {
+        method: 'GET',
+        url: 'https://blacklists.psfoundation.info/nostr-chat-blacklist.json',
+        headers: {
+          'Content-Type': 'application/json'
+        }
+      }
+
+      const result = await axios.request(opts)
+      const { data } = result
+      const { npubs } = data
+
+      // // Dev test mock npub for testing purposes
+      // const myNpubMock = 'npub1y3xq402pu9aqms3khetnt5gzm54t63pzcla56wwfmwshde0ws77qkff5gc'
+      // npubs.push(myNpubMock)
+      // //
+
+      this.blackListFetched = true
+      for (let i = 0; i < npubs.length; i++) {
+        const npub = npubs[i]
+        const pubKey = this.npubToHex(npub)
+        this.blackList.push(pubKey)
+      }
+      console.log('BlackList ', this.blackList)
+
+      return data
+    } catch (error) {
+      console.log('Error on getBlackList()')
+      throw error
+    }
+  }
+
+  // Get all deleted chats
+  async fetchDeletedChats () {
+    try {
+      const options = {
+        method: 'GET',
+        url: `${SERVER}nostr/deletedChat`
+      }
+      const result = await axios.request(options)
+      const { deletedChats } = result.data
+      this.deletedChats = deletedChats
+    } catch (error) {
+      console.error('Error fetchDeletedChats: ', error)
+      throw error
+    }
+  }
+
+  // Get all deleted posts
+  async fetchDeletedPosts () {
+    try {
+      const options = {
+        method: 'GET',
+        url: `${SERVER}nostr/deletedPost`
+      }
+      const result = await axios.request(options)
+      console.log('result', result)
+      const { deletedPosts } = result.data
+      console.log('deletedPosts', deletedPosts)
+
+      this.deletedPosts = deletedPosts
+    } catch (error) {
+      console.error('Error fetchDeletedPosts: ', error)
+      throw error
+    }
+  }
+}

src/services/nostr-rest-client.js

@@ -0,0 +1,267 @@
+/**
+ * REST API Client for Nostr relay interactions via REST2NOSTR proxy
+ */
+
+import config from '../config/index.js'
+
+/**
+ * NIP-01 max subscription id length. REST2NOSTR may append a short per-relay
+ * suffix, so keep client ids well under 64.
+ */
+export const MAX_CLIENT_SUB_ID_LENGTH = 48
+
+/**
+ * Generate a unique subscription ID that stays within NIP-01 limits.
+ * Use a short semantic prefix only (e.g. 'dm', 'group', 'profile', 'dm-notify').
+ * Do not embed pubkeys or channel hex — those exceed the 64-char limit.
+ *
+ * @param {string} prefix - Short prefix for the subscription ID
+ * @returns {string} Unique subscription ID
+ */
+export function generateSubId (prefix = 'sub') {
+  let safePrefix = String(prefix || 'sub')
+
+  // If a caller still passes `dm-${pubkey}` / `group-${channelId}`, drop the hex.
+  const hexMatch = safePrefix.match(/[0-9a-f]{64}/i)
+  if (hexMatch) {
+    const cut = safePrefix.indexOf(hexMatch[0])
+    safePrefix = safePrefix.slice(0, cut).replace(/-+$/, '') || 'sub'
+  }
+
+  safePrefix = safePrefix.slice(0, 20) || 'sub'
+  const timestamp = Date.now().toString(36)
+  const random = Math.random().toString(36).slice(2, 8)
+  let subId = `${safePrefix}-${timestamp}-${random}`
+
+  if (subId.length > MAX_CLIENT_SUB_ID_LENGTH) {
+    subId = subId.slice(0, MAX_CLIENT_SUB_ID_LENGTH)
+  }
+
+  return subId
+}
+
+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. close() is the single entry point —
+    // it aborts the stream and DELETEs on the server (do not also call
+    // closeSubscription from effect cleanup).
+    const subscription = {
+      subId,
+      abortController,
+      close: () => {
+        this.closeSubscription(subId)
+      }
+    }
+
+    this.activeSubscriptions.set(subId, subscription)
+
+    // Start the subscription
+    fetchSubscription()
+
+    return subscription
+  }
+
+  /**
+   * Close an existing subscription
+   * @param {string} subId - Subscription ID to close
+   * @returns {Promise<void>}
+   */
+  async closeSubscription (subId) {
+    try {
+      // Abort the fetch if it's still active
+      const subscription = this.activeSubscriptions.get(subId)
+      if (subscription && subscription.abortController) {
+        subscription.abortController.abort()
+      }
+
+      // Send DELETE request to close subscription
+      const response = await fetch(`${this.apiUrl}/req/${subId}`, {
+        method: 'DELETE'
+      })
+
+      if (!response.ok) {
+        const errorText = await response.text()
+        console.warn(`Error closing subscription ${subId}:`, errorText)
+      }
+
+      // Remove from active subscriptions
+      this.activeSubscriptions.delete(subId)
+    } catch (error) {
+      console.error(`Error closing subscription ${subId}:`, error)
+      // Still remove from active subscriptions even if DELETE fails
+      this.activeSubscriptions.delete(subId)
+    }
+  }
+
+  /**
+   * Close all active subscriptions
+   */
+  async closeAllSubscriptions () {
+    const subIds = Array.from(this.activeSubscriptions.keys())
+    await Promise.all(subIds.map(subId => this.closeSubscription(subId)))
+  }
+}
+
+export default NostrRestClient

src/services/nostr.js

@@ -10,10 +10,10 @@
 // import * as nip19 from '@chris.troutner/nostr-tools/nip19'
 
 import { finalizeEvent } from 'nostr-tools/pure'
-import { Relay } from 'nostr-tools/relay'
 import BchNostr from 'bch-nostr'
 import * as nip19 from 'nostr-tools/nip19'
 import config from '../config/index.js'
+import NostrRestClient from './nostr-rest-client.js'
 
 class NostrBrowser {
   constructor (localConfig = {}) {
@@ -27,6 +27,9 @@ class NostrBrowser {
       relayWs: config.nostrRelay,
       topic: config.nostrTopic
     })
+
+    // Initialize REST client for publishing events
+    this.restClient = new NostrRestClient()
   }
 
   async testNostrUpload (inObj = {}) {
@@ -69,7 +72,6 @@ class NostrBrowser {
       //   tags: [['t', 'bch-dex-test-topic-01']]
       // }
 
-      const relayWs = config.nostrRelay
       const eventTemplate = {
         kind: 867,
         created_at: Math.floor(Date.now() / 1000),
@@ -82,18 +84,12 @@ class NostrBrowser {
       // console.log('signedEvent: ', signedEvent)
       const eventId = signedEvent.id
 
-      // Connect to a relay.
-      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)