fix(mobile): rollback change to fiatCurrencyPreference in state, ref ENG-109

pete-watters · pete-watters · commit fb4c5192d9c8 · 2025-06-05T15:04:39.000Z
diff --git a/apps/mobile/src/app/settings/display/index.tsx b/apps/mobile/src/app/settings/display/index.tsx
@@ -35,7 +35,7 @@ export default function SettingsDisplayScreen() {
     accountDisplayPreference,
     bitcoinUnitPreference,
     changeHapticsPreference,
-    quoteCurrencyPreference,
+    fiatCurrencyPreference,
     hapticsPreference,
     themePreference,
   } = useSettings();
@@ -115,7 +115,7 @@ export default function SettingsDisplayScreen() {
             caption={i18n._({
               id: 'display.conversion_unit.cell_caption',
               message: '{currency}',
-              values: { currency: quoteCurrencyPreference },
+              values: { currency: fiatCurrencyPreference },
             })}
             icon={<DollarCircleIcon />}
             onPress={() => {
diff --git a/apps/mobile/src/features/send/components/recipient/use-relevant-activity.ts b/apps/mobile/src/features/send/components/recipient/use-relevant-activity.ts
@@ -10,18 +10,14 @@ import { getActivityService } from '@leather.io/services';
 
 export function useRelevantActivity(account: Account, assetInfo: FungibleCryptoAssetInfo) {
   const { fingerprint, accountIndex } = account;
-  const { quoteCurrencyPreference } = useSettings();
+  const { fiatCurrencyPreference } = useSettings();
   const accountAddresses = useAccountAddresses(fingerprint, accountIndex);
 
   // TODO: Duplicate of useActivityQuery with the same key but different selection.
   //       Look into removing this by enabling passing options into custom query hooks.
   return toFetchState(
     useQuery({
-      queryKey: [
-        'activity-service-get-account-activity',
-        accountAddresses,
-        quoteCurrencyPreference,
-      ],
+      queryKey: ['activity-service-get-account-activity', accountAddresses, fiatCurrencyPreference],
       queryFn: ({ signal }: QueryFunctionContext) =>
         getActivityService().getAccountActivity(accountAddresses, signal),
       refetchOnReconnect: false,
diff --git a/apps/mobile/src/features/send/screens/form.tsx b/apps/mobile/src/features/send/screens/form.tsx
@@ -26,7 +26,7 @@ export function Form() {
     state: { selectedAsset, selectedAccount },
     selectAsset,
   } = useSendFlowContext();
-  const { quoteCurrencyPreference } = useSettings();
+  const { fiatCurrencyPreference } = useSettings();
   const assetPickerSheetRef = useRef<SheetRef>(null);
   const [shouldAnimateAssetItem, setShouldAnimateAssetItem] = useState(true);
   const assetItemElementInitialOffset = shouldAnimateAssetItem
@@ -79,7 +79,7 @@ export function Form() {
                       marketData={marketData}
                       availableBalance={availableBalance}
                       quoteBalance={quoteBalance}
-                      quoteCurrency={quoteCurrencyPreference}
+                      quoteCurrency={fiatCurrencyPreference}
                       nonce={nonce}
                       onOpenAssetPicker={handleOpenAssetPicker}
                       assetItemAnimationOffsetTop={assetItemElementInitialOffset}
@@ -93,7 +93,7 @@ export function Form() {
                 {({ availableBalance, quoteBalance, feeRates, utxos, marketData }) => {
                   return (
                     <BtcForm
-                      quoteCurrency={quoteCurrencyPreference}
+                      quoteCurrency={fiatCurrencyPreference}
                       marketData={marketData}
                       availableBalance={availableBalance}
                       quoteBalance={quoteBalance}
diff --git a/apps/mobile/src/features/settings/conversion-unit-sheet.tsx b/apps/mobile/src/features/settings/conversion-unit-sheet.tsx
@@ -60,7 +60,7 @@ export function ConversionUnitSheet({ sheetRef }: ConversionUnitSheetProps) {
               })}
               onPress={() => onUpdateConversionUnit(symbol)}
               type="radio"
-              isRadioSelected={settings.quoteCurrencyPreference === symbol}
+              isRadioSelected={settings.fiatCurrencyPreference === symbol}
             />
           ))}
       </SettingsList>
diff --git a/apps/mobile/src/queries/activity/account-activity.query.ts b/apps/mobile/src/queries/activity/account-activity.query.ts
@@ -35,9 +35,9 @@ export function useActivityByAsset(
 }
 
 export function useTotalActivityQuery(accounts: AccountAddresses[]) {
-  const { quoteCurrencyPreference } = useSettings();
+  const { fiatCurrencyPreference } = useSettings();
   return useQuery({
-    queryKey: ['activity-service-get-total-activity', accounts, quoteCurrencyPreference],
+    queryKey: ['activity-service-get-total-activity', accounts, fiatCurrencyPreference],
     queryFn: ({ signal }: QueryFunctionContext) =>
       getActivityService().getTotalActivity(accounts, signal),
     refetchOnReconnect: false,
@@ -50,9 +50,9 @@ export function useTotalActivityQuery(accounts: AccountAddresses[]) {
 }
 
 export function useAccountActivityQuery(account: AccountAddresses) {
-  const { quoteCurrencyPreference } = useSettings();
+  const { fiatCurrencyPreference } = useSettings();
   return useQuery({
-    queryKey: ['activity-service-get-account-activity', account, quoteCurrencyPreference],
+    queryKey: ['activity-service-get-account-activity', account, fiatCurrencyPreference],
     queryFn: ({ signal }: QueryFunctionContext) =>
       getActivityService().getAccountActivity(account, signal),
     refetchOnReconnect: false,
@@ -68,9 +68,9 @@ export function useAccountActivityQuery(account: AccountAddresses) {
  * Keeping this as an example of services usage
  * @knipignore */
 export function useActivityByAssetQuery(account: AccountAddresses, asset: CryptoAssetInfo) {
-  const { quoteCurrencyPreference } = useSettings();
+  const { fiatCurrencyPreference } = useSettings();
   return useQuery({
-    queryKey: ['activity-service-get-activity-by-asset', account, asset, quoteCurrencyPreference],
+    queryKey: ['activity-service-get-activity-by-asset', account, asset, fiatCurrencyPreference],
     queryFn: ({ signal }: QueryFunctionContext) =>
       getActivityService().getActivityByAsset(account, asset, signal),
     refetchOnReconnect: false,
diff --git a/apps/mobile/src/queries/balance/account-balance.query.ts b/apps/mobile/src/queries/balance/account-balance.query.ts
@@ -25,8 +25,8 @@ export interface AccountBalance {
 
 export function useAccountBalance(accountId: AccountId): AccountBalance {
   const { fingerprint, accountIndex } = accountId;
-  const { quoteCurrencyPreference } = useSettings();
-  const zeroMoneyQuote = createMoney(0, quoteCurrencyPreference);
+  const { fiatCurrencyPreference } = useSettings();
+  const zeroMoneyQuote = createMoney(0, fiatCurrencyPreference);
 
   const btcAccountBalance = useBtcAccountBalance(fingerprint, accountIndex);
   const stxAccountBalance = useStxAccountBalance(fingerprint, accountIndex);
diff --git a/apps/mobile/src/queries/balance/btc-balance.query.ts b/apps/mobile/src/queries/balance/btc-balance.query.ts
@@ -17,9 +17,9 @@ export function useBtcAccountBalance(fingerprint: string, accountIndex: number)
 }
 
 function useBtcAccountBalanceQuery(account: AccountAddresses) {
-  const { quoteCurrencyPreference } = useSettings();
+  const { fiatCurrencyPreference } = useSettings();
   return useQuery({
-    queryKey: ['btc-balance-service-get-btc-account-balance', account, quoteCurrencyPreference],
+    queryKey: ['btc-balance-service-get-btc-account-balance', account, fiatCurrencyPreference],
     queryFn: ({ signal }: QueryFunctionContext) =>
       getBtcBalancesService().getBtcAccountBalance({ account, unprotectedUtxos: [] }, signal),
     refetchOnReconnect: false,
@@ -32,9 +32,9 @@ function useBtcAccountBalanceQuery(account: AccountAddresses) {
 }
 
 function useBtcAggregateBalanceQuery(accounts: AccountAddresses[]) {
-  const { quoteCurrencyPreference } = useSettings();
+  const { fiatCurrencyPreference } = useSettings();
   return useQuery({
-    queryKey: ['btc-balance-service-get-btc-aggregate-balance', accounts, quoteCurrencyPreference],
+    queryKey: ['btc-balance-service-get-btc-aggregate-balance', accounts, fiatCurrencyPreference],
     queryFn: ({ signal }: QueryFunctionContext) =>
       getBtcBalancesService().getBtcAggregateBalance(
         accounts.map(account => ({
diff --git a/apps/mobile/src/queries/balance/runes-balance.query.ts b/apps/mobile/src/queries/balance/runes-balance.query.ts
@@ -18,13 +18,13 @@ export function useRunesAccountBalance(fingerprint: string, accountIndex: number
 }
 
 function useRunesAggregateBalanceQuery(accounts: AccountAddresses[]) {
-  const { quoteCurrencyPreference } = useSettings();
+  const { fiatCurrencyPreference } = useSettings();
   const runeFlag = useRunesFlag();
   return useQuery({
     queryKey: [
       'runes-balances-service-get-runes-aggregate-balance',
       accounts,
-      quoteCurrencyPreference,
+      fiatCurrencyPreference,
     ],
     queryFn: ({ signal }: QueryFunctionContext) =>
       getRunesBalancesService().getRunesAggregateBalance(accounts, signal),
@@ -39,14 +39,10 @@ function useRunesAggregateBalanceQuery(accounts: AccountAddresses[]) {
 }
 
 function useRunesAccountBalanceQuery(account: AccountAddresses) {
-  const { quoteCurrencyPreference } = useSettings();
+  const { fiatCurrencyPreference } = useSettings();
   const runeFlag = useRunesFlag();
   return useQuery({
-    queryKey: [
-      'runes-balances-service-get-runes-account-balance',
-      account,
-      quoteCurrencyPreference,
-    ],
+    queryKey: ['runes-balances-service-get-runes-account-balance', account, fiatCurrencyPreference],
     queryFn: ({ signal }: QueryFunctionContext) =>
       getRunesBalancesService().getRunesAccountBalance(account, signal),
     enabled: runeFlag,
diff --git a/apps/mobile/src/queries/balance/sip10-balance.query.ts b/apps/mobile/src/queries/balance/sip10-balance.query.ts
@@ -22,12 +22,12 @@ export function useSip10AccountBalance(fingerprint: string, accountIndex: number
 }
 
 function useSip10AggregateBalanceQuery(addresses: string[]) {
-  const { quoteCurrencyPreference } = useSettings();
+  const { fiatCurrencyPreference } = useSettings();
   return useQuery({
     queryKey: [
       'sip10-balances-service-get-sip10-aggregate-balance',
       addresses,
-      quoteCurrencyPreference,
+      fiatCurrencyPreference,
     ],
     queryFn: ({ signal }: QueryFunctionContext) =>
       getSip10BalancesService().getSip10AggregateBalance(addresses, signal),
@@ -41,13 +41,9 @@ function useSip10AggregateBalanceQuery(addresses: string[]) {
 }
 
 function useSip10AddressBalanceQuery(address: string) {
-  const { quoteCurrencyPreference } = useSettings();
+  const { fiatCurrencyPreference } = useSettings();
   return useQuery({
-    queryKey: [
-      'sip10-balances-service-get-sip10-address-balance',
-      address,
-      quoteCurrencyPreference,
-    ],
+    queryKey: ['sip10-balances-service-get-sip10-address-balance', address, fiatCurrencyPreference],
     queryFn: ({ signal }: QueryFunctionContext) =>
       getSip10BalancesService().getSip10AddressBalance(address, signal),
     refetchOnReconnect: false,
diff --git a/apps/mobile/src/queries/balance/stx-balance.query.ts b/apps/mobile/src/queries/balance/stx-balance.query.ts
@@ -22,13 +22,9 @@ export function useStxAccountBalance(fingerprint: string, accountIndex: number)
 }
 
 function useStxAggregateBalanceQuery(addresses: string[]) {
-  const { quoteCurrencyPreference } = useSettings();
+  const { fiatCurrencyPreference } = useSettings();
   return useQuery({
-    queryKey: [
-      'stx-balances-service-get-stx-aggregate-balance',
-      addresses,
-      quoteCurrencyPreference,
-    ],
+    queryKey: ['stx-balances-service-get-stx-aggregate-balance', addresses, fiatCurrencyPreference],
     queryFn: ({ signal }: QueryFunctionContext) =>
       getStxBalancesService().getStxAggregateBalance(addresses, signal),
     refetchOnReconnect: false,
@@ -41,9 +37,9 @@ function useStxAggregateBalanceQuery(addresses: string[]) {
 }
 
 export function useStxAddressBalanceQuery(address: string) {
-  const { quoteCurrencyPreference } = useSettings();
+  const { fiatCurrencyPreference } = useSettings();
   return useQuery({
-    queryKey: ['stx-balances-service-get-stx-address-balance', address, quoteCurrencyPreference],
+    queryKey: ['stx-balances-service-get-stx-address-balance', address, fiatCurrencyPreference],
     queryFn: ({ signal }: QueryFunctionContext) =>
       getStxBalancesService().getStxAddressBalance(address, signal),
     refetchOnReconnect: false,
diff --git a/apps/mobile/src/queries/balance/total-balance.query.ts b/apps/mobile/src/queries/balance/total-balance.query.ts
@@ -24,8 +24,8 @@ interface TotalBalance {
 }
 
 export function useTotalBalance(): TotalBalance {
-  const { quoteCurrencyPreference } = useSettings();
-  const zeroMoneyQuote = createMoney(0, quoteCurrencyPreference);
+  const { fiatCurrencyPreference } = useSettings();
+  const zeroMoneyQuote = createMoney(0, fiatCurrencyPreference);
 
   const btcTotalBalance = useBtcTotalBalance();
   const stxTotalBalance = useStxTotalBalance();
diff --git a/apps/mobile/src/queries/market-data/market-data.query.spec.ts b/apps/mobile/src/queries/market-data/market-data.query.spec.ts
@@ -9,7 +9,7 @@ const maxTimeMs = 2147483647;
 // Mock the useSettings hook
 vi.mock('@/store/settings/settings', () => ({
   useSettings: () => ({
-    quoteCurrencyPreference: 'USD',
+    fiatCurrencyPreference: 'USD',
   }),
 }));
 
diff --git a/apps/mobile/src/queries/market-data/market-data.query.ts b/apps/mobile/src/queries/market-data/market-data.query.ts
@@ -27,6 +27,6 @@ export function createMarketDataQueryOptions(
 }
 
 export function useMarketDataQuery(asset: FungibleCryptoAssetInfo) {
-  const { quoteCurrencyPreference } = useSettings();
-  return useQuery(createMarketDataQueryOptions(asset, quoteCurrencyPreference));
+  const { fiatCurrencyPreference } = useSettings();
+  return useQuery(createMarketDataQueryOptions(asset, fiatCurrencyPreference));
 }
diff --git a/apps/mobile/src/store/settings/settings.read.ts b/apps/mobile/src/store/settings/settings.read.ts
@@ -47,7 +47,7 @@ export const selectBitcoinUnitPreference = createSelector(
 
 export const selectCurrencyPreference = createSelector(
   selectSettings,
-  state => state.quoteCurrencyPreference
+  state => state.fiatCurrencyPreference
 );
 
 export const selectEmailAddressPreference = createSelector(
diff --git a/apps/mobile/src/store/settings/settings.ts b/apps/mobile/src/store/settings/settings.ts
@@ -58,7 +58,7 @@ export const initialState: SettingsState = {
   bitcoinUnitPreference: 'bitcoin',
   createdOn: new Date().toISOString(),
   emailAddressPreference: '',
-  quoteCurrencyPreference: 'USD', // TODO: migrate to quoteCurrencyPreference
+  fiatCurrencyPreference: 'USD', // TODO LEA-2723: migrate to quoteCurrencyPreference
   networkPreference: WalletDefaultNetworkConfigurationIds.mainnet,
   privacyModePreference: 'visible',
   hapticsPreference: 'enabled',
@@ -76,7 +76,7 @@ export function useSettings() {
   const analyticsPreference = useSelector(selectAnalyticsPreference);
   const bitcoinUnitPreference = useSelector(selectBitcoinUnitPreference);
   const emailAddressPreference = useSelector(selectEmailAddressPreference);
-  const quoteCurrencyPreference = useSelector(selectCurrencyPreference);
+  const fiatCurrencyPreference = useSelector(selectCurrencyPreference);
   const privacyModePreference = useSelector(selectPrivacyModePreference);
   const hapticsPreference = useSelector(selectHapticsPreference);
   const networkPreference = useSelector(selectNetworkPreference);
@@ -93,7 +93,7 @@ export function useSettings() {
     analyticsPreference,
     bitcoinUnitPreference,
     emailAddressPreference,
-    quoteCurrencyPreference,
+    fiatCurrencyPreference,
     networkPreference,
     privacyModePreference,
     hapticsPreference,
diff --git a/apps/mobile/src/store/settings/settings.write.ts b/apps/mobile/src/store/settings/settings.write.ts
@@ -36,7 +36,7 @@ export const settingsSlice = createSlice({
       state.emailAddressPreference = action.payload;
     },
     userChangedQuoteCurrencyPreference(state, action: PayloadAction<QuoteCurrency>) {
-      state.quoteCurrencyPreference = action.payload;
+      state.fiatCurrencyPreference = action.payload;
     },
     userChangedNetworkPreference(state, action: PayloadAction<DefaultNetworkConfigurations>) {
       state.networkPreference = action.payload;
diff --git a/apps/mobile/src/store/settings/utils.ts b/apps/mobile/src/store/settings/utils.ts
@@ -27,7 +27,7 @@ export interface SettingsState {
   bitcoinUnitPreference: BitcoinUnit;
   createdOn: string;
   emailAddressPreference: EmailAddress;
-  quoteCurrencyPreference: QuoteCurrency;
+  fiatCurrencyPreference: QuoteCurrency;
   networkPreference: DefaultNetworkConfigurations;
   privacyModePreference: PrivacyModePreference;
   themePreference: ThemePreference;
@@ -44,7 +44,7 @@ export const settingsSchema = z.object({
   bitcoinUnitPreference: z.string(),
   createdOn: z.string(),
   emailAddressPreference: z.string(),
-  quoteCurrencyPreference: z.string(),
+  fiatCurrencyPreference: z.string(),
   networkPreference: z.string(),
   privacyModePreference: z.string(),
   themePreference: z.string(),
