Skip to content

Fix sats notation success colors #273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SwissBitcoinPay merged 1 commit into from
Jun 23, 2025
Merged

Fix sats notation success colors #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
APP_VERSION=2.5.8

APP_BUILD_NUMBER=435
APP_BUILD_NUMBER=436
0 ...metadata/android/en-US/changelogs/435.txt → ...metadata/android/en-US/changelogs/436.txt
View file
Open in desktop
File renamed without changes.
0 ...metadata/android/fr-FR/changelogs/435.txt → ...metadata/android/fr-FR/changelogs/436.txt
View file
Open in desktop
File renamed without changes.
187 changes: 98 additions & 89 deletions src/screens/Invoice/Invoice.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,97 +310,106 @@ export const Invoice = () => {
);
}, [invoiceCurrency]);

const fiatSatAmountComponent = useMemo(() => {
const elements = formatDecimalComponents((amount || 0) / 1000).reduce(
(result, v) => {
const currentIsEnabled =
result[result.length - 1]?.isEnabled ||
(typeof v === "number" && v !== 0);
return [
...result,
{
value: v,
isEnabled: currentIsEnabled
}
];
},
[] as { value: string | number; isEnabled: boolean }[]
);

const isSatBtcInvoice =
invoiceCurrency && ["sat", "BTC"].includes(invoiceCurrency);
const getFiatSatAmountComponent = useCallback(
(isSuccessScreen = false) => {
const elements = formatDecimalComponents((amount || 0) / 1000).reduce(
(result, v) => {
const currentIsEnabled =
result[result.length - 1]?.isEnabled ||
(typeof v === "number" && v !== 0);
return [
...result,
{
value: v,
isEnabled: currentIsEnabled
}
];
},
[] as { value: string | number; isEnabled: boolean }[]
);

return (
<>
<S.AmountText>
{!isSatBtcInvoice &&
getFormattedUnit(
invoiceFiatAmount,
invoiceCurrency || "",
unitDecimals
)}
</S.AmountText>
{isAlive && (
<S.BtcSatsContainer
style={{ transform: [{ scale: isSatBtcInvoice ? 1.5 : 1 }] }}
gapSize={8}
direction="horizontal"
>
<BitcoinIcon size={20} />
<>
{elements.map((element) => (
<Text
weight={700}
h4
color={element.isEnabled ? colors.white : colors.grey}
>
{element.value}
</Text>
))}
</>
<S.AmountText subAmount>sats</S.AmountText>
</S.BtcSatsContainer>
)}
{isExternalInvoice &&
createdAt &&
delay &&
isAlive &&
delay > rateUpdateDelay && (
<ComponentStack
const isSatBtcInvoice =
invoiceCurrency && ["sat", "BTC"].includes(invoiceCurrency);

return (
<>
<S.AmountText>
{!isSatBtcInvoice &&
getFormattedUnit(
invoiceFiatAmount,
invoiceCurrency || "",
unitDecimals
)}
</S.AmountText>
{isAlive && (
<S.BtcSatsContainer
style={{ transform: [{ scale: isSatBtcInvoice ? 1.5 : 1 }] }}
gapSize={8}
direction="horizontal"
gapSize={4}
style={{ marginTop: 6 }}
>
<Text color={colors.grey} h6 weight={600}>
{t("rateUpdatedIn")} {formatSecondsToMMSS(updateRateTime)}
</Text>
<Pie
useNativeDriver
progress={updateRateTime / rateUpdateDelay}
color={colors.primaryLight}
size={14}
unfilledColor="transparent"
animationType="spring"
style={{ position: "relative", top: -1 }}
/>
</ComponentStack>
<BitcoinIcon size={20} />
<>
{elements.map((element) => (
<Text
weight={700}
h4
color={
element.isEnabled
? colors.white
: isSuccessScreen
? colors.successLight
: colors.grey
}
>
{element.value}
</Text>
))}
</>
<S.AmountText subAmount>sats</S.AmountText>
</S.BtcSatsContainer>
)}
</>
);
}, [
invoiceFiatAmount,
invoiceCurrency,
unitDecimals,
amount,
isExternalInvoice,
createdAt,
delay,
isAlive,
colors.grey,
colors.primaryLight,
t,
updateRateTime
]);
{isExternalInvoice &&
createdAt &&
delay &&
isAlive &&
delay > rateUpdateDelay && (
<ComponentStack
direction="horizontal"
gapSize={4}
style={{ marginTop: 6 }}
>
<Text color={colors.grey} h6 weight={600}>
{t("rateUpdatedIn")} {formatSecondsToMMSS(updateRateTime)}
</Text>
<Pie
useNativeDriver
progress={updateRateTime / rateUpdateDelay}
color={colors.primaryLight}
size={14}
unfilledColor="transparent"
animationType="spring"
style={{ position: "relative", top: -1 }}
/>
</ComponentStack>
)}
</>
);
},
[
invoiceFiatAmount,
invoiceCurrency,
unitDecimals,
amount,
isExternalInvoice,
createdAt,
delay,
isAlive,
colors.grey,
colors.primaryLight,
t,
updateRateTime
]
);

const successLottieRef = useRef<LottieView>(null);

Expand Down Expand Up @@ -908,7 +917,7 @@ export const Invoice = () => {
{!isWithdraw ? t("invoicePaid") : t("withdrawSuccess")}
</Text>
</S.MainContentStack>
{fiatSatAmountComponent}
{getFiatSatAmountComponent(true)}
</S.Section>
</S.SectionsContainer>
</S.InvoicePageContainer>
Expand Down Expand Up @@ -1154,7 +1163,7 @@ export const Invoice = () => {
</S.AskButton>
</S.NFCWrapper>
)}
{fiatSatAmountComponent}
{getFiatSatAmountComponent()}
{alreadyPaidAmount > 0 && status === "underpaid" && (
<>
<S.BitcoinSlotText subAmount color={colors.warning}>
Expand Down
Loading