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

Contracts text changes && select scroll fix

Browse source
This commit is contained in:
wildkif 2019-05-24 14:24:19 +03:00
parent c0742f281e
commit 82b9d1046a
12 changed files with 138 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -304,10 +304,10 @@
"UPDATE_ALIAS": "Fee for editing alias",
"POW_REWARD": "POW reward",
"POS_REWARD": "POS reward",
"CREATE_CONTRACT": "Send contract offer",
"PLEDGE_CONTRACT": "Make pledge on offer",
"CREATE_CONTRACT": "Contract proposal",
"PLEDGE_CONTRACT": "Contract deposit",
"NULLIFY_CONTRACT": "Nullify pledges for contract",
"PROPOSAL_CANCEL_CONTRACT": "Send proposal to cancel contract",
"PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
"CANCEL_CONTRACT": "Cancel contract, return pledges"
}
},
@ -324,12 +324,12 @@
"LISTING_BUTTON": "Create listing",
"TIME_LEFT": {
"REMAINING_LESS_ONE": "Less than an hour to respond",
"REMAINING_ONE": "Remaining {{time}} hour",
"REMAINING_MANY": "Remaining {{time}} hours",
"REMAINING_MANY_ALT": "Remaining {{time}} hours",
"REMAINING_ONE_RESPONSE": "Remaining {{time}} hour for response",
"REMAINING_MANY_RESPONSE": "Remaining {{time}} hours for response",
"REMAINING_MANY_ALT_RESPONSE": "Remaining {{time}} hours for response",
"REMAINING_ONE": "{{time}} hour remain",
"REMAINING_MANY": "{{time}} hours remain",
"REMAINING_MANY_ALT": "{{time}} hours remain",
"REMAINING_ONE_RESPONSE": "{{time}} hour remain",
"REMAINING_MANY_RESPONSE": "{{time}} hours remain",
"REMAINING_MANY_ALT_RESPONSE": "{{time}} hours remain",
"REMAINING_ONE_WAITING": "Remaining {{time}} hour waiting",
"REMAINING_MANY_WAITING": "Remaining {{time}} hours waiting",
"REMAINING_MANY_ALT_WAITING": "Remaining {{time}} hours waiting"
@ -338,38 +338,32 @@
"SELLER": {
"NEW_CONTRACT": "New contract proposal",
"IGNORED": "You ignored the contract proposal",
"ACCEPTED": "You have accepted the contract proposal",
"WAIT": "Please wait for the pledges to be made",
"BUYER_WAIT": "The buyer is waiting for the item to be delivered",
"PLEDGES_MADE": "Pledges made",
"COMPLETED": "Contract completed successfully",
"RECEIVED": "Item received, payment transferred, pledges returned",
"ACCEPTED": "Contract started",
"WAIT": "Waiting for contract confirmation",
"WAITING_BUYER": "Waiting for delivery",
"COMPLETED": "Contract completed",
"NOT_RECEIVED": "Item not received",
"NULLIFIED": "All pledges nullified",
"PROPOSAL_CANCEL": "New proposal to cancel contract and return pledges",
"BEING_CANCELLED": "The contract is being cancelled. Please wait for the pledge to be returned",
"BEING_CANCELLED": "Cancellation in progress",
"CANCELLED": "Contract canceled",
"PLEDGES_RETURNED": "Pledges returned",
"IGNORED_CANCEL": "You ignored the proposal to cancel the contract",
"EXPIRED": "The contract proposal has expired"
},
"BUYER": {
"WAITING": "Waiting for seller respond to contract proposal",
"WAITING": "Waiting for response",
"PLEDGE_RESERVED": "Pledge amount reserved",
"IGNORED": "The seller ignored your contract proposal",
"PLEDGE_UNBLOCKED": "Pledge amount unblocked",
"ACCEPTED": "The seller accepted your contract proposal",
"WAIT": "Please wait for the pledges to be made",
"PLEDGES_MADE": "Pledges made",
"WAITING_SELLER": "Waiting for seller to ship item",
"COMPLETED": "Contract completed successfully",
"RECEIVED": "Item received, payment transferred, pledges returned",
"WAIT": "Waiting for deposits confirmation",
"WAITING_SELLER": "Waiting for delivery",
"COMPLETED": "Contract completed",
"NOT_RECEIVED": "Item not received",
"NULLIFIED": "All pledges nullified",
"WAITING_CANCEL": "Waiting for seller to respond to proposal to cancel contract and return pledges",
"BEING_CANCELLED": "The contract is being cancelled. Please wait for the pledge to be returned",
"WAITING_CANCEL": "Waiting for contract cancellation",
"BEING_CANCELLED": "Cancellation in progress",
"CANCELLED": "Contract canceled",
"PLEDGES_RETURNED": "Pledges returned",
"IGNORED_CANCEL": "The seller ignored your proposal to cancel the contract",
"EXPIRED": "The contract proposal has expired"
}
@ -389,12 +383,11 @@
"FORM_ERRORS": {
"DESC_REQUIRED": "Description is required.",
"DESC_MAXIMUM": "Maximum field length reached.",
"SELLER_REQUIRED": "Seller is required.",
"SELLER_NOT_VALID": "Seller not valid.",
"SELLER_REQUIRED": "Address required.",
"SELLER_NOT_VALID": "Invalid address.",
"ALIAS_NOT_VALID": "Alias not valid.",
"AMOUNT_REQUIRED": "Amount is required.",
"YOUR_DEPOSIT_REQUIRED": "Your deposit is required.",
"YOUR_DEPOSIT_TOO_SMALL": "Your deposit should be equal or greater than amount.",
"YOUR_DEPOSIT_REQUIRED": "Deposit required.",
"SELLER_DEPOSIT_REQUIRED": "Seller deposit is required.",
"SELLER_SAME": "The seller's and buyer's accounts are identical. The seller and buyer must use different wallet for the contract.",
"COMMENT_MAXIMUM": "Maximum field length reached."
@ -405,14 +398,14 @@
"PROGRESS_COMPLETE": "Completed",
"FEE": "Fee",
"PAYMENT": "Payment ID",
"ACCEPT_STATE_WAIT_BIG": "You have accepted the contract proposal. Please wait for the deposits to be made",
"IGNORED_ACCEPT": "You have ignored the contract proposal",
"ACCEPT_STATE_WAIT_BIG": "Contract started",
"IGNORED_ACCEPT": "Contract proposal ignored",
"BURN_PROPOSAL": "The deposits have been voided.",
"SUCCESS_FINISH_PROPOSAL": "The contract is complete. The payment has been sent.",
"SEND_CANCEL_PROPOSAL": "Proposal to cancel contract sent to seller",
"SUCCESS_FINISH_PROPOSAL": "Contract completed",
"SEND_CANCEL_PROPOSAL": "Cancellation request sent",
"IGNORED_CANCEL": "You have ignored the proposal to cancel the contract",
"DEALS_CANCELED_WAIT": "The contract is being cancelled. Please wait for the deposit to be returned",
"WAITING_TIME": "Time until response",
"DEALS_CANCELED_WAIT": "Cancellation in progress",
"WAITING_TIME": "Response time",
"NEED_MONEY": "There are insufficient funds in the wallet. Add funds to the wallet to continue",
"WAITING_SELLER": "Waiting for seller respond to contract proposal",
"IGNORED_SELLER": "The seller ignored your contract proposal",
@ -420,33 +413,30 @@
"WAITING_SHIP": "Waiting for seller to ship item",
"IGNORED_CANCEL_SELLER": "The seller ignored your proposal to cancel the contract",
"EXPIRED": "The contract proposal has expired",
"WAIT": "Please wait for the pledges to be made",
"COMPLETED": "Contract completed successfully",
"RECEIVED": "Item received, payment transferred, pledges returned",
"WAIT": "Waiting for deposits confirmation",
"COMPLETED": "Contract completed",
"NOT_RECEIVED": "Item not received",
"NULLIFIED": "All pledges nullified",
"PROPOSAL_CANCEL_SELLER": "You have made a proposal to cancel the contract",
"BEING_CANCELLED": "The contract is being cancelled. Please wait for the pledge to be returned",
"PROPOSAL_CANCEL_SELLER": "Cancellation request sent",
"BEING_CANCELLED": "Cancellation in progress",
"CANCELLED": "Contract canceled",
"PLEDGES_RETURNED": "Pledges returned",
"WAITING_BUYER": "The buyer is proposing a contract",
"IGNORED_BUYER": "You ignored the contract proposal",
"WAITING_BUYER": "Contract proposal received",
"IGNORED_BUYER": "Contract proposal ignored",
"IGNORED_CANCEL_BUYER": "You ignored the proposal to cancel the contract",
"BUYER_WAIT": "The buyer is waiting for the item to be delivered",
"PLEDGES_MADE": "Pledges made",
"PROPOSAL_CANCEL_BUYER": "The buyer is offering to cancel the contract and return the pledge",
"PROPOSAL_CANCEL_BUYER": "Cancellation request received",
"BUTTON_MAKE_PLEDGE": "Accept and make deposit",
"BUTTON_IGNORE": "Ignore and hide offer",
"BUTTON_NULLIFY": "Terminate and burn deposits",
"BUTTON_RECEIVED": "Complete and release deposits",
"BUTTON_CANCEL_BUYER": "Cancel and return deposits",
"BUTTON_NOT_CANCEL": "Do not cancel (Item shipped)",
"BUTTON_CANCEL_SELLER": "Cancel contract (Return pledge)",
"BUTTON_NOT_CANCEL": "Ignore request",
"BUTTON_CANCEL_SELLER": "Confirm and return deposits",
"HOUR": "hour",
"HOURS": "hours",
"CANCEL": "Cancel",
"NULLIFY_QUESTION": "Are you sure you want to nullify your pledge and the seller's pledge?",
"BUTTON_NULLIFY_SHORT": "Nullify",
"NULLIFY_QUESTION": "Are you sure you want to burn both deposits?",
"BUTTON_NULLIFY_SHORT": "Burn",
"WAITING_TIME_QUESTION": "Are you sure you want to cancel the contract?"
},
"MESSAGES": {

24
src/gui/qt-daemon/html/assets/scss/base/_base.scss
View file

@ -785,7 +785,7 @@ input[type='checkbox'].style-checkbox {
.ng-select {
&.lock-selection-select {
&.custom-select {
width: 100%;
.ng-select-container {
@ -845,6 +845,28 @@ input[type='checkbox'].style-checkbox {
}
}
}
&::-webkit-scrollbar {
background-color: transparent;
cursor: default;
width: 1rem;
height: 1rem;
}
&::-webkit-scrollbar-track {
background: transparent;
}
&::-webkit-scrollbar-thumb {
background-color: #556576;
background-clip: padding-box;
border: 0.25rem solid transparent;
border-radius: 0.5rem;
}
&::-webkit-scrollbar-thumb:hover {
background-color: #556576;
}
}
}
}

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

File diff suppressed because one or more lines are too long

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/styles.js
View file

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

10
src/gui/qt-daemon/html_source/src/app/_helpers/pipes/contract-status-messages.pipe.ts
View file

@ -22,12 +22,10 @@ export class ContractStatusMessagesPipe implements PipeTransform {
state.part2 = this.translate.instant('CONTRACTS.STATUS_MESSAGES.SELLER.WAIT');
break;
case 2:
state.part1 = this.translate.instant('CONTRACTS.STATUS_MESSAGES.SELLER.BUYER_WAIT');
state.part2 = this.translate.instant('CONTRACTS.STATUS_MESSAGES.SELLER.PLEDGES_MADE');
state.part1 = this.translate.instant('CONTRACTS.STATUS_MESSAGES.SELLER.WAITING_BUYER');
break;
case 3:
state.part1 = this.translate.instant('CONTRACTS.STATUS_MESSAGES.SELLER.COMPLETED');
state.part2 = this.translate.instant('CONTRACTS.STATUS_MESSAGES.SELLER.RECEIVED');
break;
case 4:
state.part1 = this.translate.instant('CONTRACTS.STATUS_MESSAGES.SELLER.NOT_RECEIVED');
@ -41,7 +39,6 @@ export class ContractStatusMessagesPipe implements PipeTransform {
break;
case 6:
state.part1 = this.translate.instant('CONTRACTS.STATUS_MESSAGES.SELLER.CANCELLED');
state.part2 = this.translate.instant('CONTRACTS.STATUS_MESSAGES.SELLER.PLEDGES_RETURNED');
break;
case 130:
state.part1 = this.translate.instant('CONTRACTS.STATUS_MESSAGES.SELLER.IGNORED_CANCEL');
@ -58,7 +55,6 @@ export class ContractStatusMessagesPipe implements PipeTransform {
switch (stateNum) {
case 1:
state.part1 = this.translate.instant('CONTRACTS.STATUS_MESSAGES.BUYER.WAITING');
state.part2 = this.translate.instant('CONTRACTS.STATUS_MESSAGES.BUYER.PLEDGE_RESERVED');
break;
case 110:
state.part1 = this.translate.instant('CONTRACTS.STATUS_MESSAGES.BUYER.IGNORED');
@ -70,15 +66,12 @@ export class ContractStatusMessagesPipe implements PipeTransform {
break;
case 2:
state.part1 = this.translate.instant('CONTRACTS.STATUS_MESSAGES.BUYER.ACCEPTED');
state.part2 = this.translate.instant('CONTRACTS.STATUS_MESSAGES.BUYER.PLEDGES_MADE');
break;
case 120:
state.part1 = this.translate.instant('CONTRACTS.STATUS_MESSAGES.BUYER.WAITING_SELLER');
state.part2 = this.translate.instant('CONTRACTS.STATUS_MESSAGES.BUYER.PLEDGES_MADE');
break;
case 3:
state.part1 = this.translate.instant('CONTRACTS.STATUS_MESSAGES.BUYER.COMPLETED');
state.part2 = this.translate.instant('CONTRACTS.STATUS_MESSAGES.BUYER.RECEIVED');
break;
case 4:
state.part1 = this.translate.instant('CONTRACTS.STATUS_MESSAGES.BUYER.NOT_RECEIVED');
@ -92,7 +85,6 @@ export class ContractStatusMessagesPipe implements PipeTransform {
break;
case 6:
state.part1 = this.translate.instant('CONTRACTS.STATUS_MESSAGES.BUYER.CANCELLED');
state.part2 = this.translate.instant('CONTRACTS.STATUS_MESSAGES.BUYER.PLEDGES_RETURNED');
break;
case 130:
state.part1 = this.translate.instant('CONTRACTS.STATUS_MESSAGES.BUYER.IGNORED_CANCEL');

14
src/gui/qt-daemon/html_source/src/app/purchase/purchase.component.html
View file

@ -70,9 +70,6 @@
{{ 'PURCHASE.FORM_ERRORS.YOUR_DEPOSIT_REQUIRED' | translate }}
</div>
</div>
<div class="error-block" *ngIf="purchaseForm.invalid && (purchaseForm.controls['yourDeposit'].dirty || purchaseForm.controls['amount'].touched) && purchaseForm.errors && purchaseForm.errors['your_deposit_too_small']">
{{ 'PURCHASE.FORM_ERRORS.YOUR_DEPOSIT_TOO_SMALL' | translate }}
</div>
</div>
<div class="input-block">
@ -116,7 +113,7 @@
</div>
<div class="input-block" *ngIf="newPurchase">
<label for="purchase-time">{{ 'PURCHASE.WAITING_TIME' | translate }}</label>
<ng-select id="purchase-time" class="lock-selection-select"
<ng-select id="purchase-time" class="custom-select"
[clearable]="false"
[searchable]="false"
formControlName="time">
@ -158,7 +155,6 @@
<span *ngIf="currentContract.state == 2">{{ 'PURCHASE.WAITING_SELLER' | translate }}</span>
<span *ngIf="currentContract.state == 3">{{ 'PURCHASE.COMPLETED' | translate }}</span>
<span *ngIf="currentContract.state == 3">{{ 'PURCHASE.RECEIVED' | translate }}</span>
<span *ngIf="currentContract.state == 4">{{ 'PURCHASE.NOT_RECEIVED' | translate }}</span>
<span *ngIf="currentContract.state == 4" class="error-text">{{ 'PURCHASE.NULLIFIED' | translate }}</span>
@ -169,7 +165,6 @@
<span *ngIf="currentContract.state == 601">{{ 'PURCHASE.BEING_CANCELLED' | translate }}</span>
<span *ngIf="currentContract.state == 6">{{ 'PURCHASE.CANCELLED' | translate }}</span>
<span *ngIf="currentContract.state == 6">{{ 'PURCHASE.PLEDGES_RETURNED' | translate }}</span>
</ng-container>
<ng-container *ngIf="!currentContract.is_a">
@ -185,10 +180,8 @@
<span *ngIf="currentContract.state == 201">{{ 'PURCHASE.WAIT' | translate }}</span>
<span *ngIf="currentContract.state == 2">{{ 'PURCHASE.BUYER_WAIT' | translate }}</span>
<span *ngIf="currentContract.state == 2">{{ 'PURCHASE.PLEDGES_MADE' | translate }}</span>
<span *ngIf="currentContract.state == 3">{{ 'PURCHASE.COMPLETED' | translate }}</span>
<span *ngIf="currentContract.state == 3">{{ 'PURCHASE.RECEIVED' | translate }}</span>
<span *ngIf="currentContract.state == 4">{{ 'PURCHASE.NOT_RECEIVED' | translate }}</span>
<span *ngIf="currentContract.state == 4" class="error-text">{{ 'PURCHASE.NULLIFIED' | translate }}</span>
@ -199,7 +192,6 @@
<span *ngIf="currentContract.state == 601">{{ 'PURCHASE.BEING_CANCELLED' | translate }}</span>
<span *ngIf="currentContract.state == 6">{{ 'PURCHASE.CANCELLED' | translate }}</span>
<span *ngIf="currentContract.state == 6">{{ 'PURCHASE.PLEDGES_RETURNED' | translate }}</span>
</ng-container>
<ng-container *ngIf="currentContract.state == 201 || currentContract.state == 601">
@ -248,8 +240,9 @@
<div class="time-cancel-block-row" *ngIf="showTimeSelect && !newPurchase && currentContract.is_a && (currentContract.state == 201 || currentContract.state == 2 || currentContract.state == 120 || currentContract.state == 130)">
<div class="time-cancel-block-question">{{ 'PURCHASE.WAITING_TIME_QUESTION' | translate }}</div>
<label for="purchase-timeCancel">{{ 'PURCHASE.WAITING_TIME' | translate }}</label>
<div class="input-block">
<ng-select id="purchase-timeCancel" class="lock-selection-select"
<ng-select id="purchase-timeCancel" class="custom-select"
[clearable]="false"
[searchable]="false"
formControlName="timeCancel">
@ -259,7 +252,6 @@
</ng-option>
</ng-select>
</div>
<label for="purchase-timeCancel">{{ 'PURCHASE.WAITING_TIME' | translate }}</label>
<div class="time-cancel-block-buttons">
<button type="button" class="blue-button" (click)="showTimeSelect = false;">{{ 'PURCHASE.CANCEL' | translate }}</button>
<button type="button" class="blue-button" (click)="dealsDetailsCancel();">{{ 'PURCHASE.BUTTON_CANCEL_BUYER' | translate }}</button>

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

@ -91,8 +91,6 @@ export class PurchaseComponent implements OnInit, OnDestroy {
time: new FormControl({value: 12, disabled: false}),
timeCancel: new FormControl({value: 12, disabled: false}),
payment: new FormControl('')
}, function (g: FormGroup) {
return (new BigNumber(g.get('yourDeposit').value)).isLessThan(g.get('amount').value) ? {'your_deposit_too_small': true} : null;
});
additionalOptions = false;

4
src/gui/qt-daemon/html_source/src/app/settings/settings.component.html
View file

@ -33,7 +33,7 @@
<div class="lock-selection">
<label class="lock-selection-title">{{ 'SETTINGS.APP_LOCK.TITLE' | translate }}</label>
<ng-select class="lock-selection-select"
<ng-select class="custom-select"
[items]="appLockOptions"
bindValue="id"
bindLabel="name"
@ -52,7 +52,7 @@
<div class="lock-selection">
<label class="lock-selection-title">{{ 'SETTINGS.APP_LOG_TITLE' | translate }}</label>
<ng-select class="lock-selection-select"
<ng-select class="custom-select"
[items]="appLogOptions"
bindValue="id"
bindLabel="id"

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

@ -304,10 +304,10 @@
"UPDATE_ALIAS": "Fee for editing alias",
"POW_REWARD": "POW reward",
"POS_REWARD": "POS reward",
"CREATE_CONTRACT": "Send contract offer",
"PLEDGE_CONTRACT": "Make pledge on offer",
"CREATE_CONTRACT": "Contract proposal",
"PLEDGE_CONTRACT": "Contract deposit",
"NULLIFY_CONTRACT": "Nullify pledges for contract",
"PROPOSAL_CANCEL_CONTRACT": "Send proposal to cancel contract",
"PROPOSAL_CANCEL_CONTRACT": "Cancellation request",
"CANCEL_CONTRACT": "Cancel contract, return pledges"
}
},
@ -324,12 +324,12 @@
"LISTING_BUTTON": "Create listing",
"TIME_LEFT": {
"REMAINING_LESS_ONE": "Less than an hour to respond",
"REMAINING_ONE": "Remaining {{time}} hour",
"REMAINING_MANY": "Remaining {{time}} hours",
"REMAINING_MANY_ALT": "Remaining {{time}} hours",
"REMAINING_ONE_RESPONSE": "Remaining {{time}} hour for response",
"REMAINING_MANY_RESPONSE": "Remaining {{time}} hours for response",
"REMAINING_MANY_ALT_RESPONSE": "Remaining {{time}} hours for response",
"REMAINING_ONE": "{{time}} hour remain",
"REMAINING_MANY": "{{time}} hours remain",
"REMAINING_MANY_ALT": "{{time}} hours remain",
"REMAINING_ONE_RESPONSE": "{{time}} hour remain",
"REMAINING_MANY_RESPONSE": "{{time}} hours remain",
"REMAINING_MANY_ALT_RESPONSE": "{{time}} hours remain",
"REMAINING_ONE_WAITING": "Remaining {{time}} hour waiting",
"REMAINING_MANY_WAITING": "Remaining {{time}} hours waiting",
"REMAINING_MANY_ALT_WAITING": "Remaining {{time}} hours waiting"
@ -338,38 +338,32 @@
"SELLER": {
"NEW_CONTRACT": "New contract proposal",
"IGNORED": "You ignored the contract proposal",
"ACCEPTED": "You have accepted the contract proposal",
"WAIT": "Please wait for the pledges to be made",
"BUYER_WAIT": "The buyer is waiting for the item to be delivered",
"PLEDGES_MADE": "Pledges made",
"COMPLETED": "Contract completed successfully",
"RECEIVED": "Item received, payment transferred, pledges returned",
"ACCEPTED": "Contract started",
"WAIT": "Waiting for contract confirmation",
"WAITING_BUYER": "Waiting for delivery",
"COMPLETED": "Contract completed",
"NOT_RECEIVED": "Item not received",
"NULLIFIED": "All pledges nullified",
"PROPOSAL_CANCEL": "New proposal to cancel contract and return pledges",
"BEING_CANCELLED": "The contract is being cancelled. Please wait for the pledge to be returned",
"BEING_CANCELLED": "Cancellation in progress",
"CANCELLED": "Contract canceled",
"PLEDGES_RETURNED": "Pledges returned",
"IGNORED_CANCEL": "You ignored the proposal to cancel the contract",
"EXPIRED": "The contract proposal has expired"
},
"BUYER": {
"WAITING": "Waiting for seller respond to contract proposal",
"WAITING": "Waiting for response",
"PLEDGE_RESERVED": "Pledge amount reserved",
"IGNORED": "The seller ignored your contract proposal",
"PLEDGE_UNBLOCKED": "Pledge amount unblocked",
"ACCEPTED": "The seller accepted your contract proposal",
"WAIT": "Please wait for the pledges to be made",
"PLEDGES_MADE": "Pledges made",
"WAITING_SELLER": "Waiting for seller to ship item",
"COMPLETED": "Contract completed successfully",
"RECEIVED": "Item received, payment transferred, pledges returned",
"WAIT": "Waiting for deposits confirmation",
"WAITING_SELLER": "Waiting for delivery",
"COMPLETED": "Contract completed",
"NOT_RECEIVED": "Item not received",
"NULLIFIED": "All pledges nullified",
"WAITING_CANCEL": "Waiting for seller to respond to proposal to cancel contract and return pledges",
"BEING_CANCELLED": "The contract is being cancelled. Please wait for the pledge to be returned",
"WAITING_CANCEL": "Waiting for contract cancellation",
"BEING_CANCELLED": "Cancellation in progress",
"CANCELLED": "Contract canceled",
"PLEDGES_RETURNED": "Pledges returned",
"IGNORED_CANCEL": "The seller ignored your proposal to cancel the contract",
"EXPIRED": "The contract proposal has expired"
}
@ -389,12 +383,11 @@
"FORM_ERRORS": {
"DESC_REQUIRED": "Description is required.",
"DESC_MAXIMUM": "Maximum field length reached.",
"SELLER_REQUIRED": "Seller is required.",
"SELLER_NOT_VALID": "Seller not valid.",
"SELLER_REQUIRED": "Address required.",
"SELLER_NOT_VALID": "Invalid address.",
"ALIAS_NOT_VALID": "Alias not valid.",
"AMOUNT_REQUIRED": "Amount is required.",
"YOUR_DEPOSIT_REQUIRED": "Your deposit is required.",
"YOUR_DEPOSIT_TOO_SMALL": "Your deposit should be equal or greater than amount.",
"YOUR_DEPOSIT_REQUIRED": "Deposit required.",
"SELLER_DEPOSIT_REQUIRED": "Seller deposit is required.",
"SELLER_SAME": "The seller's and buyer's accounts are identical. The seller and buyer must use different wallet for the contract.",
"COMMENT_MAXIMUM": "Maximum field length reached."
@ -405,14 +398,14 @@
"PROGRESS_COMPLETE": "Completed",
"FEE": "Fee",
"PAYMENT": "Payment ID",
"ACCEPT_STATE_WAIT_BIG": "You have accepted the contract proposal. Please wait for the deposits to be made",
"IGNORED_ACCEPT": "You have ignored the contract proposal",
"ACCEPT_STATE_WAIT_BIG": "Contract started",
"IGNORED_ACCEPT": "Contract proposal ignored",
"BURN_PROPOSAL": "The deposits have been voided.",
"SUCCESS_FINISH_PROPOSAL": "The contract is complete. The payment has been sent.",
"SEND_CANCEL_PROPOSAL": "Proposal to cancel contract sent to seller",
"SUCCESS_FINISH_PROPOSAL": "Contract completed",
"SEND_CANCEL_PROPOSAL": "Cancellation request sent",
"IGNORED_CANCEL": "You have ignored the proposal to cancel the contract",
"DEALS_CANCELED_WAIT": "The contract is being cancelled. Please wait for the deposit to be returned",
"WAITING_TIME": "Time until response",
"DEALS_CANCELED_WAIT": "Cancellation in progress",
"WAITING_TIME": "Response time",
"NEED_MONEY": "There are insufficient funds in the wallet. Add funds to the wallet to continue",
"WAITING_SELLER": "Waiting for seller respond to contract proposal",
"IGNORED_SELLER": "The seller ignored your contract proposal",
@ -420,33 +413,30 @@
"WAITING_SHIP": "Waiting for seller to ship item",
"IGNORED_CANCEL_SELLER": "The seller ignored your proposal to cancel the contract",
"EXPIRED": "The contract proposal has expired",
"WAIT": "Please wait for the pledges to be made",
"COMPLETED": "Contract completed successfully",
"RECEIVED": "Item received, payment transferred, pledges returned",
"WAIT": "Waiting for deposits confirmation",
"COMPLETED": "Contract completed",
"NOT_RECEIVED": "Item not received",
"NULLIFIED": "All pledges nullified",
"PROPOSAL_CANCEL_SELLER": "You have made a proposal to cancel the contract",
"BEING_CANCELLED": "The contract is being cancelled. Please wait for the pledge to be returned",
"PROPOSAL_CANCEL_SELLER": "Cancellation request sent",
"BEING_CANCELLED": "Cancellation in progress",
"CANCELLED": "Contract canceled",
"PLEDGES_RETURNED": "Pledges returned",
"WAITING_BUYER": "The buyer is proposing a contract",
"IGNORED_BUYER": "You ignored the contract proposal",
"WAITING_BUYER": "Contract proposal received",
"IGNORED_BUYER": "Contract proposal ignored",
"IGNORED_CANCEL_BUYER": "You ignored the proposal to cancel the contract",
"BUYER_WAIT": "The buyer is waiting for the item to be delivered",
"PLEDGES_MADE": "Pledges made",
"PROPOSAL_CANCEL_BUYER": "The buyer is offering to cancel the contract and return the pledge",
"PROPOSAL_CANCEL_BUYER": "Cancellation request received",
"BUTTON_MAKE_PLEDGE": "Accept and make deposit",
"BUTTON_IGNORE": "Ignore and hide offer",
"BUTTON_NULLIFY": "Terminate and burn deposits",
"BUTTON_RECEIVED": "Complete and release deposits",
"BUTTON_CANCEL_BUYER": "Cancel and return deposits",
"BUTTON_NOT_CANCEL": "Do not cancel (Item shipped)",
"BUTTON_CANCEL_SELLER": "Cancel contract (Return pledge)",
"BUTTON_NOT_CANCEL": "Ignore request",
"BUTTON_CANCEL_SELLER": "Confirm and return deposits",
"HOUR": "hour",
"HOURS": "hours",
"CANCEL": "Cancel",
"NULLIFY_QUESTION": "Are you sure you want to nullify your pledge and the seller's pledge?",
"BUTTON_NULLIFY_SHORT": "Nullify",
"NULLIFY_QUESTION": "Are you sure you want to burn both deposits?",
"BUTTON_NULLIFY_SHORT": "Burn",
"WAITING_TIME_QUESTION": "Are you sure you want to cancel the contract?"
},
"MESSAGES": {

24
src/gui/qt-daemon/html_source/src/assets/scss/base/_base.scss
View file

@ -785,7 +785,7 @@ input[type='checkbox'].style-checkbox {
.ng-select {
&.lock-selection-select {
&.custom-select {
width: 100%;
.ng-select-container {
@ -845,6 +845,28 @@ input[type='checkbox'].style-checkbox {
}
}
}
&::-webkit-scrollbar {
background-color: transparent;
cursor: default;
width: 1rem;
height: 1rem;
}
&::-webkit-scrollbar-track {
background: transparent;
}
&::-webkit-scrollbar-thumb {
background-color: #556576;
background-clip: padding-box;
border: 0.25rem solid transparent;
border-radius: 0.5rem;
}
&::-webkit-scrollbar-thumb:hover {
background-color: #556576;
}
}
}
}