Fix EthGasStation gasPrice detection, highligh text in inputs/text fi…

…elds, show app version in settings
gnosis · May 28, 2018 · 110bd26 · 110bd26
1 parent fd3036f
commit 110bd26
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 9 deletions.
diff --git a/dapp/controllers/settingsCtrl.js b/dapp/controllers/settingsCtrl.js
@@ -2,7 +2,7 @@
   function () {
     angular
     .module("multiSigWeb")
-    .controller("settingsCtrl", function (Web3Service, $scope, Config, Wallet, Utils, Transaction, $window, $uibModal, $sce, $location) {
+    .controller("settingsCtrl", function (Web3Service, $scope, Config, Wallet, Utils, Transaction, $window, $uibModal, $sce, $location, $http) {
 
       // Don't save the following config values to localStorage
       var configBlacklist = [
@@ -79,10 +79,20 @@
 
           }
         );
+      }
 
+      function setAppVersion () {
+        if (isElectron) {
+          $scope.appVersion = require('electron').remote.app.getVersion();
+        } else {
+          $http.get('package.json').success(function (package_json){
+            $scope.appVersion = package_json.version;
+          });
+        }
       }
 
       loadConfig();
+      setAppVersion();
 
       /**
       * Updates configuration

diff --git a/dapp/css/app.css b/dapp/css/app.css
@@ -169,5 +169,5 @@ input[name="editable-select"]:disabled {
 }
 
 ::selection {
-  background:transparent;
+  background: #b3c3ce;
   }
diff --git a/dapp/partials/settings.html b/dapp/partials/settings.html
@@ -57,3 +57,18 @@ <h4>
     </div>
   </form>
 </div>
+
+<div class="panel panel-default" ng-if="appVersion !== undefined">
+  <div class="panel-heading">
+    <h4>
+      About
+    </h4>
+  </div>
+  <div class="panel-body">
+    <div class="row">
+      <div class="col-md-6">
+        App Version {{ appVersion }}
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/dapp/services/Wallet.js b/dapp/services/Wallet.js
@@ -57,7 +57,16 @@
                 function(response) {
                   resolve((response.data.safeLow / 10) * 1e9)
                 },
-                reject
+                function (error) {
+                  // Get gas price from Ethereum Node
+                  Web3Service.web3.eth.getGasPrice(function (g_error, g_result) {
+                    if (g_error) {
+                      reject (g_error);
+                    } else {
+                      resolve(g_result);
+                    }
+                  });
+                }
               )
           }
         );
@@ -574,7 +583,7 @@
             }
           );
 
-        
+
       };
 
       wallet.deployWithLimitFactoryOffline = function (owners, requiredConfirmations, limit, cb) {
@@ -1059,7 +1068,7 @@
               cb
             );
           }
-        });        
+        });
       };
 
       /**
@@ -1098,8 +1107,8 @@
               options,
               cb
             );
-          }          
-        });        
+          }
+        });
       };
 
       /**
@@ -1222,9 +1231,9 @@
                     options,
                     cb
                   );
-                }                
+                }
               }
-            );            
+            );
           }
         }).call();
       };