SHA256
Сделаны переводы другим пользователям
This commit is contained in:
@@ -8,7 +8,6 @@ import {
|
||||
formatSol,
|
||||
getBalanceSol,
|
||||
getWalletFromStoredBlockchainKey,
|
||||
transferSol,
|
||||
} from '../services/solana-wallet-service.js';
|
||||
import {
|
||||
formatAr,
|
||||
@@ -18,6 +17,7 @@ import {
|
||||
} from '../services/arweave-wallet-service.js';
|
||||
import { loadEncryptedUserSecrets } from '../services/key-vault.js';
|
||||
import { loadSolanaWeb3 } from '../vendor/solana-web3-loader.js';
|
||||
import { getUsdtBalance, getUsdtAsset } from '../services/solana-usdt-service.js';
|
||||
import { openArweaveAttachmentManager } from '../components/arweave-attachment-manager.js';
|
||||
import { buildArweaveDataUrl, sha256HexFromArrayBuffer } from '../services/arweave-file-service.js';
|
||||
import {
|
||||
@@ -1848,7 +1848,12 @@ export function render({navigate, chrome}) {
|
||||
const endpointLabel = document.createElement('p');
|
||||
endpointLabel.className = 'meta-muted';
|
||||
endpointLabel.textContent = `RPC: ${state.entrySettings.solanaServer}`;
|
||||
balanceWrap.append(balanceLabel, balanceValue, updatedLabel, endpointLabel);
|
||||
const usdtLine = document.createElement('div');
|
||||
usdtLine.className = 'wallet-multi-usdt-line';
|
||||
const usdtAsset = getUsdtAsset();
|
||||
usdtLine.innerHTML = `<span></span><strong>—</strong>`;
|
||||
usdtLine.querySelector('span').textContent = usdtAsset.label;
|
||||
balanceWrap.append(balanceLabel, balanceValue, usdtLine, updatedLabel, endpointLabel);
|
||||
|
||||
const addressCard = document.createElement('div');
|
||||
addressCard.className = 'card';
|
||||
@@ -1858,6 +1863,10 @@ export function render({navigate, chrome}) {
|
||||
<p style="font-size:13px; line-height:1.4; word-break:break-all;" id="wallet-address-value">—</p>
|
||||
`;
|
||||
const addressEl = addressCard.querySelector('#wallet-address-value');
|
||||
const receiveHint = document.createElement('p');
|
||||
receiveHint.className = 'meta-muted';
|
||||
receiveHint.textContent = t('wallet_multi.receive_hint');
|
||||
addressCard.append(receiveHint);
|
||||
enableAddressCopy(addressEl, () => walletAddress);
|
||||
|
||||
card.append(balanceWrap, addressCard);
|
||||
@@ -1867,7 +1876,7 @@ export function render({navigate, chrome}) {
|
||||
actions.innerHTML = `
|
||||
<div class="row">
|
||||
<button class="primary-btn" id="refresh-balance" style="flex:1;">${th('screens.wallet_view.text_293')}</button>
|
||||
<button class="primary-btn" id="send-sol" style="flex:1;">${th('screens.wallet_view.text_294')}</button>
|
||||
<button class="primary-btn" id="send-sol" style="flex:1;">${t('wallet_multi.transfer_title')}</button>
|
||||
</div>
|
||||
`;
|
||||
|
||||
@@ -1887,9 +1896,18 @@ export function render({navigate, chrome}) {
|
||||
});
|
||||
if (modeToken !== activeModeToken) return;
|
||||
balanceValue.textContent = `${formatSol(balance.sol, 6)} SOL`;
|
||||
let tokenErrorText = '';
|
||||
try {
|
||||
const token = await getUsdtBalance({ endpoint: state.entrySettings.solanaServer, address: walletAddress });
|
||||
if (modeToken !== activeModeToken) return;
|
||||
usdtLine.querySelector('strong').textContent = token.available ? token.text : t('wallet_multi.test_mint_missing');
|
||||
} catch (tokenError) {
|
||||
usdtLine.querySelector('strong').textContent = t('wallet_multi.balance_unavailable');
|
||||
tokenErrorText = `${t('wallet_multi.balance_unavailable')}: ${tokenError.message || tokenError}`;
|
||||
}
|
||||
updatedLabel.textContent = t('screens.wallet_view.text_181', { value1: nowRu() });
|
||||
endpointLabel.textContent = `RPC: ${balance.endpoint}`;
|
||||
setStatus(t('screens.wallet_view.text_085'));
|
||||
setStatus(tokenErrorText || t('screens.wallet_view.text_085'));
|
||||
} catch (error) {
|
||||
if (modeToken !== activeModeToken) return;
|
||||
setStatus(actionErrorText(t('screens.wallet_view.text_086'), error));
|
||||
@@ -1902,34 +1920,17 @@ export function render({navigate, chrome}) {
|
||||
void refreshBalance();
|
||||
});
|
||||
|
||||
sendBtn.addEventListener('click', async () => {
|
||||
if (!walletCtx?.keypair) {
|
||||
setStatus(t('screens.wallet_view.text_087'));
|
||||
return;
|
||||
}
|
||||
const toAddress = window.prompt(t('dialogs.pages.wallet_view.prompt_002'), '');
|
||||
if (!toAddress) return;
|
||||
const amountRaw = window.prompt(t('dialogs.pages.wallet_view.prompt_003'), '0.01');
|
||||
if (!amountRaw) return;
|
||||
sendBtn.addEventListener('click', () => navigate('wallet/transfer'));
|
||||
|
||||
sendBtn.disabled = true;
|
||||
try {
|
||||
const tx = await transferSol({
|
||||
endpoint: state.entrySettings.solanaServer,
|
||||
fromKeypair: walletCtx.keypair,
|
||||
toAddress,
|
||||
amountSol: Number(String(amountRaw || '').replace(',', '.')),
|
||||
});
|
||||
if (modeToken !== activeModeToken) return;
|
||||
setStatus(t('screens.wallet_view.text_182', { value1: tx.signature }));
|
||||
await refreshBalance();
|
||||
} catch (error) {
|
||||
if (modeToken !== activeModeToken) return;
|
||||
setStatus(actionErrorText(t('screens.wallet_view.text_088'), error));
|
||||
} finally {
|
||||
sendBtn.disabled = false;
|
||||
}
|
||||
});
|
||||
const swapHint = document.createElement('p');
|
||||
swapHint.className = 'meta-muted wallet-jupiter-hint';
|
||||
swapHint.textContent = t('wallet_swap.wallet_hint');
|
||||
const swapButton = document.createElement('button');
|
||||
swapButton.type = 'button';
|
||||
swapButton.className = 'secondary-btn wallet-jupiter-link';
|
||||
swapButton.textContent = t('wallet_swap.wallet_button');
|
||||
swapButton.addEventListener('click', () => navigate('wallet/swap'));
|
||||
actions.append(swapButton, swapHint);
|
||||
|
||||
content.append(backBtn, card, actions);
|
||||
setStatus(t('screens.wallet_view.text_089'));
|
||||
@@ -1986,6 +1987,10 @@ export function render({navigate, chrome}) {
|
||||
<p style="font-size:13px; line-height:1.4; word-break:break-all;" id="wallet-address-value">–</p>
|
||||
`;
|
||||
const addressEl = addressCard.querySelector('#wallet-address-value');
|
||||
const receiveHint = document.createElement('p');
|
||||
receiveHint.className = 'meta-muted';
|
||||
receiveHint.textContent = t('wallet_multi.receive_hint');
|
||||
addressCard.append(receiveHint);
|
||||
enableAddressCopy(addressEl, () => walletAddress);
|
||||
|
||||
const helpCard = document.createElement('details');
|
||||
|
||||
Reference in New Issue
Block a user