From 607cd43c785cb18253100fe17f60a205f610e76a Mon Sep 17 00:00:00 2001 From: Giacomo Licari Date: Mon, 25 Mar 2019 11:43:34 +0100 Subject: [PATCH 1/3] Fix owners name not detected --- dapp/src/services/Wallet.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dapp/src/services/Wallet.js b/dapp/src/services/Wallet.js index 0ada5b37..50d586e7 100644 --- a/dapp/src/services/Wallet.js +++ b/dapp/src/services/Wallet.js @@ -326,7 +326,8 @@ if (w.owners) { var owners = {}; var checksumedAddress; - for (var x = 0; x < w.owners.length; x++) { + + for (var x in w.owners) { checksumedAddress = Web3Service.toChecksumAddress(w.owners[x].address); owners[checksumedAddress] = w.owners[x] } From 82e3d209f6078fb7a3fb910f64b76cf752aa747c Mon Sep 17 00:00:00 2001 From: Giacomo Licari Date: Mon, 25 Mar 2019 14:06:36 +0100 Subject: [PATCH 2/3] Add Trezor setup option at startup. Make website URLs configurable --- dapp/src/config.js | 4 +++ dapp/src/controllers/footerCtrl.js | 7 ++--- dapp/src/controllers/navCtrl.js | 6 +++-- dapp/src/index.html | 2 +- .../src/partials/modals/chooseWeb3Wallet.html | 27 ++++++++++++------- dapp/src/partials/modals/disclaimer.html | 6 ++--- 6 files changed, 33 insertions(+), 19 deletions(-) diff --git a/dapp/src/config.js b/dapp/src/config.js index 7b0ba313..077f1d00 100644 --- 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 index aa8fa6ac..df61e63c 100644 --- 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 index f45532ea..6b6dd053 100644 --- 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/index.html b/dapp/src/index.html index afe53b45..1fa4223e 100644 --- a/dapp/src/index.html +++ b/dapp/src/index.html @@ -162,7 +162,7 @@