Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/design/wizard-design-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ Places: Welcome, empty states, the "all caught up" state, the Sent screen, store
| **Sent** | Know it worked | The closed ring with a tick in it; "Sent." and "Confirming, about 1 min". Done |
| **Receive** | Get paid | QR in a Star-coloured tile, your name or address beneath, "Request an amount", Share |
| **Activity** | See what happened | Every payment, newest first, opened from "See all" on Home; older ones load as you scroll. "You paid ana.zcash", note beneath, amount right. Tapping a row opens the transaction |
| **A transaction** | Know what happened to one payment | Read like a receipt, top to bottom. The avatar (a received sign for money in, swap for a move between your addresses), "You paid Ana" with the name opening the contact, the amount at 44 with the other unit beneath. Then one status line: a bright word and a dim detail beside the ring, closed with a tick for "Confirmed" or "Received", a quarter drawn for "Confirming" or "Arriving" (no time: a payment that couldn't be broadcast stays pending longer), the info sign for "Didn't go through" with "The money is back in your wallet, and no fee was charged." beneath; the confirmation count is not on it. The note in a card ("Their note" for money in). Then **Pay again** and **Open contact** (or **Save as a contact**) as outlined buttons; no Pay again while it is confirming, or for a payment to several people; if the contact's `.zcash` name has moved, the address choice takes the buttons' place; a payment that didn't go through is titled "Payment to Mika", its amount struck through, and gets **Try again**, the one white button. Both open the amount screen with the same ZEC and note, through the contact's `.zcash` check. For a send, the sum: Amount and Fee, a rule, Total; the chosen unit in the serif in the right-hand column, the other dimmer beside it, no lines between rows. Under it one quiet line about the price ("1 ZEC was $318.50 when you paid."). Last, **Technical details**, closed until tapped: the addresses and the transaction id to copy, the block and its confirmations, and the explorer link with what it sees |
| **A transaction** | Know what happened to one payment | Read like a receipt, top to bottom. The avatar (a received sign for money in, swap for a move between your addresses), "You paid Ana" with the name opening the contact, the amount at 44 with the other unit beneath. Then one status line: a bright word and a dim detail beside the ring, closed with a tick for "Confirmed" or "Received", a quarter drawn for "Confirming" or "Arriving" (no time: a payment that couldn't be broadcast stays pending longer), the info sign for "Didn't go through" with "The money is back in your wallet, and no fee was charged." beneath; the confirmation count is not on it. The note in a card ("Their note" for money in). Then **Pay again** and **Open contact** (or **Save contact**) as outlined buttons, side by side on one line each; the Testnet badge sits in the header, not between the title and the amount; no Pay again while it is confirming, or for a payment to several people; if the contact's `.zcash` name has moved, the address choice takes the buttons' place; a payment that didn't go through is titled "Payment to Mika", its amount struck through, and gets **Try again**, the one white button. Both open the amount screen with the same ZEC and note, through the contact's `.zcash` check. For a send, the sum: Amount and Fee, a rule, Total; the chosen unit in the serif in the right-hand column, the other dimmer beside it, no lines between rows. Under it one quiet line about the price ("1 ZEC was $318.50 when you paid."). Last, **Technical details**, closed until tapped: the addresses and the transaction id to copy, the block and its confirmations, and the explorer link with what it sees |
| **Contacts** | Find someone you saved | Opened from Me. Search, then everyone by name; the add sign at the top right. A search that finds nobody, when it is a full `.zcash` name, an address or a link, offers "Add … as a contact" and "Pay …" |
| **A contact** | Pay or ask someone you know | Photo or initial, the name you gave them, their `.zcash` name, then **Pay** and **Request** side by side (Request makes your usual link, titled "Ask Ana for …"), then the full address to copy, then "What you sent Ana": the latest three sends to this address with "See all" (Activity with only those). Sends only, and the page says why: a private payment doesn't say who sent it (zspace#359). **Edit** at the top right opens the photo, the name and Delete contact; the address is never edited |
| **Add a contact** | Save someone | "Name, address or link", Scan and Paste; with nothing typed, the people you've paid who aren't saved yet, each with Save. Then their name, and the native sheet shows the full address |
Expand Down
12 changes: 7 additions & 5 deletions mobile/app/tx/[txid].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,10 @@ export default function TxPage() {

return (
<Screen>
<ScreenHeader onBack={() => router.back()} />
{/* The Testnet badge rides in the header, clear of the title and the amount. */}
<ScreenHeader onBack={() => router.back()}>
<NetworkBadge />
</ScreenHeader>
<ScrollView contentContainerStyle={{ paddingBottom: 40 }}>
<View style={s.head}>
<Who tx={tx} name={d.name} address={d.who} />
Expand All @@ -135,7 +138,6 @@ export default function TxPage() {
fallback={d.title}
request={sentRequest}
/>
<NetworkBadge />
<Amount
zatoshis={d.amount}
size={44}
Expand Down Expand Up @@ -212,7 +214,7 @@ export default function TxPage() {
/>
) : null}
<Button
title={contact ? 'Open contact' : 'Save as a contact'}
title={contact ? 'Open contact' : 'Save contact'}
kind="secondary"
onPress={() =>
contact ? goToContact(to) : goToAddContact({ address: to, zcashName })
Expand Down Expand Up @@ -523,7 +525,7 @@ const useStyles = themed((c) =>
alignItems: 'center',
justifyContent: 'center',
},
title: { fontSize: 17, marginTop: 12, marginBottom: 2, textAlign: 'center' },
title: { fontSize: 17, marginTop: 12, marginBottom: 8, textAlign: 'center' },
titleTap: { minHeight: 48, justifyContent: 'center' },
titleName: { fontFamily: font.textBold },
titleMono: { fontFamily: font.mono, fontSize: 15 },
Expand All @@ -538,7 +540,7 @@ const useStyles = themed((c) =>
card: { backgroundColor: c.sheet, borderRadius: radius.card, paddingHorizontal: 16 },
note: { marginTop: 24, paddingVertical: 14, gap: 4 },
noteText: { fontSize: 17, lineHeight: 24 },
actions: { flexDirection: 'row', gap: 10, marginTop: 12 },
actions: { flexDirection: 'row', gap: 10, marginTop: 28 },
action: { flex: 1 },
sum: { marginTop: 24, paddingVertical: 8 },
sumRow: { flexDirection: 'row', alignItems: 'baseline', gap: 16, paddingVertical: 8 },
Expand Down
Loading