Merge branch 'master' into compactLayout

feature/default_network_editable
Frankie 8 years ago
commit 1b1bb92fd3
  1. 2
      .gitattributes
  2. 1
      CHANGELOG.md
  3. 6
      app/scripts/lib/config-manager.js
  4. 3
      app/scripts/lib/idStore.js
  5. 6
      test/unit/config-manager-test.js
  6. 5
      ui/app/actions.js

2
.gitattributes vendored

@ -1 +1 @@
* text=auto
CHANGELOG.md merge=union

@ -6,6 +6,7 @@
- Added network name next to network indicator
- Add copy transaction hash button to completed transaction list items.
- Unify wording for transaction approve/reject options on notifications and the extension.
- Fix bug where confirmation view would be shown twice.
## 2.4.5 2016-06-29

@ -149,12 +149,6 @@ ConfigManager.prototype.getCurrentRpcAddress = function () {
}
}
ConfigManager.prototype.clearWallet = function () {
var data = this.getConfig()
delete data.wallet
this.setData(data)
}
ConfigManager.prototype.setData = function (data) {
this.migrator.saveData(data)
}

@ -43,9 +43,6 @@ function IdentityStore (opts = {}) {
IdentityStore.prototype.createNewVault = function (password, entropy, cb) {
delete this._keyStore
if (this.configManager) {
this.configManager.clearWallet()
}
this._createIdmgmt(password, null, entropy, (err) => {
if (err) return cb(err)

@ -22,6 +22,7 @@ describe('config-manager', function() {
describe('#setConfirmed', function() {
it('should make getConfirmed return true once set', function() {
assert.equal(configManager.getConfirmed(), false)
configManager.setConfirmed(true)
var result = configManager.getConfirmed()
assert.equal(result, true)
@ -63,8 +64,9 @@ describe('config-manager', function() {
provider: {
type: 'rpc',
rpcTarget: 'foobar'
},
}
}
configManager.setConfirmed(true)
configManager.setConfig(testConfig)
var testWallet = {
@ -75,6 +77,7 @@ describe('config-manager', function() {
var result = configManager.getData()
assert.equal(result.wallet.name, testWallet.name, 'wallet name is set')
assert.equal(result.config.provider.rpcTarget, testConfig.provider.rpcTarget)
assert.equal(configManager.getConfirmed(), true)
testConfig.provider.type = 'something else!'
configManager.setConfig(testConfig)
@ -83,6 +86,7 @@ describe('config-manager', function() {
assert.equal(result.wallet.name, testWallet.name, 'wallet name is set')
assert.equal(result.config.provider.rpcTarget, testConfig.provider.rpcTarget)
assert.equal(result.config.provider.type, testConfig.provider.type)
assert.equal(configManager.getConfirmed(), true)
})
})

@ -47,6 +47,7 @@ var actions = {
unlockInProgress: unlockInProgress,
// error handling
displayWarning: displayWarning,
showWarning: showWarning, // alias
DISPLAY_WARNING: 'DISPLAY_WARNING',
HIDE_WARNING: 'HIDE_WARNING',
hideWarning: hideWarning,
@ -507,6 +508,10 @@ function hideLoadingIndication () {
}
}
function showWarning (text) {
return this.displayWarning(text)
}
function displayWarning (text) {
return {
type: actions.DISPLAY_WARNING,

Loading…
Cancel
Save