diff --git a/VERSION.properties b/VERSION.properties index 94a38d8..5f66ce5 100644 --- a/VERSION.properties +++ b/VERSION.properties @@ -1,2 +1,2 @@ -client.version=1.2.134 -server.version=1.2.126 +client.version=1.2.135 +server.version=1.2.127 diff --git a/shine-UI/js/pages/devnet-topup-view.js b/shine-UI/js/pages/devnet-topup-view.js index 4f4bc72..f258de4 100644 --- a/shine-UI/js/pages/devnet-topup-view.js +++ b/shine-UI/js/pages/devnet-topup-view.js @@ -16,7 +16,7 @@ function readWalletFromUrl() { } } -export function render({ navigate }) { +export function render() { const screen = document.createElement('section'); screen.className = 'stack'; screen.style.width = '100%'; @@ -51,21 +51,37 @@ export function render({ navigate }) { status.style.whiteSpace = 'pre-wrap'; status.textContent = 'Готово к пополнению.'; - const successHint = document.createElement('p'); - successHint.style.width = 'min(100%, 320px)'; - successHint.style.display = 'none'; - successHint.style.margin = '0'; - successHint.style.padding = '14px 16px'; - successHint.style.borderRadius = '16px'; - successHint.style.background = 'rgba(15, 159, 99, 0.14)'; - successHint.style.border = '2px solid rgba(15, 159, 99, 0.32)'; - successHint.style.fontSize = '24px'; - successHint.style.fontWeight = '800'; - successHint.style.lineHeight = '1.25'; - successHint.style.color = '#0f9f63'; - successHint.style.textAlign = 'center'; - successHint.style.whiteSpace = 'pre-wrap'; - successHint.textContent = ''; + const amountHint = document.createElement('p'); + amountHint.style.width = 'min(100%, 320px)'; + amountHint.style.display = 'none'; + amountHint.style.margin = '0'; + amountHint.style.fontSize = '22px'; + amountHint.style.fontWeight = '800'; + amountHint.style.lineHeight = '1.25'; + amountHint.style.color = '#1fc97a'; + amountHint.style.textAlign = 'center'; + amountHint.textContent = ''; + + const balanceHint = document.createElement('p'); + balanceHint.className = 'meta-muted'; + balanceHint.style.width = 'min(100%, 320px)'; + balanceHint.style.display = 'none'; + balanceHint.style.margin = '0'; + balanceHint.style.textAlign = 'center'; + balanceHint.style.fontSize = '14px'; + balanceHint.style.color = 'rgba(255,255,255,0.9)'; + balanceHint.textContent = ''; + + const closeHint = document.createElement('p'); + closeHint.style.width = 'min(100%, 320px)'; + closeHint.style.display = 'none'; + closeHint.style.margin = '0'; + closeHint.style.fontSize = '26px'; + closeHint.style.fontWeight = '800'; + closeHint.style.lineHeight = '1.25'; + closeHint.style.color = '#1fc97a'; + closeHint.style.textAlign = 'center'; + closeHint.textContent = 'Можете закрыть эту страницу и продолжить регистрацию.'; const fillBtn = document.createElement('button'); fillBtn.className = 'primary-btn'; @@ -110,7 +126,9 @@ export function render({ navigate }) { fillBtn.disabled = true; status.textContent = 'Отправляем перевод...'; - successHint.style.display = 'none'; + amountHint.style.display = 'none'; + balanceHint.style.display = 'none'; + closeHint.style.display = 'none'; try { const endpoint = state.entrySettings.solanaServer; @@ -123,19 +141,24 @@ export function render({ navigate }) { await updateSenderBalance(); const targetBalanceSol = await updateTargetBalance(); status.textContent = `Транзакция прошла.\nSignature: ${tx.signature}`; - status.style.fontSize = '18px'; - status.style.fontWeight = '700'; - status.style.color = '#0f9f63'; + status.style.fontSize = '13px'; + status.style.fontWeight = '500'; + status.style.color = 'rgba(255,255,255,0.88)'; fillBtn.style.display = 'none'; actions.style.display = 'none'; - successHint.style.display = ''; - successHint.textContent = `Кошелёк пополнен на ${TRANSFER_AMOUNT_SOL} SOL.\nНовый баланс: ${formatSol(targetBalanceSol || 0, 6)} SOL.\nМожете закрыть эту страницу и продолжить регистрацию.`; + amountHint.style.display = ''; + amountHint.textContent = `Кошелёк пополнен на ${TRANSFER_AMOUNT_SOL} SOL`; + balanceHint.style.display = ''; + balanceHint.textContent = `Новый баланс: ${formatSol(targetBalanceSol || 0, 6)} SOL`; + closeHint.style.display = ''; } catch (error) { status.textContent = `Ошибка перевода: ${error?.message || 'unknown'}`; status.style.fontSize = ''; status.style.fontWeight = ''; status.style.color = ''; - successHint.style.display = 'none'; + amountHint.style.display = 'none'; + balanceHint.style.display = 'none'; + closeHint.style.display = 'none'; } finally { fillBtn.disabled = false; } @@ -167,7 +190,9 @@ export function render({ navigate }) { senderBox, targetBox, status, - successHint, + amountHint, + balanceHint, + closeHint, actions, );