diff --git a/config.js b/config.js
index 9c0ef9224..a22baad87 100644
--- a/config.js
+++ b/config.js
@@ -6,11 +6,6 @@ var defaultConfig = {
forceNetwork: false,
logLevel: 'info',
- // DEFAULT unit: Bit
- unitName: 'bits',
- unitToSatoshi: 100,
- alternativeName: 'US Dollar',
- alternativeIsoCode: 'USD',
// wallet limits
limits: {
@@ -20,9 +15,12 @@ var defaultConfig = {
// network layer config
network: {
- host: 'test-insight.bitpay.com',
- port: 443,
- schema: 'https'
+ testnet: {
+ url: 'https://test-insight.bitpay.com:443'
+ },
+ livenet: {
+ url: 'https://insight.bitpay.com:443'
+ },
},
// wallet default config
@@ -30,25 +28,15 @@ var defaultConfig = {
requiredCopayers: 2,
totalCopayers: 3,
spendUnconfirmed: true,
- verbose: 1,
- // will duplicate itself after each try
reconnectDelay: 5000,
- idleDurationMin: 4
- },
-
- // blockchain service API config
- blockchain: {
- schema: 'https',
- host: 'test-insight.bitpay.com',
- port: 443,
- retryDelay: 1000,
- },
- // socket service API config
- socket: {
- schema: 'https',
- host: 'test-insight.bitpay.com',
- port: 443,
- reconnectDelay: 1000,
+ idleDurationMin: 4,
+ settings: {
+ unitName: 'bits',
+ unitToSatoshi: 100,
+ unitDecimals: 2,
+ alternativeName: 'US Dollar',
+ alternativeIsoCode: 'USD',
+ }
},
// local encryption/security config
@@ -62,7 +50,6 @@ var defaultConfig = {
updateFrequencySeconds: 60 * 60
},
- verbose: 1,
};
if (typeof module !== 'undefined')
- module.exports = defaultConfig;
\ No newline at end of file
+ module.exports = defaultConfig;
diff --git a/index.html b/index.html
index e6f34fd00..40b22b4da 100644
--- a/index.html
+++ b/index.html
@@ -17,8 +17,8 @@
Network Error. Attempting to reconnect...
-
- Fee: {{tx.fee|noFractionNumber}} {{$root.unitName}}
+ Fee: {{tx.fee|noFractionNumber}} {{$root.wallet.settings.unitName}}
Proposal ID: {{tx.ntxid}}
diff --git a/views/includes/version.html b/views/includes/version.html
index a554d6bcf..55e19d99c 100644
--- a/views/includes/version.html
+++ b/views/includes/version.html
@@ -1,6 +1,6 @@
v{{version}} ({{defaultLanguage}})
#{{commitHash}}
- [ {{networkName}} ]
+ [ {{networkName}} ]
diff --git a/views/modals/qr-address.html b/views/modals/qr-address.html
index c30b86096..13d5635fc 100644
--- a/views/modals/qr-address.html
+++ b/views/modals/qr-address.html
@@ -7,7 +7,7 @@
- {{address.balance || 0|noFractionNumber}} {{$root.unitName}}
+ {{address.balance || 0|noFractionNumber}} {{$root.wallet.settings.unitName}}