Removed AddCurrencies and using SelectCurrency to add currencies for …

…conversion
ZeusLN · Feb 15, 2024 · 7e2e94a · 7e2e94a
1 parent 94d9b46
commit 7e2e94a
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 182 deletions.
diff --git a/Navigation.ts b/Navigation.ts
@@ -104,7 +104,6 @@ import Contacts from './views/Settings/Contacts';
 import AddContact from './views/Settings/AddContact';
 import ContactDetails from './views/ContactDetails';
 import CurrencyConverter from './views/Settings/CurrencyConverter';
-import AddCurrencies from './views/Settings/AddCurrencies';
 
 // POS
 import Order from './views/Order';
@@ -425,9 +424,6 @@ const AppScenes = {
     },
     CurrencyConverter: {
         screen: CurrencyConverter
-    },
-    AddCurrencies: {
-        screen: AddCurrencies
     }
 };
 

diff --git a/views/Settings/AddCurrencies.tsx b/views/Settings/AddCurrencies.tsx
diff --git a/views/Settings/CurrencyConverter.tsx b/views/Settings/CurrencyConverter.tsx
@@ -346,7 +346,11 @@ export default class CurrencyConverter extends React.Component<
 
         const AddButton = () => (
             <TouchableOpacity
-                onPress={() => navigation.navigate('AddCurrencies')}
+                onPress={() =>
+                    navigation.navigate('SelectCurrency', {
+                        currencyConverter: true
+                    })
+                }
                 accessibilityLabel={localeString('general.add')}
             >
                 <Add
@@ -405,10 +409,12 @@ export default class CurrencyConverter extends React.Component<
                 <Header
                     leftComponent="Back"
                     rightComponent={
-                        <Row>
-                            <EditButton />
-                            <AddButton />
-                        </Row>
+                        fiatEnabled && (
+                            <Row>
+                                <EditButton />
+                                <AddButton />
+                            </Row>
+                        )
                     }
                     centerComponent={{
                         text: localeString(

diff --git a/views/Settings/SelectCurrency.tsx b/views/Settings/SelectCurrency.tsx
@@ -78,6 +78,11 @@ export default class SelectCurrency extends React.Component<
             this.state;
         const { updateSettings, getSettings }: any = SettingsStore;
 
+        const currencyConverter = navigation.getParam(
+            'currencyConverter',
+            null
+        );
+
         return (
             <Screen>
                 <View style={{ flex: 1 }}>
@@ -128,22 +133,32 @@ export default class SelectCurrency extends React.Component<
                                     backgroundColor: 'transparent'
                                 }}
                                 onPress={async () => {
-                                    await updateSettings({
-                                        fiat: item.value
-                                    }).then(() => {
-                                        getSettings();
-                                        navigation.navigate('Currency', {
-                                            refresh: true
+                                    if (currencyConverter) {
+                                        navigation.navigate(
+                                            'CurrencyConverter',
+                                            {
+                                                selectedCurrency: item.value
+                                            }
+                                        );
+                                    } else {
+                                        await updateSettings({
+                                            fiat: item.value
+                                        }).then(() => {
+                                            getSettings();
+                                            navigation.navigate('Currency', {
+                                                refresh: true
+                                            });
                                         });
-                                    });
+                                    }
                                 }}
                             >
                                 <ListItem.Content>
                                     <ListItem.Title
                                         style={{
                                             color:
-                                                selectedCurrency ===
-                                                    item.value ||
+                                                (!currencyConverter &&
+                                                    selectedCurrency ===
+                                                        item.value) ||
                                                 (!selectedCurrency &&
                                                     item.value === DEFAULT_FIAT)
                                                     ? themeColor('highlight')
@@ -156,14 +171,15 @@ export default class SelectCurrency extends React.Component<
                                 </ListItem.Content>
                                 {(selectedCurrency === item.value ||
                                     (!selectedCurrency &&
-                                        item.value === DEFAULT_FIAT)) && (
-                                    <View style={{ textAlign: 'right' }}>
-                                        <Icon
-                                            name="check"
-                                            color={themeColor('highlight')}
-                                        />
-                                    </View>
-                                )}
+                                        item.value === DEFAULT_FIAT)) &&
+                                    !currencyConverter && (
+                                        <View style={{ textAlign: 'right' }}>
+                                            <Icon
+                                                name="check"
+                                                color={themeColor('highlight')}
+                                            />
+                                        </View>
+                                    )}
                             </ListItem>
                         )}
                         keyExtractor={(item, index) => `${item.host}-${index}`}