Merge pull request #2195 from myxmaster/improve-currency-enabled-hand…

…ling Improve currency enabled error handling
ZeusLN · May 22, 2024 · 3f24641 · 3f24641
2 parents 0e479e1 + 5407675
commit 3f24641
Show file tree

Hide file tree

Showing 4 changed files with 284 additions and 298 deletions.
diff --git a/locales/en.json b/locales/en.json
@@ -991,7 +991,7 @@
     "pos.views.Order.printInvoice": "Print Invoice",
     "pos.views.Settings.PointOfSale.authWarning": "Warning: no password or PIN set",
     "pos.views.Settings.PointOfSale.backendWarning": "Warning: currently only LND nodes are able to mark orders as paid",
-    "pos.views.Settings.PointOfSale.currencyError": "Error: currency must be set first",
+    "pos.views.Settings.PointOfSale.currencyMustBeEnabledError": "Error: currency must be enabled first",
     "pos.print.taxReceipt": "Receipt",
     "pos.print.invoice": "Invoice",
     "views.Settings.NodeConfiguration.createMainnetWallet": "Create mainnet wallet",

diff --git a/views/Settings/Currency.tsx b/views/Settings/Currency.tsx
@@ -134,79 +134,89 @@ export default class Currency extends React.Component<
                             />
                         </View>
                     </ListItem>
-                    <View style={{ marginHorizontal: 16 }}>
-                        <DropdownSetting
-                            title={
-                                localeString('views.Settings.Currency.source') +
-                                ':'
-                            }
-                            selectedValue={fiatRatesSource}
-                            onValueChange={async (value: string) => {
-                                this.setState({ fiatRatesSource: value });
-                                const newSettings: any = {
-                                    fiatRatesSource: value
-                                };
-                                if (
-                                    !CURRENCY_KEYS.find(
-                                        (c) => c.value === selectedCurrency
-                                    )?.supportedSources.includes(value)
-                                ) {
-                                    newSettings.fiat = DEFAULT_FIAT;
-                                    this.setState({
-                                        selectedCurrency: DEFAULT_FIAT
-                                    });
-                                }
-                                await updateSettings(newSettings);
-                            }}
-                            values={FIAT_RATES_SOURCE_KEYS}
-                        />
-                    </View>
-                    <ListItem
-                        containerStyle={{
-                            backgroundColor: 'transparent'
-                        }}
-                        onPress={() => this.navigateToSelectCurrency()}
-                    >
-                        <ListItem.Content>
-                            <ListItem.Title
-                                style={{
-                                    color: themeColor('secondaryText'),
-                                    fontFamily: 'PPNeueMontreal-Book'
+                    {fiatEnabled && (
+                        <>
+                            <View style={{ marginHorizontal: 16 }}>
+                                <DropdownSetting
+                                    title={
+                                        localeString(
+                                            'views.Settings.Currency.source'
+                                        ) + ':'
+                                    }
+                                    selectedValue={fiatRatesSource}
+                                    onValueChange={async (value: string) => {
+                                        this.setState({
+                                            fiatRatesSource: value
+                                        });
+                                        const newSettings: any = {
+                                            fiatRatesSource: value
+                                        };
+                                        if (
+                                            !CURRENCY_KEYS.find(
+                                                (c) =>
+                                                    c.value === selectedCurrency
+                                            )?.supportedSources.includes(value)
+                                        ) {
+                                            newSettings.fiat = DEFAULT_FIAT;
+                                            this.setState({
+                                                selectedCurrency: DEFAULT_FIAT
+                                            });
+                                        }
+                                        await updateSettings(newSettings);
+                                    }}
+                                    values={FIAT_RATES_SOURCE_KEYS}
+                                />
+                            </View>
+                            <ListItem
+                                containerStyle={{
+                                    backgroundColor: 'transparent'
                                 }}
+                                onPress={() => this.navigateToSelectCurrency()}
                             >
-                                {localeString(
-                                    'views.Settings.Currency.selectCurrency'
-                                ) + ` (${selectedCurrency})`}
-                            </ListItem.Title>
-                        </ListItem.Content>
-                        <Icon
-                            name="keyboard-arrow-right"
-                            color={themeColor('secondaryText')}
-                        />
-                    </ListItem>
-                    <ListItem
-                        containerStyle={{
-                            backgroundColor: 'transparent'
-                        }}
-                        onPress={() => navigation.navigate('CurrencyConverter')}
-                    >
-                        <ListItem.Content>
-                            <ListItem.Title
-                                style={{
-                                    color: themeColor('secondaryText'),
-                                    fontFamily: 'PPNeueMontreal-Book'
+                                <ListItem.Content>
+                                    <ListItem.Title
+                                        style={{
+                                            color: themeColor('secondaryText'),
+                                            fontFamily: 'PPNeueMontreal-Book'
+                                        }}
+                                    >
+                                        {localeString(
+                                            'views.Settings.Currency.selectCurrency'
+                                        ) + ` (${selectedCurrency})`}
+                                    </ListItem.Title>
+                                </ListItem.Content>
+                                <Icon
+                                    name="keyboard-arrow-right"
+                                    color={themeColor('secondaryText')}
+                                />
+                            </ListItem>
+                            <ListItem
+                                containerStyle={{
+                                    backgroundColor: 'transparent'
                                 }}
+                                onPress={() =>
+                                    navigation.navigate('CurrencyConverter')
+                                }
                             >
-                                {localeString(
-                                    'views.Settings.CurrencyConverter.title'
-                                )}
-                            </ListItem.Title>
-                        </ListItem.Content>
-                        <Icon
-                            name="keyboard-arrow-right"
-                            color={themeColor('secondaryText')}
-                        />
-                    </ListItem>
+                                <ListItem.Content>
+                                    <ListItem.Title
+                                        style={{
+                                            color: themeColor('secondaryText'),
+                                            fontFamily: 'PPNeueMontreal-Book'
+                                        }}
+                                    >
+                                        {localeString(
+                                            'views.Settings.CurrencyConverter.title'
+                                        )}
+                                    </ListItem.Title>
+                                </ListItem.Content>
+                                <Icon
+                                    name="keyboard-arrow-right"
+                                    color={themeColor('secondaryText')}
+                                />
+                            </ListItem>
+                        </>
+                    )}
                 </View>
             </Screen>
         );