Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Commit

Permalink
initial commit
Browse files Browse the repository at this point in the history
1. Fixes #5788
2. Partially addresses
#4720
3. Needs help for #4114
  • Loading branch information
mrose17 committed Nov 30, 2016
1 parent fa04026 commit df2b4c7
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 1 deletion.
1 change: 0 additions & 1 deletion app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@ const async = require('async')
const tabs = require('./browser/tabs')
const settings = require('../js/constants/settings')
const webtorrent = require('./browser/webtorrent')
const base64Encode = require('../js/lib/base64').encode

// temporary fix for #4517, #4518 and #4472
app.commandLine.appendSwitch('enable-use-zoom-for-dsf', 'false')
Expand Down
17 changes: 17 additions & 0 deletions app/ledger.js
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,7 @@ var backupKeys = (appState, action) => {

var recoverKeys = (appState, action) => {
client.recoverWallet(action.firstRecoveryKey, action.secondRecoveryKey, (err, body) => {
if (logError(err, 'recoveryWallet')) appActions.updateLedgerInfo(underscore.omit(ledgerInfo, [ '_internal' ]))
if (err) {
setImmediate(() => appActions.ledgerRecoveryFailed())
} else {
Expand Down Expand Up @@ -400,6 +401,22 @@ underscore.keys(fileTypes).forEach((fileType) => {
})
signatureMax = Math.ceil(signatureMax * 1.5)

appStore.addChangeListener(() => {
var paymentsP
var tabs = appStore.getState().get('tabs').toJS()

if (!client) return

tabs.forEach((tab) => { if (tab.location === 'about:preferences#payments') paymentsP = true })

if (paymentsP) {
if (!balanceTimeoutId) getBalance()
} else if (balanceTimeoutId) {
clearTimeout(balanceTimeoutId)
balanceTimeoutId = false
}
})

eventStore.addChangeListener(() => {
const eventState = eventStore.getState().toJS()
var view = eventState.page_view
Expand Down
2 changes: 2 additions & 0 deletions js/constants/coinbaseCountries.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
* You can obtain one at http://mozilla.org/MPL/2.0/. */

const coinbaseCountries = [
/* although coibnase operates in all these countries, the debit/credit payment service is, at present, only in the US
'AT',
'AU',
'BE',
Expand Down Expand Up @@ -35,6 +36,7 @@ const coinbaseCountries = [
'SI',
'SK',
'SM',
*/
'US'
]

Expand Down

0 comments on commit df2b4c7

Please sign in to comment.