feat: allow selecting multiple fiat currencies #3384 #3595

aryanraj45 · 2026-01-25T01:38:50Z

Description

This PR addresses issue #3384 by allowing users to select multiple fiat currencies simultaneously.

Key Changes:

SettingsStore: Added fiats array to persist multiple currency selections.
SelectCurrency View: Updated the UI to allow multi-select toggling with checkmarks.
FiatStore: Updated fetching logic to retrieve rates for all selected currencies (supports Yadio and Zeus sources).
Conversion Component: Refactored to loop through and display all active fiat conversions in the balance panes and headers.
AmountUtils: Extended unit handling to support specific fiat codes (e.g., 'USD', 'INR') alongside 'sats' and 'BTC'.

Why this is useful?

Users no longer need to switch settings back and forth to see their balance in different currencies. This is particularly useful for users dealing with multiple regional currencies or stablecoins.

Visuals

| Currency Selection |
|---|---|

Screen.Recording.2026-01-25.at.08.mp4

Fixes

Fixes #3384

gemini-code-assist · 2026-01-25T01:39:14Z

Summary of Changes

Hello @aryanraj45, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request introduces a significant enhancement by allowing users to select and display multiple fiat currencies concurrently. This change eliminates the need for users to constantly switch between currencies to view their balances, providing a more convenient and comprehensive financial overview, especially for those managing funds across different regional currencies or stablecoins. The underlying architecture has been updated to support this multi-selection, from persistent storage of selected currencies to dynamic fetching and display of their respective exchange rates.

Highlights

Multi-Fiat Currency Selection: Users can now select and view multiple fiat currencies simultaneously, enhancing flexibility for international users and those dealing with various regional currencies or stablecoins.
Persistent Currency Settings: The SettingsStore has been updated to store an array of selected fiat currencies, ensuring that user selections persist across sessions.
Dynamic Rate Fetching: The FiatStore now fetches exchange rates for all selected fiat currencies from configured sources (Yadio or Zeus), rather than just a single one.
Refactored Conversion Display: The Conversion component has been updated to iterate through and display all active fiat conversions in balance panes and headers, providing a comprehensive overview.
Enhanced Amount Utility: AmountUtils now supports specific fiat codes (e.g., 'USD', 'INR') in addition to 'sats' and 'BTC' for more accurate and flexible unit handling.
Gradle Version Update: The Gradle wrapper version has been updated from 9.0.0 to 8.13 in android/gradle/wrapper/gradle-wrapper.properties.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	`/gemini review`	Performs a code review for the current pull request in its current state.
Pull Request Summary	`/gemini summary`	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	`/gemini help`	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

gemini-code-assist

Code Review

This pull request primarily introduces support for displaying multiple fiat currencies simultaneously within the application. Key changes include updating the Conversion.tsx component to iterate and display rates for a list of fiat currencies stored in SettingsStore.settings.fiats. The FiatStore.ts was modified to fetch rates for multiple fiats using Promise.all and its getSymbol and getRate methods now accept an optional currencyCode argument. The SettingsStore.ts was updated to include a fiats array in its settings, ensuring backward compatibility by initializing it from the single fiat setting if missing. Related utility functions in AmountUtils.ts and UnitsUtils.ts were adjusted to handle dynamic currency codes. The SelectCurrency.tsx view was refactored to allow users to select multiple fiat currencies, adding or removing them from the fiats array, and the display in Currency.tsx now shows all selected fiats. Review comments suggest improving type safety in FiatStore.ts by using a type guard instead of as any when filtering fiat rates, and refactoring the currency selection logic in SelectCurrency.tsx to use a single isSelected variable for clarity and to reduce code duplication.

gemini-code-assist · 2026-01-25T01:42:20Z

stores/FiatStore.ts

-                    } else if (rate) {
-                        this.fiatRates = [rate];
-                    }
+                    this.fiatRates = rates.filter((r) => r != null) as any;


Using as any bypasses TypeScript's type safety. A type guard would be a better approach to ensure the filtered array is correctly typed.

Suggested change

this.fiatRates = rates.filter((r) => r != null) as any;

this.fiatRates = rates.filter((r): r is { name?: string; cryptoCode: string; currencyPair: string; code: string; rate: number; } => r != null);

gemini-code-assist · 2026-01-25T01:42:20Z

