diff --git a/src/gui/qt-daemon/html/assets/i18n/en.json b/src/gui/qt-daemon/html/assets/i18n/en.json index cbb4ee07..be0fb900 100644 --- a/src/gui/qt-daemon/html/assets/i18n/en.json +++ b/src/gui/qt-daemon/html/assets/i18n/en.json @@ -245,6 +245,7 @@ "FORM_ERRORS": { "ADDRESS_REQUIRED": "Address is required.", "ADDRESS_NOT_VALID": "Address not valid.", + "ALIAS_NOT_VALID": "Alias not valid.", "AMOUNT_REQUIRED": "Amount is required.", "AMOUNT_ZERO": "Amount is zero.", "FEE_REQUIRED": "Fee is required.", diff --git a/src/gui/qt-daemon/html/assets/scss/layout/_wallet.scss b/src/gui/qt-daemon/html/assets/scss/layout/_wallet.scss index c650b043..2398b646 100644 --- a/src/gui/qt-daemon/html/assets/scss/layout/_wallet.scss +++ b/src/gui/qt-daemon/html/assets/scss/layout/_wallet.scss @@ -92,6 +92,24 @@ app-send { .form-send { + .input-block-address { + + .address-dropdown { + + @include themify($themes) { + background-color: themed(inputBackgroundColor); + color: themed(mainTextColor); + } + + + div:hover { + @include themify($themes) { + background-color: themed(selectHoverColor); + } + } + } + } + .send-select { @include themify($themes) { @@ -178,7 +196,7 @@ app-history { } } - .status.send { + .status.send { .icon { background-color: #ff5252; diff --git a/src/gui/qt-daemon/html/main.js b/src/gui/qt-daemon/html/main.js index 5b6fe0e4..ce4ff9d4 100644 --- a/src/gui/qt-daemon/html/main.js +++ b/src/gui/qt-daemon/html/main.js @@ -885,7 +885,7 @@ var Wallet = /** @class */ (function () { } else if ((item.hasOwnProperty('contract') && (item.contract[0].state === 3 || item.contract[0].state === 6 || item.contract[0].state === 601) && !item.contract[0].is_a)) { item.sortFee = item.fee.negated(); - item.sortAmount = item.amount.negated(); + item.sortAmount = item.amount; } else { if (!item.is_income) { @@ -5470,7 +5470,7 @@ var SeedPhraseComponent = /** @class */ (function () { /*! no static exports found */ /***/ (function(module, exports) { -module.exports = "
\r\n" +module.exports = "\r\n" /***/ }), @@ -5481,7 +5481,7 @@ module.exports = "