Merge branch 'ct-unstable' into dh-nostr-views

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

@@ -41,7 +41,10 @@ const SweepWif = (props) => {
 
   // Handle sweep function
   const handleSweep = async (e) => {
-    e.preventDefault()
+    if (e) {
+      e.preventDefault()
+    }
+
     try {
       console.log(`Sweeping this WIF: ${wifToSweep}`)
 

src/config/index.js

@@ -14,7 +14,10 @@ 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.fullstack.cash',
+
+  nostrTopic: 'bch-dex-test-topic-02',
+  nostrRelay: 'wss://nostr-relay.psfoundation.info'
 
 }
 

src/services/nostr.js

@@ -13,6 +13,7 @@ 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'
 
 class NostrBrowser {
   constructor (localConfig = {}) {
@@ -23,8 +24,8 @@ class NostrBrowser {
     this.bchWallet = localConfig.bchWallet
 
     this.bchNostr = new BchNostr({
-      relayWs: 'wss://nostr-relay.psfoundation.info',
-      topic: 'bch-dex-test-topic-01'
+      relayWs: config.nostrRelay,
+      topic: config.nostrTopic
     })
   }
 
@@ -68,11 +69,11 @@ class NostrBrowser {
       //   tags: [['t', 'bch-dex-test-topic-01']]
       // }
 
-      const relayWs = 'wss://nostr-relay.psfoundation.info'
+      const relayWs = config.nostrRelay
       const eventTemplate = {
         kind: 867,
         created_at: Math.floor(Date.now() / 1000),
-        tags: [['t', 'bch-dex-test-topic-01']],
+        tags: [['t', config.nostrTopic]],
         content: msg
       }