aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/scripts/metamask-controller.js8
-rw-r--r--ui/app/selectors/confirm-transaction.js2
2 files changed, 2 insertions, 8 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index ac188c4df..1e1aa035f 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -551,21 +551,15 @@ module.exports = class MetamaskController extends EventEmitter {
default:
throw new Error('MetamaskController:getKeyringForDevice - Unknown device')
}
- console.log('getting keyring for device ', deviceName, hdPath)
let keyring = await this.keyringController.getKeyringsByType(keyringName)[0]
- console.log('got Keyring', keyring)
if (!keyring) {
- console.log('we did not so lets add it', keyringName)
keyring = await this.keyringController.addNewKeyring(keyringName)
- console.log('what about now', keyring)
}
- console.log('setting hdPath', hdPath)
if (hdPath && keyring.setHdPath) {
keyring.setHdPath(hdPath)
}
keyring.network = this.networkController.getProviderConfig().type
- console.log('setting network', keyring.network)
return keyring
@@ -635,7 +629,7 @@ module.exports = class MetamaskController extends EventEmitter {
this.preferencesController.setAddresses(newAccounts)
newAccounts.forEach(address => {
if (!oldAccounts.includes(address)) {
- this.preferencesController.setAccountLabel(address, `${deviceName.toUpperCase()} #${parseInt(index, 10) + 1}`)
+ this.preferencesController.setAccountLabel(address, `${deviceName.toUpperCase()} ${parseInt(index, 10) + 1}`)
this.preferencesController.setSelectedAddress(address)
}
})
diff --git a/ui/app/selectors/confirm-transaction.js b/ui/app/selectors/confirm-transaction.js
index aa1fc5404..6e760c429 100644
--- a/ui/app/selectors/confirm-transaction.js
+++ b/ui/app/selectors/confirm-transaction.js
@@ -159,7 +159,7 @@ export const approveTokenAmountAndToAddressSelector = createSelector(
if (tokenDecimals) {
tokenAmount = calcTokenAmount(value, tokenDecimals)
}
-
+
tokenAmount = roundExponential(tokenAmount)
}