Skip to content
This repository has been archived by the owner on Aug 24, 2021. It is now read-only.

Commit

Permalink
Merge pull request #97 from gnosis/feature/WA-261-gas-and-releases-fe…
Browse files Browse the repository at this point in the history
…edback

Feature/wa 261 gas and releases feedback
  • Loading branch information
denisgranha authored Mar 20, 2018
2 parents 52aa30b + 9981af8 commit e0986ae
Show file tree
Hide file tree
Showing 5 changed files with 64 additions and 57 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ truffle migrate <account1,account2,...,accountN> <requiredConfirmations>
truffle migrate <account1,account2,...,accountN> <requiredConfirmations> <dailyLimit>
```

Interface Releases
------------------
You can find binaries for OSX, Windows and Linux [here](https://github.com/gnosis/MultiSigWallet/releases)

Limitations
-------------
This implementation does not allow the creation of smart contracts via multisignature transactions.
Expand Down
68 changes: 34 additions & 34 deletions dapp/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 24 additions & 22 deletions dapp/partials/modals/configureGas.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,27 +3,29 @@ <h3 class="modal-title">
Configure Gas
</h3>
</div>
<div class="modal-body">
<div class="form-group">
<label for="value">Gas limit:</label>
<input id="value" type="number" class="form-control" ng-model="gasLimit" step="any" ng-change="calculateFee()"
min="0" max="999999999999999" required >
<form class="form" name="form">
<div class="modal-body">
<div class="form-group">
<label for="value">Gas limit:</label>
<input id="value" type="number" class="form-control" ng-model="gasLimit" step="any" ng-change="calculateFee()"
ng-min="minimumGasLimit" max="999999999999999" required >
</div>
<div class="form-group">
<label for="value">Gas price (GWei):</label>
<input id="value" type="number" class="form-control" ng-model="gasPrice" step="any" min="0" ng-change="calculateFee()"
max="999999999999999" required >
</div>
<div class="form-group">
<label for="value">Tx fees (ETH):</label>
<input id="value" disabled type="number" class="form-control" ng-model="txFee" step="any" min="0" max="999999999999999" required >
</div>
</div>
<div class="form-group">
<label for="value">Gas price (GWei):</label>
<input id="value" type="number" class="form-control" ng-model="gasPrice" step="any" min="0" ng-change="calculateFee()"
max="999999999999999" required >
<div class="modal-footer">
<button type="button" class="btn btn-default" ng-click="send()" ng-disabled="form.$invalid">
Send transaction
</button>
<button type="button" class="btn btn-danger" ng-click="cancel()">
Cancel
</button>
</div>
<div class="form-group">
<label for="value">Tx fees (ETH):</label>
<input id="value" disabled type="number" class="form-control" ng-model="txFee" step="any" min="0" max="999999999999999" required >
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" ng-click="send()">
Send transaction
</button>
<button type="button" class="btn btn-danger" ng-click="cancel()">
Cancel
</button>
</div>
</form>
2 changes: 1 addition & 1 deletion dapp/partials/modals/disclaimer.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<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
check the status of your wallet. Use a locally installed version for signing.
A version can be obtained <a href="https://github.com/ConsenSys/MultiSigWallet" target="_blank">here</a>.
A version can be obtained <a href="https://github.com/gnosis/MultiSigWallet/releases" target="_blank">here</a>.
</p>
<p>
All smart contracts have been audited carefully multiple times.
Expand Down
1 change: 1 addition & 0 deletions dapp/services/Web3Service.js
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@

$scope.close = $uibModalInstance.dismiss;
$scope.gasLimit = options.gas;
$scope.minimumGasLimit = options.gas;
$scope.gasPrice = options.gasPrice / 1e9;

$scope.calculateFee = function () {
Expand Down

0 comments on commit e0986ae

Please sign in to comment.