Charon/blockchain
1
0
Fork 0
forked from lthn/blockchain
Code Pull requests Activity

fix error when buyer deposit is smaller than amount

Browse source
This commit is contained in:
wildkif 2019-05-28 15:04:10 +03:00
parent 290460c0f3
commit 8cfe21421a
7 changed files with 3 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gui/qt-daemon/html/assets/i18n/en.json
View file

@ -352,7 +352,6 @@
},
"BUYER": {
"WAITING": "Waiting for response",
"PLEDGE_RESERVED": "Pledge amount reserved",
"IGNORED": "The seller ignored your contract proposal",
"ACCEPTED": "The seller accepted your contract proposal",
"WAIT": "Waiting for deposits confirmation",

4
src/gui/qt-daemon/html/main.js
View file

@ -1048,7 +1048,6 @@ var Wallet = /** @class */ (function () {
}
var searchResult = viewedContracts.some(function (elem) { return elem.state === contract.state && elem.is_a === contract.is_a && elem.contract_id === contract.contract_id; });
contract.is_new = !searchResult;
contract['private_detailes'].a_pledge = contract['private_detailes'].a_pledge.plus(contract['private_detailes'].to_pay);
wallet.contracts.push(contract);
};
for (var i = 0; i < items.length; i++) {
@ -1979,7 +1978,7 @@ var BackendService = /** @class */ (function () {
a_addr: a_addr,
b_addr: b_addr,
to_pay: this.moneyToIntPipe.transform(to_pay),
a_pledge: this.moneyToIntPipe.transform((new bignumber_js__WEBPACK_IMPORTED_MODULE_7__["BigNumber"](a_pledge)).minus(to_pay).toString()),
a_pledge: this.moneyToIntPipe.transform(a_pledge),
b_pledge: this.moneyToIntPipe.transform(b_pledge)
},
payment_id: payment_id,
@ -3023,7 +3022,6 @@ var AppComponent = /** @class */ (function () {
}
var searchResult = _this.variablesService.settings.viewedContracts.some(function (elem) { return elem.state === contract_1.state && elem.is_a === contract_1.is_a && elem.contract_id === contract_1.contract_id; });
contract_1.is_new = !searchResult;
contract_1['private_detailes'].a_pledge = contract_1['private_detailes'].a_pledge.plus(contract_1['private_detailes'].to_pay);
var findContract = false;
for (var i = 0; i < wallet.contracts.length; i++) {
if (wallet.contracts[i].contract_id === contract_1.contract_id && wallet.contracts[i].is_a === contract_1.is_a) {

2
src/gui/qt-daemon/html/main.js.map
View file

File diff suppressed because one or more lines are too long

2
src/gui/qt-daemon/html_source/src/app/_helpers/models/wallet.model.ts
View file

@ -214,8 +214,6 @@ export class Wallet {
const searchResult = viewedContracts.some(elem => elem.state === contract.state && elem.is_a === contract.is_a && elem.contract_id === contract.contract_id);
contract.is_new = !searchResult;
contract['private_detailes'].a_pledge = contract['private_detailes'].a_pledge.plus(contract['private_detailes'].to_pay);
wallet.contracts.push(contract);
}
this.recountNewContracts();

2
src/gui/qt-daemon/html_source/src/app/_helpers/services/backend.service.ts
View file

@ -426,7 +426,7 @@ export class BackendService {
a_addr: a_addr,
b_addr: b_addr,
to_pay: this.moneyToIntPipe.transform(to_pay),
a_pledge: this.moneyToIntPipe.transform((new BigNumber(a_pledge)).minus(to_pay).toString()),
a_pledge: this.moneyToIntPipe.transform(a_pledge),
b_pledge: this.moneyToIntPipe.transform(b_pledge)
},
payment_id: payment_id,

2
src/gui/qt-daemon/html_source/src/app/app.component.ts
View file

@ -317,8 +317,6 @@ export class AppComponent implements OnInit, OnDestroy {
const searchResult = this.variablesService.settings.viewedContracts.some(elem => elem.state === contract.state && elem.is_a === contract.is_a && elem.contract_id === contract.contract_id);
contract.is_new = !searchResult;
contract['private_detailes'].a_pledge = contract['private_detailes'].a_pledge.plus(contract['private_detailes'].to_pay);
let findContract = false;
for (let i = 0; i < wallet.contracts.length; i++) {
if (wallet.contracts[i].contract_id === contract.contract_id && wallet.contracts[i].is_a === contract.is_a) {

1
src/gui/qt-daemon/html_source/src/assets/i18n/en.json
View file

@ -352,7 +352,6 @@
},
"BUYER": {
"WAITING": "Waiting for response",
"PLEDGE_RESERVED": "Pledge amount reserved",
"IGNORED": "The seller ignored your contract proposal",
"ACCEPTED": "The seller accepted your contract proposal",
"WAIT": "Waiting for deposits confirmation",