From 12ffe32adc61440719f74d1be27e8096296c27ee Mon Sep 17 00:00:00 2001
From: Adam Gibson <ekaggata@gmail.com>
Date: Fri, 6 Jan 2017 20:47:36 +0200
Subject: [PATCH] bugfix for checkoffers

---
 scripts/joinmarket-qt.py | 4 ++--
 scripts/qtsupport.py     | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/joinmarket-qt.py b/scripts/joinmarket-qt.py
index c9c9d4a..d575b91 100644
--- a/scripts/joinmarket-qt.py
+++ b/scripts/joinmarket-qt.py
@@ -21,7 +21,7 @@ Some widgets copied and modified from https://github.com/spesmilo/electrum
 '''
 
 import sys, base64, textwrap, datetime, os, logging
-import Queue, platform, csv, threading, time
+import platform, csv, threading, time
 
 from decimal import Decimal
 from functools import partial
@@ -592,7 +592,7 @@ class SpendTab(QWidget):
             mbinfo.append(" ")
         """
         mbinfo.append("Sending amount: " + btc_amount_str)
-        mbinfo.append("to address: " + self.destaddr)
+        mbinfo.append("to address: " + self.taker.my_cj_addr)
         mbinfo.append(" ")
         mbinfo.append("Counterparties chosen:")
         mbinfo.append('Name,     Order id, Coinjoin fee (sat.)')
diff --git a/scripts/qtsupport.py b/scripts/qtsupport.py
index 69f71a0..646ab1f 100644
--- a/scripts/qtsupport.py
+++ b/scripts/qtsupport.py
@@ -572,9 +572,12 @@ class SchDynamicPage2(QWizardPage):
         #by default create three address fields
         addrLEs = []
         #for testing
-        testaddrs = ["mteaYsGsLCL9a4cftZFTpGEWXNwZyDt5KS",
+        if jm_single().config.get("BLOCKCHAIN", "blockchain_source") == "regtest":
+            testaddrs = ["mteaYsGsLCL9a4cftZFTpGEWXNwZyDt5KS",
                      "msFGHeut3rfJk5sKuoZNfpUq9MeVMqmido",
                      "mkZfBXCRPs8fCmwWLrspjCvYozDhK6Eepz"]
+        else:
+            testaddrs = ["","",""]
         for i in range(3):
             layout.addWidget(QLabel("Destination address: " + str(i)), i, 0)
             addrLEs.append(QLineEdit(testaddrs[i]))