From 6a050f4ccc60a74bb2f7cabf4792caea2a6267f5 Mon Sep 17 00:00:00 2001 From: Gigi <109058+dergigi@users.noreply.github.com> Date: Thu, 18 Aug 2022 22:39:05 +0200 Subject: [PATCH] feat: colored jars with names (#476) * style(svg): add jamColor to all jars * feat: add jar flavor based on index * feat(jar): named jars with bold initial * feat(jar-detail): use initial, not index * feat: "Jar #{n}" -> "Jar {X}" * feat(send): use full name in from & recipient --- public/sprite.svg | 128 +++++++++--------- src/components/Send.jsx | 9 +- src/components/fb/FidelityBondSteps.tsx | 9 +- .../jar_details/JarDetailsOverlay.tsx | 11 +- src/components/jars/Jar.module.css | 24 ++++ src/components/jars/Jar.tsx | 59 +++++++- src/i18n/locales/en/translation.json | 13 +- src/i18n/locales/fr/translation.json | 2 - 8 files changed, 167 insertions(+), 88 deletions(-) diff --git a/public/sprite.svg b/public/sprite.svg index 85801990..389f5bdf 100644 --- a/public/sprite.svg +++ b/public/sprite.svg @@ -154,88 +154,88 @@ - - - - - - - - + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/components/Send.jsx b/src/components/Send.jsx index 722f331e..af68194b 100644 --- a/src/components/Send.jsx +++ b/src/components/Send.jsx @@ -20,6 +20,7 @@ import { SATS, formatBtc, formatSats } from '../utils' import { routes } from '../constants/routes' import styles from './Send.module.css' import { ConfirmModal } from './Modal' +import { jarInitial, jarName } from './jars/Jar' const IS_COINJOIN_DEFAULT_VAL = true // initial value for `minimum_makers` from the default joinmarket.cfg (last check on 2022-02-20 of v0.9.5) @@ -769,7 +770,7 @@ export default function Send() { .sort((lhs, rhs) => lhs.accountIndex - rhs.accountIndex) .map(({ accountIndex, totalBalance, calculatedTotalBalanceInSats }) => (