diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/app.js | 17 | ||||
| -rw-r--r-- | src/i18n.js | 46 |
2 files changed, 32 insertions, 31 deletions
@@ -1914,22 +1914,23 @@ function balanceCard() { // is the on-chain one. The headline is simply everything you have. const spending = featureHook('spendingSat') || 0; const saving = wallet.spendable; - const split = spending > 0 || saving > 0; + const hasArk = !!featureHook('arkReady'); return h( 'div', { class: 'card balance' }, - h('div', { class: 'small faint', style: 'text-transform:uppercase;letter-spacing:.05em' }, t('balance')), + // Spending is the balance people use, so it IS the balance: headline, + // with Saving as a quieter line underneath. No total — the two are + // different kinds of money, and adding them up says nothing useful. + h('div', { class: 'small faint', style: 'text-transform:uppercase;letter-spacing:.05em' }, + hasArk ? t('spendingLabel') : t('balance')), h('div', { class: 'amt', style: firstLoad ? 'opacity:.3' : '' }, firstLoad ? h('span', { class: 'spinner sm', style: 'margin-right:8px' }) : null, - fmtAmount(spending + saving), ' ', unitTag('unit')), - split || pending > 0 || featLines.length + fmtAmount(hasArk ? spending : saving), ' ', unitTag('unit')), + hasArk || pending > 0 || featLines.length ? h( 'div', { class: 'split' }, - split - ? h('div', {}, h('div', { class: 'k' }, t('spendingLabel')), h('div', { class: 'v' }, fmtAmount(spending), ' ', unitTag())) - : null, - split + hasArk ? h('div', {}, h('div', { class: 'k' }, t('savingLabel')), h('div', { class: 'v' }, fmtAmount(saving), ' ', unitTag())) : null, pending > 0 diff --git a/src/i18n.js b/src/i18n.js index 67e43bd..5e0138e 100644 --- a/src/i18n.js +++ b/src/i18n.js @@ -129,10 +129,10 @@ const STR = { hiwBasics3: 'There’s no server and no account. The whole app is a single page that runs in your browser, so nobody holds your coins and nothing on a server ever sees your keys. To show your balance and history it reads from a public block explorer (mempool.space by default, or your own node if you set one in Settings).', hiwBasics4: 'You can even save this page and open it straight from your computer with no internet at all. It keeps working offline.', hiwBasics5: 'It follows the usual Bitcoin standards (a 12-word BIP39 phrase and BIP84 native SegWit keys), so if this site ever disappears you can restore the same phrase in Sparrow, Electrum, or any other standard wallet and your coins will be right there.', - hiwLnTitle: 'Spending and Saving', - hiwLn1: 'Your money sits in two places. Saving is ordinary on-chain Bitcoin: the safest place to keep it, but every move costs a mining fee and waits for a confirmation. Spending is for everyday use — it sends and arrives instantly, costs nothing to send, and still belongs only to you.', + hiwLnTitle: 'Spending and Savings', + hiwLn1: 'Your money sits in two places. Savings is ordinary on-chain Bitcoin: the safest place to keep it, but every move costs a mining fee and waits for a confirmation. Spending is for everyday use — it sends and arrives instantly, costs nothing to send, and still belongs only to you.', hiwArkTitle: 'Moving between them', - hiwArk1: 'Use “Move money” under your balance to shift funds either way. Money moved into Spending is ready after one confirmation; money moved back to Saving arrives the same way. You can always get your money out on your own, even if our server disappears — that path takes about a day and costs a mining fee. Behind the scenes this uses Ark and Lightning, but you never have to think about either.', + hiwArk1: 'Use “Move money” under your balance to shift funds either way. Money moved into Spending is ready after one confirmation; money moved back to Savings arrives the same way. You can always get your money out on your own, even if our server disappears — that path takes about a day and costs a mining fee. Behind the scenes this uses Ark and Lightning, but you never have to think about either.', hiwArk2: 'The server can never take your money: every coin you hold in the Ark comes with a pre-signed escape route, and the wallet can put it back on-chain even if the server disappears (“Exit on-chain without the server” in Settings — it takes a while and needs a little on-chain balance for fees, but it needs nobody’s permission).', hiwArk3: 'The housekeeping: Ark coins expire after some weeks, so refresh them (Settings) before then — a wallet left untouched past expiry can be swept by the server. Boarding pays a small server fee plus a normal mining fee; paying inside the Ark is free; withdrawing on-chain pays a server fee taken from the amount.', hiwSpTitle: 'Silent payments', @@ -144,12 +144,12 @@ const STR = { moveTitle: 'Move money', moveToSpending: 'Into Spending', moveToSpendingDesc: 'Make money instantly spendable, with no fees to send it.', - moveToSaving: 'Into Saving', + moveToSaving: 'Into Savings', moveToSavingDesc: 'Park money in ordinary on-chain Bitcoin.', - moveToSavingBtn: 'Move to Saving', + moveToSavingBtn: 'Move to Savings', moveAvailable: '{n} in Spending', spendingLabel: 'Spending', - savingLabel: 'Saving', + savingLabel: 'Savings', movingLabel: 'Moving…', balance: 'Balance', pending: 'Pending', @@ -347,13 +347,13 @@ const STR = { detectedElectrum: 'Electrum — data + instant payment notifications.', detectedEsplora: 'Block explorer (Esplora) — data only; polls for payments.', silentPaymentNote: 'Silent payment', - receiveAddressTab: 'Saving address', + receiveAddressTab: 'Savings address', receiveLnTab: 'Lightning', receiveSpTab: 'Silent payment', receiveArkTab: 'Instant', arkReceiveIntro: 'Receive instantly and free — straight into Spending.', arkTitle: 'Spending balance', - arkDesc: 'Your Spending balance sends and receives instantly with no mining fees, and stays yours — you can move it back to Saving whenever you like.', + arkDesc: 'Your Spending balance sends and receives instantly with no mining fees, and stays yours — you can move it back to Savings whenever you like.', arkServerUrl: 'Server URL', arkEsploraUrl: 'Esplora URL (chain source)', arkWatchOnly: 'Spending needs the wallet keys — load the seed to use it.', @@ -371,11 +371,11 @@ const STR = { arkBoardFeeLabel: 'Fee', arkBoardedTitle: 'On its way!', arkBoardedNote: 'Ready to spend after 1 confirmation.', - arkBoardIntro: 'Move money from Saving into Spending:', - arkBoardAvailable: '{n} in Saving', - arkBoardNoFunds: 'Needs at least {n} sats in Saving.', + arkBoardIntro: 'Move money from Savings into Spending:', + arkBoardAvailable: '{n} in Savings', + arkBoardNoFunds: 'Needs at least {n} sats in Savings.', arkRefreshBtn: 'Refresh / consolidate {n} coin(s)', - arkOffboardBtn: 'Move {n} to Saving', + arkOffboardBtn: 'Move {n} to Savings', giftSourceChain: 'On-chain', giftSourceArk: 'Spending', giftArkNote: 'Sent from Spending — the link claims instantly, with no fee.', @@ -384,22 +384,22 @@ const STR = { claimArkFree: 'instant, no fee', arkGiftWrongNet: 'This gift lives on {net} — switch the network in Settings, then open the link again.', arkOffboardedTitle: 'On its way!', - arkOffboardedNote: 'Arrives in Saving after 1 confirmation.', - arkOffboarded: 'Moved to Saving', - arkOffboardHistory: 'Moved to Saving', - arkExitBtn: 'Move to Saving without the server ({n} coin(s))', + arkOffboardedNote: 'Arrives in Savings after 1 confirmation.', + arkOffboarded: 'Moved to Savings', + arkOffboardHistory: 'Moved to Savings', + arkExitBtn: 'Move to Savings without the server ({n} coin(s))', arkExitStarted: 'Unilateral exit started for {n} coin(s) — broadcasting the exit chain.', - arkExitNoFeeCoin: 'This needs a little in Saving to pay the mining fees.', + arkExitNoFeeCoin: 'This needs a little in Savings to pay the mining fees.', arkExitChainStatus: 'Moving {n} sats — step {done} of {total}…', arkExitTimelockStatus: 'Exiting {n} sats — {blocks} block(s) of timelock left{eta}', arkExitClaimingStatus: 'Exiting {n} sats — almost done, awaiting confirmation', arkExitRetrying: 'hit a snag — retrying automatically', arkExitCancel: 'Cancel this exit', - arkExitLink: 'Move to Saving', - arkExitPageTitle: 'Move money to Saving', - arkExitPageIntro: 'Two ways to move your Spending balance into Saving.', + arkExitLink: 'Move to Savings', + arkExitPageTitle: 'Move money to Savings', + arkExitPageIntro: 'Two ways to move your Spending balance into Savings.', arkCoopTitle: 'Cooperative (recommended)', - arkCoopDesc: 'The normal way: one transaction into Saving, ready after a single confirmation, with a small fee taken from the amount.', + arkCoopDesc: 'The normal way: one transaction into Savings, ready after a single confirmation, with a small fee taken from the amount.', arkUniTitle: 'Unilateral exit', arkUniDesc: 'Your escape hatch: claim the money yourself without anyone’s help. Takes about a day and costs mining fees, but works even if the server disappears.', arkExitNoBalance: 'Nothing in Spending to move.', @@ -489,8 +489,8 @@ const STR = { arkLnPaidHistory: 'Sent', arkLnReceivedHistory: 'Received', arkLnCancelInvoice: 'Cancel invoice', - arkExited: 'Moved to Saving', - arkExitHistory: 'Moved to Saving', + arkExited: 'Moved to Savings', + arkExitHistory: 'Moved to Savings', arkRefreshStarted: 'Refresh submitted — completes with the next round.', arkSendTitle: 'Send', arkSendHint: 'Ark address — sent instantly off-chain, no mining fee.', |