aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/manifest.json10
-rw-r--r--app/scripts/lib/config-manager.js4
2 files changed, 12 insertions, 2 deletions
diff --git a/app/manifest.json b/app/manifest.json
index 09bc9eb37..c1b9ee817 100644
--- a/app/manifest.json
+++ b/app/manifest.json
@@ -4,6 +4,16 @@
"version": "2.9.0",
"manifest_version": 2,
"description": "Ethereum Browser Extension",
+ "commands": {
+ "_execute_browser_action": {
+ "suggested_key": {
+ "windows": "Ctrl+Alt+M",
+ "mac": "Command+Alt+M",
+ "chromeos": "Ctrl+Alt+M",
+ "linux": "Ctrl+Alt+M"
+ }
+ }
+ },
"icons": {
"16": "images/icon-16.png",
"128": "images/icon-128.png"
diff --git a/app/scripts/lib/config-manager.js b/app/scripts/lib/config-manager.js
index 4d270bcdb..715efb42e 100644
--- a/app/scripts/lib/config-manager.js
+++ b/app/scripts/lib/config-manager.js
@@ -300,9 +300,10 @@ ConfigManager.prototype.updateConversionRate = function () {
this.setConversionPrice(0)
this.setConversionDate('N/A')
})
+
}
-ConfigManager.prototype.setConversionPrice = function(price) {
+ConfigManager.prototype.setConversionPrice = function (price) {
var data = this.getData()
data.conversionRate = Number(price)
this.setData(data)
@@ -372,4 +373,3 @@ ConfigManager.prototype.createShapeShiftTx = function (depositAddress, depositTy
}
this.setData(data)
}
-