From 7e2e94a3bbfef81b5d73fa84ef8bac840d6de773 Mon Sep 17 00:00:00 2001
From: shubham <shubham@zeusln.com>
Date: Thu, 15 Feb 2024 20:56:14 +0530
Subject: [PATCH] Removed AddCurrencies and using SelectCurrency to add
 currencies for conversion

---
 Navigation.ts                        |   4 -
 views/Settings/AddCurrencies.tsx     | 156 ---------------------------
 views/Settings/CurrencyConverter.tsx |  16 ++-
 views/Settings/SelectCurrency.tsx    |  50 ++++++---
 4 files changed, 44 insertions(+), 182 deletions(-)
 delete mode 100644 views/Settings/AddCurrencies.tsx

diff --git a/Navigation.ts b/Navigation.ts
index 468c9e5bf..3d59f9794 100644
--- 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
deleted file mode 100644
index 93768b679..000000000
--- a/views/Settings/AddCurrencies.tsx
+++ /dev/null
@@ -1,156 +0,0 @@
-import * as React from 'react';
-import { SearchBar } from 'react-native-elements';
-
-import Screen from '../../components/Screen';
-import Header from '../../components/Header';
-import { themeColor } from '../../utils/ThemeUtils';
-
-import { FlatList, Text, TouchableOpacity, View } from 'react-native';
-
-import { CURRENCY_KEYS } from '../../stores/SettingsStore';
-import { localeString } from '../../utils/LocaleUtils';
-
-import Bitcoin from '../../assets/images/SVG/bitcoin-icon.svg';
-
-interface AddCurrenciesProps {
-    navigation: any;
-}
-
-interface AddCurrenciesState {
-    search: string;
-}
-
-export default class AddCurrencies extends React.Component<
-    AddCurrenciesProps,
-    AddCurrenciesState
-> {
-    constructor(props: AddCurrenciesProps) {
-        super(props);
-        this.state = {
-            search: ''
-        };
-    }
-
-    updateSearch = (query: string) => {
-        this.setState({ search: query });
-    };
-
-    renderSeparator = () => (
-        <View
-            style={{
-                height: 1,
-                backgroundColor: themeColor('separator')
-            }}
-        />
-    );
-
-    render() {
-        const { navigation } = this.props;
-
-        const updatedCurrencyList = [
-            {
-                key: 'Bitcoin (BTC)',
-                value: 'BTC',
-                svg: <Bitcoin width={20} height={20} />
-            },
-            {
-                key: 'Satoshis (SAT)',
-                value: 'SAT',
-                svg: <Bitcoin width={20} height={20} />
-            },
-            ...CURRENCY_KEYS
-        ];
-
-        const { search } = this.state;
-        const filteredCurrencies = updatedCurrencyList.filter((currency) =>
-            currency.key.toLowerCase().includes(search.toLowerCase())
-        );
-
-        return (
-            <Screen>
-                <View style={{ flex: 1 }}>
-                    <Header
-                        leftComponent="Back"
-                        centerComponent={{
-                            text: 'Add Currencies',
-                            style: {
-                                color: themeColor('text'),
-                                fontFamily: 'PPNeueMontreal-Book'
-                            }
-                        }}
-                        navigation={navigation}
-                    />
-                    <SearchBar
-                        placeholder={localeString('general.search')}
-                        onChangeText={this.updateSearch}
-                        value={this.state.search}
-                        inputStyle={{
-                            color: themeColor('text')
-                        }}
-                        placeholderTextColor={themeColor('secondaryText')}
-                        containerStyle={{
-                            backgroundColor: 'transparent',
-                            borderTopWidth: 0,
-                            borderBottomWidth: 0
-                        }}
-                        inputContainerStyle={{
-                            borderRadius: 15,
-                            backgroundColor: themeColor('secondary')
-                        }}
-                    />
-
-                    <FlatList
-                        data={filteredCurrencies}
-                        renderItem={({ item }) => (
-                            <TouchableOpacity
-                                onPress={() => {
-                                    navigation.navigate('CurrencyConverter', {
-                                        selectedCurrency: item.value
-                                    });
-                                }}
-                            >
-                                <View>
-                                    <View
-                                        style={{
-                                            margin: 16,
-                                            flex: 1,
-                                            flexDirection: 'row',
-                                            alignItems: 'center'
-                                        }}
-                                    >
-                                        {['BTC', 'SAT'].includes(
-                                            item.value
-                                        ) && (
-                                            <View
-                                                style={{
-                                                    marginRight: 6,
-                                                    paddingLeft: 1
-                                                }}
-                                            >
-                                                {item.svg}
-                                            </View>
-                                        )}
-                                        <View>
-                                            <Text
-                                                style={{
-                                                    color: themeColor('text'),
-                                                    fontSize: 16,
-                                                    fontFamily:
-                                                        'PPNeueMontreal-Book'
-                                                }}
-                                            >
-                                                {item.key}
-                                            </Text>
-                                        </View>
-                                    </View>
-                                </View>
-                            </TouchableOpacity>
-                        )}
-                        keyExtractor={(item, index) => index.toString()}
-                        ItemSeparatorComponent={this.renderSeparator}
-                    />
-                </View>
-            </Screen>
-        );
-    }
-}
diff --git a/views/Settings/CurrencyConverter.tsx b/views/Settings/CurrencyConverter.tsx
index 12e7f12a8..d551f396d 100644
--- 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
index cc48bb73c..580678e23 100644
--- 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}`}