Merge pull request #233 from gnosis/feature/generic-maintenance

Feature/generic maintenance
gnosis · Mar 25, 2019 · e226e3f · e226e3f
2 parents 3f010e3 + c406371
commit e226e3f
Show file tree

Hide file tree

Showing 11 changed files with 342 additions and 338 deletions.
diff --git a/dapp/src/config.js b/dapp/src/config.js
@@ -1,5 +1,9 @@
 var txDefaultOrig =
 {
+  websites: {
+    "wallet": "https://wallet.gnosis.pm",
+    "gnosis": "https://gnosis.pm"
+  },
   gasLimit: 3141592,
   gasPrice: 18000000000,
   ethereumNode: "https://mainnet.infura.io:443",

diff --git a/dapp/src/controllers/footerCtrl.js b/dapp/src/controllers/footerCtrl.js
@@ -7,16 +7,17 @@
         $scope.isElectron = isElectron;
 
         // electron show terms and policy
+        // `shell` is an Electron only command
         $scope.openTerms = function() {
-            shell.openExternal('https://wallet.gnosis.pm/TermsofUseMultisig.pdf');
+            shell.openExternal(txDefault.websites.wallet + '/TermsofUseMultisig.pdf');
         }
 
         $scope.openPolicy = function () {
-            shell.openExternal('https://gnosis.pm/assets/pdf/PrivacyPolicyGnosisLtd.pdf');
+            shell.openExternal(txDefault.websites.gnosis + '/assets/pdf/PrivacyPolicyGnosisLtd.pdf');
         }
 
         $scope.openImprint = function () {
-            shell.openExternal('https://wallet.gnosis.pm/imprint.html');
+            shell.openExternal(txDefault.websites.wallet + '/imprint.html');
         }
 
       });

diff --git a/dapp/src/controllers/navCtrl.js b/dapp/src/controllers/navCtrl.js
@@ -69,11 +69,11 @@
                 };
 
                 $scope.openTerms = function () {
-                  shell.openExternal('https://wallet.gnosis.pm/TermsofUseMultisig.pdf');
+                  shell.openExternal(txDefault.websites.wallet + '/TermsofUseMultisig.pdf');
                 }
 
                 $scope.openPolicy = function () {
-                  shell.openExternal('https://gnosis.pm/assets/pdf/PrivacyPolicyGnosisLtd.pdf');
+                  shell.openExternal(txDefault.websites.gnosis + '/assets/pdf/PrivacyPolicyGnosisLtd.pdf');
                 }
               }
             });
@@ -89,6 +89,8 @@
                   $uibModalInstance.close($scope.walletOption);
                   localStorage.setItem("gdprTermsAccepted", true);
                 };
+
+                $scope.websites = txDefault.websites;
               }
             });
           }

