aboutsummaryrefslogtreecommitdiffstats
path: root/src/i18n.js
diff options
context:
space:
mode:
authorAdam Soltys <[email protected]>2026-11-15 19:30:16 -0700
committerAdam Soltys <[email protected]>2026-11-15 19:30:16 -0700
commite883fefbc9baff516af25869560cf6198c603fab (patch)
tree5781667c93d057f04d42ce2af603635ec943fb4e /src/i18n.js
parent5554c7066113976b49c18c5c7505dd252769e72d (diff)
downloadcoinosv3-e883fefbc9baff516af25869560cf6198c603fab.tar.gz
coinosv3-e883fefbc9baff516af25869560cf6198c603fab.zip
One balance: Spending and Savings on the same seed are one account. "Do you think we could combine the ARC and savings Bitcoin accounts into a single account? So if someone receives into a on-chain Bitcoin address, would hold it there, but they'd have a combined history, and it would select which coins to spend based on where you're paying out of, but the balance would be unified" … "Yeah go for it" (Adam, 2026-11-15). Step 1 of two: the wallet shows one balance card (the total, Ark and on-chain, with money mid-board still counted; an Instant / On-chain split appears only when there's some in both). History is one timeline, and a move between the two halves is one row priced at its cost: a board's on-chain Sent and its Boarded become "Made instant" (or "Making instant" while it confirms), and an offboard to our own address becomes "Moved on-chain". An offboard to someone else reads Sent. Receive leads with the payment address, with a Bitcoin address button for on-chain payers; the address stays on-chain and is all that's offered offline. Payments start from the Ark coins, and an on-chain address is paid from on-chain coins when there are any, leaving Ark only when there aren't. Accounts lists one row, Settings → Wallet has one balance row (Spending's coin settings plus the public key), and a per-device "Show Spending and Savings separately" brings the two-card carousel back as it was. Sign-ups are now this one account instead of Spending-only with Savings added later. Older Spending-only accounts are converted the same way, and the Add savings row only shows when the balances are shown apart. Not yet (step 2): covering a shortfall by boarding or offboarding automatically, and the "available now" split on the amount screen. New unified-balance-test (folded rows, their costs, the separate Spending timeline, on-chain-first routing) passes, along with signup-quick (one balance, Bitcoin address on Receive, separate toggle and back), balance-settings-row and send-enter-keys (both now opt into separate; send-enter-keys also enters through the seed-phrase door since Create became a sign-up), features-smoke, onboard-backup, gift-profile-setup, footer-support, pos, chat-layout, account-delete, lock-wallet, padlock-flow, profile-actions, gift-build, ark-ln-savings-small, carousel-flick, amber-dm-upgrade, send-lnaddr-advance, account-switch-leak and ark-offline-init. feed-choice-per-wallet fails at its second wallet's import, and fails the same way on 5554c70.HEADmaster
Co-Authored-By: Claude Opus 5.5 <[email protected]> Claude-Session: https://claude.ai/code/session_01VMan6SwkivduFDDkMmnXjZ
Diffstat (limited to 'src/i18n.js')
-rw-r--r--src/i18n.js12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/i18n.js b/src/i18n.js
index bb82ed2..9dfc172 100644
--- a/src/i18n.js
+++ b/src/i18n.js
@@ -1679,6 +1679,18 @@ const STR = {
settingsAdvancedDesc: 'Network, rarities, rescues',
aboutTitle: 'About',
recvAmount: 'Amount',
+ recvOnchain: 'Bitcoin address',
+ recvPaymentAddress: 'Payment address',
+ recvOnchainNote: 'For a payment on-chain, from an exchange or another wallet. It stays on-chain until you spend it.',
+ receiveOfflineOnchain: "You're offline. This on-chain address still takes payments.",
+ balInstant: 'Instant',
+ balOnchain: 'On-chain',
+ topUpInstant: 'Make on-chain bitcoin instant',
+ allSettingsDesc: 'Coins, renewals, lock, recovery phrase, public key',
+ separateBalances: 'Show Spending and Savings separately',
+ movedInstant: 'Made instant',
+ movingInstant: 'Making instant',
+ movedOnchain: 'Moved on-chain',
recvAmountTitle: 'Request an amount',
recvAmountNote: 'What it’s for (optional)',
recvAmountGo: 'Create invoice',