views/Settings/SelectCurrency.tsx

                                                (!currencyConverter &&
-                                                    selectedCurrency ===
-                                                        item.value) ||
-                                                (!selectedCurrency &&
-                                                    item.value === DEFAULT_FIAT)
+                                                    SettingsStore.settings.fiats.includes(
+                                                        item.value
+                                                    )) ||
+                                                    (!SettingsStore.settings
+                                                        .fiats &&
+                                                        item.value === DEFAULT_FIAT)
                                                    ? themeColor('highlight')
                                                    : themeColor('text'),
                                            fontFamily: 'PPNeueMontreal-Book'
                                        }}
                                    >
-                                        {`${item.flag ? item.flag : ''} ${
-                                            item.key
-                                        } ${
-                                            item.value ? `(${item.value})` : ''
-                                        }`}
+                                        {`${item.flag ? item.flag : ''} ${item.key
+                                            } ${item.value ? `(${item.value})` : ''
+                                            }`}
                                    </ListItem.Title>
                                </ListItem.Content>
-                                {(selectedCurrency === item.value ||
-                                    (!selectedCurrency &&
+                                {(SettingsStore.settings.fiats.includes(
+                                    item.value
+                                ) ||
+                                    (!SettingsStore.settings.fiats &&
                                        item.value === DEFAULT_FIAT)) &&
                                    !currencyConverter && (


The logic to determine if a currency is selected is duplicated for setting the color and showing the checkmark icon. This can be extracted into a single variable for clarity and to avoid repetition.

const isSelected = !currencyConverter && ( (SettingsStore.settings.fiats && SettingsStore.settings.fiats.includes(item.value)) || (!SettingsStore.settings.fiats && item.value === DEFAULT_FIAT) );

You can then use isSelected for both the color style and the conditional rendering of the checkmark icon. This would make the code cleaner and easier to maintain.

ajaysehwal · 2026-01-25T09:20:11Z

android/gradle/wrapper/gradle-wrapper.properties

@aryanraj45, you don’t need to change these files, so please remove this change.

Thanks for the review, @ajaysehwal!

I've removed the accidental change to gradle-wrapper.properties.
I also did a quick pass to clean up the code and improve type safety (removed unnecessary non-null assertions).

ajaysehwal · 2026-01-26T04:22:36Z

@aryanraj45, please run yarn verify locally before pushing your changes

aryanraj45 · 2026-01-26T06:31:53Z

@ajaysehwal Done! I've fixed all 65+ linting and formatting errors identified by yarn verify.

Cleaned up unused variables in
Wallet.tsx
.
Updated
AmountUtils.test.ts
to align with the new logic (it now correctly expects '0' instead of 'Disabled' when rates are unavailable).
Fixed formatting across all modified files.
yarn verify is now passing locally with 0 errors

ajaysehwal

@aryanraj45, your commit structure doesn’t look great right now. You’ve used the same title for two commits, and the last two commits seem unnecessary. Please revert the latest three commits and force-push again with only two commits. lmk if anything is unclear.

aryanraj45 · 2026-01-26T07:03:11Z

@ajaysehwal I've squashed the cleanup and refactor updates into a single commit as requested. The PR now contains exactly two commits:

The original feature request.
The cycle logic refactor + linting/type fixes.

kaloudis · 2026-01-27T04:53:48Z

android/gradle/wrapper/gradle-wrapper.properties

 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip


why was this changed?

kaloudis · 2026-01-27T04:54:38Z

components/UnitToggle.tsx

-        const { changeUnits, units } = UnitsStore!;
-        const { settings } = SettingsStore!;
+
+        if (!UnitsStore || !SettingsStore) return null;


why is this change required?

kaloudis · 2026-01-27T04:55:10Z

utils/AmountUtils.test.ts

            });

-            it('returns error when rate for currency is not available', () => {
+            it('returns 0 when rate for currency is not available', () => {


why does this behavior need to be changed?

This change prevents a visual flicker when switching currencies. When switching from one fiat to another, there's a brief moment where the new rate isn't loaded yet. Displaying 'Disabled' or 'N/A' causes the UI to flash, which is jarring. Returning '0' with the correct symbol ensures a smooth transition until the actual rate loads

I think this approach can cause further issues. You should find another approach.

This wasn't an issue before with single fiat functionality.

kaloudis · 2026-01-27T04:56:01Z

utils/UnitsUtils.ts

 };

-type Units = 'sats' | 'BTC' | 'fiat';
+type Units = 'sats' | 'BTC' | 'fiat' | string;


not a fan of this approach. Do we maybe need a type for our fiat strings?

kaloudis · 2026-01-27T04:57:17Z

views/Wallet/KeypadPane.tsx

Why do we need to make changes to this view? Shouldn't everything be covered by the Conversion and UnitToggle components?

aryanraj45 · 2026-01-27T13:06:32Z

@kaloudis Thanks for the detailed review! I've addressed all the feedback:

Reverted gradle-wrapper.properties (accidental change)
Reverted
UnitToggle.tsx
(removed unnecessary defensive code)
Fixed
KeypadPane.tsx

removed tap-to-cycle from main amount, now only the orange button triggers currency cycling

ajaysehwal

@aryanraj45, please review all the changed files. There still seem to be a lot of unnecessary changes. I don’t think this feature requires this many modifications, so please remove the unnecessary ones and keep only the required changes

metro_logs.txt

kaloudis · 2026-01-27T14:52:19Z

utils/AmountUtils.test.ts

            });

-            it('returns error when rate for currency is not available', () => {
+            it('returns 0 when rate for currency is not available', () => {


I think this approach can cause further issues. You should find another approach.

This wasn't an issue before with single fiat functionality.

kaloudis · 2026-01-27T16:37:32Z

stores/SettingsStore.ts

@@ -168,6 +168,8 @@ export interface Settings {
    authenticationAttempts?: number;
    fiatEnabled?: boolean;
    fiat?: string;


no need to have both fiat and fiats - best to consolidate them. Probably best to keep fiat and make it backwards compatible

@kaloudis done Consolidated fiat and fiats - fiat is now automatically derived from fiats[preferredFiatIndex]

…FiatIndex]

gemini-code-assist bot reviewed Jan 25, 2026

View reviewed changes

ajaysehwal reviewed Jan 25, 2026

View reviewed changes

kaloudis requested a review from ajaysehwal January 25, 2026 22:42

ajaysehwal reviewed Jan 26, 2026

View reviewed changes

aryanraj45 force-pushed the fiat-multi-select branch from 37a3170 to 9aa3c5b Compare January 26, 2026 07:00

kaloudis requested changes Jan 27, 2026

View reviewed changes

aryanraj45 force-pushed the fiat-multi-select branch from 9aa3c5b to 7b7d6e7 Compare January 27, 2026 13:00

ajaysehwal reviewed Jan 27, 2026

View reviewed changes

kaloudis requested changes Jan 27, 2026

View reviewed changes

aryanraj45 force-pushed the fiat-multi-select branch from 7b7d6e7 to b30f53c Compare January 27, 2026 15:51

feat: allow selecting multiple fiat currencies ZeusLN#3384

3bd340e

aryanraj45 force-pushed the fiat-multi-select branch from b30f53c to 3bd340e Compare January 27, 2026 16:18

kaloudis requested changes Jan 27, 2026

View reviewed changes

Consolidate fiat and fiats - fiat is now derived from fiats[preferred…

166418e

…FiatIndex]

aryanraj45 force-pushed the fiat-multi-select branch from f43de3c to 166418e Compare January 27, 2026 20:08

aryanraj45 requested review from ajaysehwal and kaloudis January 27, 2026 20:12

	this.fiatRates = rates.filter((r) => r != null) as any;
	this.fiatRates = rates.filter((r): r is { name?: string; cryptoCode: string; currencyPair: string; code: string; rate: number; } => r != null);

Uh oh!

feat: allow selecting multiple fiat currencies #3384 #3595

Are you sure you want to change the base?

feat: allow selecting multiple fiat currencies #3384 #3595

Conversation

aryanraj45 commented Jan 25, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Key Changes:

Why this is useful?

Visuals

Fixes

Uh oh!

gemini-code-assist bot commented Jan 25, 2026

Summary of Changes

Highlights

Footnotes

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist bot Jan 25, 2026

Choose a reason for hiding this comment

Uh oh!

gemini-code-assist bot Jan 25, 2026

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ajaysehwal commented Jan 26, 2026

Uh oh!

aryanraj45 commented Jan 26, 2026

Uh oh!

ajaysehwal left a comment

Choose a reason for hiding this comment

Uh oh!

aryanraj45 commented Jan 26, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

aryanraj45 commented Jan 27, 2026

Uh oh!

ajaysehwal left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

aryanraj45 commented Jan 25, 2026 •

edited

Loading