diff --git a/dapp/src/controllers/walletCtrl.js b/dapp/src/controllers/walletCtrl.js
@@ -2,11 +2,11 @@
   function () {
     angular
       .module('multiSigWeb')
-      .controller('walletCtrl', function (Web3Service, $rootScope, $scope, Wallet, Utils, Token, Transaction, $uibModal, $interval) {
+      .controller('walletCtrl', function ($rootScope, $scope, $uibModal, CommunicationBus, Token, Utils, Wallet, Web3Service) {
 
         $scope.checkTerms = function () {
           if (localStorage.getItem("termsAccepted")) {
-            $interval.cancel($scope.termsInterval);
+            CommunicationBus.stopInterval('termsInterval');
             $scope.newWalletSelect();
           };
         };
@@ -120,10 +120,13 @@
         };
 
         function startup() {
-          $scope.interval = $interval($scope.updateParams, 10000);
+          CommunicationBus.addFn($scope.updateParams, 'interval');
+          CommunicationBus.addFn($scope.checkTerms, 'termsInterval');
+          CommunicationBus.startInterval('interval', 10000);
+
           $scope.wallets = Wallet.wallets;
           if (Web3Service.coinbase && (!$scope.wallets || !Object.keys($scope.wallets).length && !$rootScope.alreadyLogged)) {
-            $scope.termsInterval = $interval($scope.checkTerms, 500);
+            CommunicationBus.startInterval('termsInterval', 500);
           }
           $scope.updateParams();
           $rootScope.alreadyLogged = true;
@@ -140,8 +143,8 @@
         startup();
 
         $scope.$on('$destroy', function () {
-          $interval.cancel($scope.interval);
-          $interval.cancel($scope.termsInterval);
+          CommunicationBus.stopInterval('interval');
+          CommunicationBus.stopInterval('termsInterval');
         });
 
         /*$scope.currentPage = 1;

diff --git a/dapp/src/controllers/walletDetailCtrl.js b/dapp/src/controllers/walletDetailCtrl.js
@@ -2,7 +2,7 @@
   function () {
     angular
       .module("multiSigWeb")
-      .controller("walletDetailCtrl", function (Web3Service, $scope, $filter, Wallet, $routeParams, Utils, $interval, $uibModal, Token, ABI) {
+      .controller("walletDetailCtrl", function ($scope, $filter, $routeParams, $uibModal, $interval, ABI, Token, Utils, Wallet, Web3Service) {
         $scope.wallet = {};
 
         $scope.$watch(

diff --git a/dapp/src/index.html b/dapp/src/index.html
@@ -162,7 +162,7 @@
     <footer>
         <nav class="imprint" ng-controller="footerCtrl">
           <div class="container" ng-hide="isElectron">
-              Please read our full <a href="https://gnosis.pm/assets/pdf/PrivacyPolicyGnosisLtd.pdf" target="_blank" >Privacy Policy</a> and <a href="/TermsofUseMultisig.pdf" target="_blank" >Terms of Use</a>. - <a target="_blank" href="/imprint.html">Imprint</a>
+              Please read our full <a ng-click="openPolicy()">Privacy Policy</a> and <a href="/TermsofUseMultisig.pdf" target="_blank" >Terms of Use</a>. - <a target="_blank" href="/imprint.html">Imprint</a>
           </div>
           <div class="container" ng-show="isElectron">
             Please read our full <a ng-click="openPolicy()">Privacy Policy</a> and <a ng-click="openTerms()">Terms of Use</a>. - <a ng-click="openImprint()">Imprint</a>

diff --git a/dapp/src/partials/modals/chooseWeb3Wallet.html b/dapp/src/partials/modals/chooseWeb3Wallet.html
@@ -6,21 +6,28 @@
   </div>
 </div>
 <div class="modal-body">
-  <div class="col-lg-4 col-md-4 col-xs-12">
-      <button type="button" class="btn btn-default" ng-click="ok('ledger')">
-        <h4>
-          Ledger wallet
-        </h4>
-      </button>
+  <div class="col-lg-3 col-md-3 col-xs-12">
+    <button type="button" class="btn btn-default" ng-click="ok('ledger')">
+      <h4>
+        Ledger wallet
+      </h4>
+    </button>
   </div>
-  <div class="col-lg-4 col-md-4 col-xs-12">
+  <div class="col-lg-3 col-md-3 col-xs-12">
     <button type="button" class="btn btn-default" ng-click="ok('lightwallet')">
       <h4>
-      Light wallet
+        Light wallet
+      </h4>
+    </button>
+  </div>
+  <div class="col-lg-3 col-md-3 col-xs-12">
+    <button type="button" class="btn btn-default" ng-click="ok('trezor')">
+      <h4>
+        Trezor wallet
       </h4>
     </button>
   </div>
-  <div class="col-lg-4 col-md-4 col-xs-12">
+  <div class="col-lg-3 col-md-3 col-xs-12">
     <button type="button" class="btn btn-default" ng-click="ok('remotenode')">
       <h4>
         Remote node
@@ -30,4 +37,4 @@ <h4>
 </div>
 <div class="modal-footer">
 
-</div>
+</div>
diff --git a/dapp/src/partials/modals/disclaimer.html b/dapp/src/partials/modals/disclaimer.html
@@ -5,12 +5,12 @@
 </div>
 <div class="modal-body">
   <p>
-      For using the application, you have to agree with our <a href="/TermsofUseMultisig.pdf" target="_blank" >Terms of Use</a> and <a href="https://gnosis.pm/assets/pdf/PrivacyPolicyGnosisLtd.pdf" target="_blank" >Privacy Policy.</a>
+      For using the application, you have to agree with our <a href="/TermsofUseMultisig.pdf" target="_blank" >Terms of Use</a> and <a href="{{ websites.gnosis }}/assets/pdf/PrivacyPolicyGnosisLtd.pdf" target="_blank">Privacy Policy</a>.
   </p>
   <p>
     Don't use the wallet hosted at
-    <a href="https://wallet.gnosis.pm" class="prevent-focus" target="_blank">https://wallet.gnosis.pm</a> to sign transactions.
-    Use <a href="https://wallet.gnosis.pm" target="_blank">https://wallet.gnosis.pm</a> only to
+    <a href="{{ websites.wallet }}" class="prevent-focus" target="_blank">{{ websites.wallet }}</a> to sign transactions.
+    Use <a href="{{ websites.wallet }}" target="_blank">{{ websites.wallet }}</a> only to
     check the status of your wallet. Use a locally installed version for signing.
     A version can be obtained <a href="https://github.com/gnosis/MultiSigWallet/releases" target="_blank">here</a>.
   </p>

diff --git a/dapp/src/services/Connection.js b/dapp/src/services/Connection.js
@@ -2,7 +2,7 @@
   function () {
     angular
     .module('multiSigWeb')
-    .service('Connection', function ($rootScope, $http, $interval) {
+    .service('Connection', function ($rootScope, $interval) {
 
       var factory = {};
       var isConnected = false;