Display raw_tx data in tx confirm modal window

pull/74/head
moneroexamples 7 years ago
parent deed21b421
commit fdf0b188f8

@ -20,7 +20,7 @@
"wallet_import" :
{
"_comment": "if fee is 0, then importing is free. fee is in base 1e12, e.g., 0.1 xmr is 0.1 x 1e12 = 100000000000",
"fee" : 0,
"fee" : 100000000000,
"testnet" :
{
"address" : "9tzmPMTViHYM3z6NAgQni1Qm1Emzxy5hQFibPgWD3LVTAz91yok5Eni1pH6zKhBHzpTU15GZooPHSGHXFvFuXEdmEG2sWAZ",

@ -95,7 +95,7 @@ thinwalletCtrls.controller('SendCoinsCtrl', function($scope, $http, $q,
$scope.transferConfirmDialog = undefined;
function confirmTransfer(address, amount, tx_hash, fee, tx_prv_key,
payment_id, mixin, priority, txBlobKBytes) {
payment_id, mixin, priority, txBlobKBytes, raw_tx) {
var deferred = $q.defer();
@ -114,6 +114,7 @@ thinwalletCtrls.controller('SendCoinsCtrl', function($scope, $http, $q,
tx_prv_key: tx_prv_key,
payment_id: payment_id,
mixin: mixin + 1,
raw_tx: raw_tx,
txBlobKBytes: Math.round(txBlobKBytes*1e3) / 1e3,
priority: priority_names[priority - 1],
confirm: function() {
@ -433,7 +434,7 @@ thinwalletCtrls.controller('SendCoinsCtrl', function($scope, $http, $q,
confirmTransfer(realDsts[0].address, realDsts[0].amount,
tx_hash, neededFee, tx_prvkey, payment_id,
mixin, priority, txBlobKBytes).then(function() {
mixin, priority, txBlobKBytes, raw_tx).then(function() {
//alert('Confirmed ');

@ -44,6 +44,13 @@
<div class="move-text-div">
<div class="review-text">{{transferConfirmDialog.tx_prv_key}}</div>
</div>
<div class="w-row">
<div class="w-col w-col-12 responsive-column">
<label class="field-label review" for="raw_tx_data">Raw tx data to be submitted to the backend</label>
<textarea id="raw_tx_data" rows="4" cols="100">{{transferConfirmDialog.raw_tx}}</textarea>
</div>
</div>
<br/>
<div class="move-text-div">
<div class="review-text ">After pressing "Confirm", an attempt will be made to

@ -752,7 +752,7 @@ CurrentBlockchainStatus::start_tx_search_thread(XmrAccount acc)
if (search_thread_exist(acc.address))
{
// thread for this address exist, dont make new one
cout << "Thread exisist, dont make new one" << endl;
cout << "Thread exists, dont make new one" << endl;
return true; // this is still OK, so return true.
}

Loading…
Cancel
Save