From 673761fd0b75bac2ffb6fcb22f30db94873921d4 Mon Sep 17 00:00:00 2001
From: Nouman Tahir <noumantahir@live.com>
Date: Mon, 3 Jul 2023 20:48:57 +0500
Subject: [PATCH 01/37] added bare bone structure for trade screen

---
 src/constants/routeNames.js                   |  1 +
 src/navigation/stackNavigator.tsx             |  2 ++
 src/screens/index.js                          |  2 ++
 src/screens/trade/children/index.ts           |  1 +
 src/screens/trade/children/swapInput.tsx      | 32 +++++++++++++++++
 src/screens/trade/index.ts                    |  3 ++
 src/screens/trade/screen/tradeScreen.tsx      | 36 +++++++++++++++++++
 .../trade/styles/tradeScreen.styles.ts        |  7 ++++
 src/screens/transfer/index.js                 |  1 +
 9 files changed, 85 insertions(+)
 create mode 100644 src/screens/trade/children/index.ts
 create mode 100644 src/screens/trade/children/swapInput.tsx
 create mode 100644 src/screens/trade/index.ts
 create mode 100644 src/screens/trade/screen/tradeScreen.tsx
 create mode 100644 src/screens/trade/styles/tradeScreen.styles.ts

diff --git a/src/constants/routeNames.js b/src/constants/routeNames.js
index a2cb3be46..68db7dad1 100644
--- a/src/constants/routeNames.js
+++ b/src/constants/routeNames.js
@@ -38,6 +38,7 @@ const ROUTES = {
     EDIT_HISTORY: `EditHistory${SCREEN_SUFFIX}`,
     WELCOME: `Welcome${SCREEN_SUFFIX}`,
     BACKUP_KEYS: `BackupKeys${SCREEN_SUFFIX}`,
+    TRADE: `Trade${SCREEN_SUFFIX}`,
   },
   MODALS: {
     ASSETS_SELECT: `AssetsSelect${MODAL_SUFFIX}`,
diff --git a/src/navigation/stackNavigator.tsx b/src/navigation/stackNavigator.tsx
index 47b915313..327f2f81d 100644
--- a/src/navigation/stackNavigator.tsx
+++ b/src/navigation/stackNavigator.tsx
@@ -22,6 +22,7 @@ import {
   Settings,
   SpinGame,
   Transfer,
+  TradeScreen,
   Voters,
   AccountBoost,
   TagResult,
@@ -67,6 +68,7 @@ const MainStackNavigator = () => {
         <MainStack.Screen name={ROUTES.SCREENS.VOTERS} component={Voters} />
         <MainStack.Screen name={ROUTES.SCREENS.FOLLOWS} component={Follows} />
         <MainStack.Screen name={ROUTES.SCREENS.TRANSFER} component={Transfer} />
+        <MainStack.Screen name={ROUTES.SCREENS.TRADE} component={TradeScreen} />
         <MainStack.Screen name={ROUTES.SCREENS.EDITOR} component={Editor} />
         <MainStack.Screen name={ROUTES.SCREENS.BACKUP_KEYS} component={BackupKeysScreen} />
         <MainStack.Screen
diff --git a/src/screens/index.js b/src/screens/index.js
index d1eb43c4d..7ae4d8a16 100755
--- a/src/screens/index.js
+++ b/src/screens/index.js
@@ -20,6 +20,7 @@ import Redeem from './redeem/screen/redeemScreen';
 import HiveSigner from './steem-connect/hiveSigner';
 import { WebBrowser } from './webBrowser';
 import Transfer from './transfer';
+import TradeScreen from './trade';
 import Voters from './voters';
 import AccountBoost from './accountBoost/screen/accountBoostScreen';
 import Register from './register/registerScreen';
@@ -56,6 +57,7 @@ export {
   SpinGame,
   HiveSigner,
   Transfer,
+  TradeScreen,
   Voters,
   Wallet,
   TagResult,
diff --git a/src/screens/trade/children/index.ts b/src/screens/trade/children/index.ts
new file mode 100644
index 000000000..9039b354f
--- /dev/null
+++ b/src/screens/trade/children/index.ts
@@ -0,0 +1 @@
+export * from './swapInput';
\ No newline at end of file
diff --git a/src/screens/trade/children/swapInput.tsx b/src/screens/trade/children/swapInput.tsx
new file mode 100644
index 000000000..89a1d4dc8
--- /dev/null
+++ b/src/screens/trade/children/swapInput.tsx
@@ -0,0 +1,32 @@
+import React from 'react';
+import { View, TextInput, Text } from "react-native";
+
+interface SwapInputProps {
+    label: string;
+    onChangeText: (text: string) => void;
+    value: string;
+    fiatValue: number;
+    symbol: string;
+  }
+
+
+
+// Reusable component for label, text input, and bottom text
+export const SwapInput = ({ label, onChangeText, value, fiatValue, symbol } : SwapInputProps) => {
+    return (
+      <View>
+        <Text>{label}</Text>
+        <TextInput
+          onChangeText={onChangeText}
+          value={value}
+          style={{
+            borderWidth: 1,
+            borderColor: '#ccc',
+            padding: 10,
+            marginBottom: 10,
+          }}
+        />
+        <Text>{fiatValue}</Text>
+      </View>
+    );
+  };
\ No newline at end of file
diff --git a/src/screens/trade/index.ts b/src/screens/trade/index.ts
new file mode 100644
index 000000000..fb5e87086
--- /dev/null
+++ b/src/screens/trade/index.ts
@@ -0,0 +1,3 @@
+import TradeScreen from './screen/tradeScreen';
+
+export default TradeScreen;
diff --git a/src/screens/trade/screen/tradeScreen.tsx b/src/screens/trade/screen/tradeScreen.tsx
new file mode 100644
index 000000000..1d33fa1ed
--- /dev/null
+++ b/src/screens/trade/screen/tradeScreen.tsx
@@ -0,0 +1,36 @@
+import React, { useState } from 'react';
+import { View, Button } from 'react-native';
+import styles from '../styles/tradeScreen.styles';
+import { SwapInput } from '../children';
+
+
+const TradeScreen = () => {
+  const [textValue, setTextValue] = useState('');
+
+  const handleTextChange = (text) => {
+    setTextValue(text);
+  };
+
+  const handleContinue = () => {
+    // Handle the continue button press
+    console.log('Continue button pressed');
+  };
+
+  return (
+    <View style={styles.container}>
+      <SwapInput
+        label="Label 1"
+        onChangeText={handleTextChange}
+        value={textValue}
+      />
+      <SwapInput
+        label="Label 2"
+        onChangeText={handleTextChange}
+        value={textValue}
+      />
+      <Button title="Continue" onPress={handleContinue} />
+    </View>
+  );
+};
+
+export default TradeScreen;
\ No newline at end of file
diff --git a/src/screens/trade/styles/tradeScreen.styles.ts b/src/screens/trade/styles/tradeScreen.styles.ts
new file mode 100644
index 000000000..8dbe754b0
--- /dev/null
+++ b/src/screens/trade/styles/tradeScreen.styles.ts
@@ -0,0 +1,7 @@
+import EStyleSheet from 'react-native-extended-stylesheet';
+
+export default EStyleSheet.create({
+  container: {
+    flex:1
+  },
+})
\ No newline at end of file
diff --git a/src/screens/transfer/index.js b/src/screens/transfer/index.js
index d7559db9e..0c3d9630d 100644
--- a/src/screens/transfer/index.js
+++ b/src/screens/transfer/index.js
@@ -7,6 +7,7 @@ import TransferView from './screen/transferScreen';
 import AddressView from './screen/addressScreen';
 import PowerDownView from './screen/powerDownScreen';
 import DelegateView from './screen/delegateScreen';
+import TransferTypes from '../../constants/transferTypes';
 
 const Transfer = ({ navigation, route }) => (
   <TransferContainer navigation={navigation} route={route}>

From 77ae9575a40db8c9c6fb59f29724483e757982ba Mon Sep 17 00:00:00 2001
From: Nouman Tahir <noumantahir@live.com>
Date: Mon, 3 Jul 2023 20:49:34 +0500
Subject: [PATCH 02/37] routing to trade screen from asset details screen

---
 src/config/locales/en-US.json                          |  2 ++
 src/constants/transferTypes.ts                         |  2 ++
 src/screens/assetDetails/screen/assetDetailsScreen.tsx | 10 +++++++++-
 src/utils/wallet.ts                                    |  9 ++++++++-
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json
index 908c27648..5e03dc294 100644
--- a/src/config/locales/en-US.json
+++ b/src/config/locales/en-US.json
@@ -83,6 +83,7 @@
     "withdraw_hive": "Withdraw Savings",
     "withdraw_hbd": "Withdraw Savings",
     "transfer_to_savings": "To Savings",
+    "trade_token":"Trade Token",
     "convert": "Convert",
     "convert_request":"Convert Request",
     "escrow_transfer": "Escrow Transfer",
@@ -778,6 +779,7 @@
     "transfer_to_savings": "Transfer To Saving",
     "transfer_to_vesting": "Power Up | Stake",
     "withdraw_to_saving": "Withdraw To Saving",
+    "trade_token":"Trade Token",
     "steemconnect_title": "Hivesigner Transfer",
     "estimated_weekly": "Estimated Weekly",
     "destination_accounts": "Destination Accounts",
diff --git a/src/constants/transferTypes.ts b/src/constants/transferTypes.ts
index f3abd081c..8ced0c017 100644
--- a/src/constants/transferTypes.ts
+++ b/src/constants/transferTypes.ts
@@ -7,10 +7,12 @@ const TransferTypes = {
   POINTS: 'points',
   WITHDRAW_HIVE: 'withdraw_hive',
   WITHDRAW_HBD: 'withdraw_hbd',
+  TRADE_TOKEN : 'trade_token',
   DELEGATE: 'delegate',
   POWER_DOWN: 'power_down',
   ADDRESS_VIEW: 'address_view',
   DELEGATE_VESTING_SHARES: 'delegate_vesting_shares',
+  
 
   // Engine Transfer types
   WITHDRAW_VESTING: 'withdraw_vesting',
diff --git a/src/screens/assetDetails/screen/assetDetailsScreen.tsx b/src/screens/assetDetails/screen/assetDetailsScreen.tsx
index e4b19e8f0..0334504d4 100644
--- a/src/screens/assetDetails/screen/assetDetailsScreen.tsx
+++ b/src/screens/assetDetails/screen/assetDetailsScreen.tsx
@@ -114,7 +114,10 @@ const AssetDetailsScreen = ({ navigation, route }: AssetDetailsScreenProps) => {
         balance: coinData.balance,
         redeemType: transferType === 'dropdown_promote' ? 'promote' : 'boost',
       };
-    } else {
+    } 
+    
+    
+    else {
       let { balance } = coinData;
 
       switch (transferType) {
@@ -135,6 +138,11 @@ const AssetDetailsScreen = ({ navigation, route }: AssetDetailsScreenProps) => {
         case TransferTypes.WITHDRAW_HBD:
           balance = coinData.savings ?? 0;
           break;
+
+        case TransferTypes.TRADE_TOKEN:
+          navigateTo = ROUTES.SCREENS.TRADE;
+          break;
+
       }
 
       navigateParams = {
diff --git a/src/utils/wallet.ts b/src/utils/wallet.ts
index e4d714112..ecab88178 100644
--- a/src/utils/wallet.ts
+++ b/src/utils/wallet.ts
@@ -69,8 +69,15 @@ const HIVE_ACTIONS = [
   'transfer_to_savings',
   'transfer_to_vesting',
   'withdraw_hive',
+  'trade_token'
+];
+const HBD_ACTIONS = [
+  'transfer_token', 
+  'transfer_to_savings', 
+  'convert', 
+  'withdraw_hbd',
+  'trade_token'
 ];
-const HBD_ACTIONS = ['transfer_token', 'transfer_to_savings', 'convert', 'withdraw_hbd'];
 const HIVE_POWER_ACTIONS = ['delegate', 'power_down'];
 
 export const groomingTransactionData = (transaction, hivePerMVests): CoinActivity | null => {

From 75179bf2088c81aaeb42b3e191111bf58fa6c332 Mon Sep 17 00:00:00 2001
From: Nouman Tahir <noumantahir@live.com>
Date: Mon, 3 Jul 2023 23:37:21 +0500
Subject: [PATCH 03/37] minor ui themeing

---
 src/screens/trade/children/swapInput.tsx       |  1 +
 src/screens/trade/screen/tradeScreen.tsx       | 10 ++++++++--
 src/screens/trade/styles/tradeScreen.styles.ts |  3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/screens/trade/children/swapInput.tsx b/src/screens/trade/children/swapInput.tsx
index 89a1d4dc8..eef43aa85 100644
--- a/src/screens/trade/children/swapInput.tsx
+++ b/src/screens/trade/children/swapInput.tsx
@@ -19,6 +19,7 @@ export const SwapInput = ({ label, onChangeText, value, fiatValue, symbol } : Sw
         <TextInput
           onChangeText={onChangeText}
           value={value}
+          keyboardType='numeric'
           style={{
             borderWidth: 1,
             borderColor: '#ccc',
diff --git a/src/screens/trade/screen/tradeScreen.tsx b/src/screens/trade/screen/tradeScreen.tsx
index 1d33fa1ed..92787c220 100644
--- a/src/screens/trade/screen/tradeScreen.tsx
+++ b/src/screens/trade/screen/tradeScreen.tsx
@@ -2,9 +2,14 @@ import React, { useState } from 'react';
 import { View, Button } from 'react-native';
 import styles from '../styles/tradeScreen.styles';
 import { SwapInput } from '../children';
+import { BasicHeader } from '../../../components';
+import { useIntl } from 'react-intl';
 
 
 const TradeScreen = () => {
+
+    const intl = useIntl();
+
   const [textValue, setTextValue] = useState('');
 
   const handleTextChange = (text) => {
@@ -18,13 +23,14 @@ const TradeScreen = () => {
 
   return (
     <View style={styles.container}>
+        <BasicHeader title={intl.formatMessage({ id: 'transfer.trade_token' })} />
       <SwapInput
-        label="Label 1"
+        label={intl.formatMessage({ id: 'transfer.from' })}
         onChangeText={handleTextChange}
         value={textValue}
       />
       <SwapInput
-        label="Label 2"
+        label={intl.formatMessage({ id: 'transfer.to' })}
         onChangeText={handleTextChange}
         value={textValue}
       />
diff --git a/src/screens/trade/styles/tradeScreen.styles.ts b/src/screens/trade/styles/tradeScreen.styles.ts
index 8dbe754b0..113b4ed64 100644
--- a/src/screens/trade/styles/tradeScreen.styles.ts
+++ b/src/screens/trade/styles/tradeScreen.styles.ts
@@ -2,6 +2,7 @@ import EStyleSheet from 'react-native-extended-stylesheet';
 
 export default EStyleSheet.create({
   container: {
-    flex:1
+    flex:1,
+    backgroundColor:'$primaryBackgroundColor'
   },
 })
\ No newline at end of file

From b1b74cab91c4f17020989b905a469858d7b4b721 Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Wed, 5 Jul 2023 15:52:36 +0500
Subject: [PATCH 04/37] implemented swap token api

---
 src/providers/hive-trade/hiveTrade.ts       | 116 ++++++++++++++++++++
 src/providers/hive-trade/hiveTrade.types.ts |  23 ++++
 src/utils/number.js                         |  11 --
 src/utils/number.ts                         |  24 ++++
 4 files changed, 163 insertions(+), 11 deletions(-)
 create mode 100644 src/providers/hive-trade/hiveTrade.ts
 create mode 100644 src/providers/hive-trade/hiveTrade.types.ts
 delete mode 100644 src/utils/number.js
 create mode 100644 src/utils/number.ts

diff --git a/src/providers/hive-trade/hiveTrade.ts b/src/providers/hive-trade/hiveTrade.ts
new file mode 100644
index 000000000..dcdb7dbcb
--- /dev/null
+++ b/src/providers/hive-trade/hiveTrade.ts
@@ -0,0 +1,116 @@
+import { PrivateKey } from '@esteemapp/dhive';
+import { getAnyPrivateKey, getDigitPinCode, sendHiveOperations } from '../hive/dhive';
+import { MarketAsset, OrderIdPrefix, SwapOptions, TransactionType } from './hiveTrade.types';
+import { formatNumber } from '../../utils/number';
+import bugsnapInstance from '../../config/bugsnag';
+import { Operation } from '@hiveio/dhive';
+
+
+//This operation creates a limit order and matches it against existing open orders. 
+//The maximum expiration time for any limit order is 28 days from head_block_time()
+export const limitOrderCreate = (
+    currentAccount: any,
+    pinHash: string,
+    amountToSell: number,
+    minToReceive: number,
+    orderType: TransactionType,
+    idPrefix = OrderIdPrefix.EMPTY) => {
+
+
+    const digitPinCode = getDigitPinCode(pinHash);
+    const key = getAnyPrivateKey(
+        {
+            activeKey: currentAccount?.local?.activeKey,
+        },
+        digitPinCode,
+    );
+
+    if (key) {
+        const privateKey = PrivateKey.fromString(key);
+
+        let expiration: any = new Date(Date.now());
+        expiration.setDate(expiration.getDate() + 27);
+        expiration = expiration.toISOString().split(".")[0];
+
+        const args: Operation[] = [
+            [
+                'limit_order_create',
+                {
+                    owner: currentAccount.username,
+                    orderid: Number(
+                        `${idPrefix}${Math.floor(Date.now() / 1000)
+                            .toString()
+                            .slice(2)}`
+                    ),
+                    amount_to_sell: `${orderType === TransactionType.Buy
+                        ? formatNumber(amountToSell, 3)
+                        : formatNumber(minToReceive, 3)
+                        } ${orderType === TransactionType.Buy ? MarketAsset.HBD : MarketAsset.HIVE}`,
+                    min_to_receive: `${orderType === TransactionType.Buy
+                        ? formatNumber(minToReceive, 3)
+                        : formatNumber(amountToSell, 3)
+                        } ${orderType === TransactionType.Buy ? MarketAsset.HIVE : MarketAsset.HBD}`,
+                    fill_or_kill: false,
+                    expiration: expiration
+                },
+            ],
+        ];
+
+        return new Promise((resolve, reject) => {
+            sendHiveOperations(args, privateKey)
+                .then((result) => {
+                    if (result) {
+                        resolve(result);
+                    }
+                })
+                .catch((err) => {
+                    bugsnapInstance.notify(err);
+                    reject(err);
+                });
+        });
+    }
+
+    return Promise.reject(
+        new Error('Check private key permission! Required private active key or above.'),
+    );
+};
+
+
+
+export const swapToken = async (
+    currentAccount: any,
+    pinHash: string,
+    data: SwapOptions) => {
+
+    try {
+        let amountToSell = 0;
+        let minToRecieve = 0;
+        let transactionType = TransactionType.None;
+
+        switch (data.fromAsset) {
+            case MarketAsset.HIVE:
+                amountToSell = data.toAmount
+                minToRecieve = data.fromAmount
+                transactionType = TransactionType.Sell
+                break;
+            case MarketAsset.HBD:
+                amountToSell = data.fromAmount
+                minToRecieve = data.toAmount
+                transactionType = TransactionType.Buy
+                break;
+        }
+
+        await limitOrderCreate(
+            currentAccount,
+            pinHash,
+            amountToSell,
+            minToRecieve,
+            transactionType,
+            OrderIdPrefix.SWAP
+        )
+    }
+    catch (err) {
+        console.warn("Failed to swap token", err)
+        throw err;
+    }
+}
\ No newline at end of file
diff --git a/src/providers/hive-trade/hiveTrade.types.ts b/src/providers/hive-trade/hiveTrade.types.ts
new file mode 100644
index 000000000..bbdd35917
--- /dev/null
+++ b/src/providers/hive-trade/hiveTrade.types.ts
@@ -0,0 +1,23 @@
+export enum TransactionType {
+    None = 0,
+    Sell = 2,
+    Buy = 1,
+    Cancel = 3
+}
+
+export enum OrderIdPrefix {
+    EMPTY = "",
+    SWAP = "9"
+}
+
+export enum MarketAsset {
+    HIVE = "HIVE",
+    HBD = "HBD"
+  }
+
+
+export interface SwapOptions {
+    fromAsset: MarketAsset;
+    fromAmount: number;
+    toAmount: number;
+  }
\ No newline at end of file
diff --git a/src/utils/number.js b/src/utils/number.js
deleted file mode 100644
index eafb0b731..000000000
--- a/src/utils/number.js
+++ /dev/null
@@ -1,11 +0,0 @@
-export const countDecimals = (value) => {
-  if (!value) {
-    return 0;
-  }
-
-  if (Math.floor(value) === value) {
-    return 0;
-  }
-
-  return value.toString().split('.')[1].length || 0;
-};
diff --git a/src/utils/number.ts b/src/utils/number.ts
new file mode 100644
index 000000000..00d7b656a
--- /dev/null
+++ b/src/utils/number.ts
@@ -0,0 +1,24 @@
+export const countDecimals = (value) => {
+  if (!value) {
+    return 0;
+  }
+
+  if (Math.floor(value) === value) {
+    return 0;
+  }
+
+  return value.toString().split('.')[1].length || 0;
+};
+
+
+export const formatNumber = (value:number, precision:number):string => {
+  if(!value){
+    return '0.000'
+  }
+
+  if(countDecimals(value) < precision){
+    return value.toFixed(precision)
+  }
+
+  return value.toString();
+}

From 977f0ba881c2b9e60119955bd9dd3dc7699f37a8 Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Wed, 5 Jul 2023 15:59:19 +0500
Subject: [PATCH 05/37] updated trade screen logic implementations

---
 src/screens/trade/children/index.ts           |   2 +-
 .../{swapInput.tsx => swapAmountInput.tsx}    |  10 +-
 src/screens/trade/screen/tradeScreen.tsx      | 123 +++++++++++++++---
 3 files changed, 116 insertions(+), 19 deletions(-)
 rename src/screens/trade/children/{swapInput.tsx => swapAmountInput.tsx} (70%)

diff --git a/src/screens/trade/children/index.ts b/src/screens/trade/children/index.ts
index 9039b354f..9bacf215b 100644
--- a/src/screens/trade/children/index.ts
+++ b/src/screens/trade/children/index.ts
@@ -1 +1 @@
-export * from './swapInput';
\ No newline at end of file
+export * from './swapAmountInput';
\ No newline at end of file
diff --git a/src/screens/trade/children/swapInput.tsx b/src/screens/trade/children/swapAmountInput.tsx
similarity index 70%
rename from src/screens/trade/children/swapInput.tsx
rename to src/screens/trade/children/swapAmountInput.tsx
index eef43aa85..4560da585 100644
--- a/src/screens/trade/children/swapInput.tsx
+++ b/src/screens/trade/children/swapAmountInput.tsx
@@ -3,20 +3,24 @@ import { View, TextInput, Text } from "react-native";
 
 interface SwapInputProps {
     label: string;
-    onChangeText: (text: string) => void;
+    onChangeText?: (text: string) => void;
     value: string;
     fiatValue: number;
     symbol: string;
+    disabled?: boolean;
   }
 
 
 
 // Reusable component for label, text input, and bottom text
-export const SwapInput = ({ label, onChangeText, value, fiatValue, symbol } : SwapInputProps) => {
+export const SwapAmountInput = ({ label, onChangeText, value, fiatValue, symbol } : SwapInputProps) => {
+
+
     return (
       <View>
-        <Text>{label}</Text>
+        <Text>{label + ' ' + symbol}</Text>
         <TextInput
+          editable={!!onChangeText}
           onChangeText={onChangeText}
           value={value}
           keyboardType='numeric'
diff --git a/src/screens/trade/screen/tradeScreen.tsx b/src/screens/trade/screen/tradeScreen.tsx
index 92787c220..2b5e43439 100644
--- a/src/screens/trade/screen/tradeScreen.tsx
+++ b/src/screens/trade/screen/tradeScreen.tsx
@@ -1,40 +1,133 @@
-import React, { useState } from 'react';
-import { View, Button } from 'react-native';
+import React, { useEffect, useState } from 'react';
+import { View, Button, Text, Alert } from 'react-native';
 import styles from '../styles/tradeScreen.styles';
-import { SwapInput } from '../children';
+import {  SwapAmountInput } from '../children';
 import { BasicHeader } from '../../../components';
 import { useIntl } from 'react-intl';
+import { swapToken } from '../../../providers/hive-trade/hiveTrade';
+import { useAppDispatch, useAppSelector } from '../../../hooks';
+import { MarketAsset, SwapOptions } from '../../../providers/hive-trade/hiveTrade.types';
+import { ASSET_IDS } from '../../../constants/defaultAssets';
+import { showActionModal, toastNotification } from '../../../redux/actions/uiAction';
 
 
 const TradeScreen = () => {
 
-    const intl = useIntl();
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
 
-  const [textValue, setTextValue] = useState('');
+  const currentAccount = useAppSelector(state=>state.account.currentAccount)
+  const assetsData = useAppSelector(state=>state.wallet.coinsData);
+  const pinHash = useAppSelector(state=>state.application.pin);
 
-  const handleTextChange = (text) => {
-    setTextValue(text);
+  const [fromAsset, setFromAsset] = useState(MarketAsset.HIVE); //TODO: initialise using route params
+  const [balance, setBalance] = useState(0);
+  const [marketPrice, setMarketPrice] = useState(0);
+  const [isInvalidAmount, setIsInvalidAmount] = useState(false);
+
+  const [toAmount, setToAmount] = useState('0');
+  const [fromAmount, setFromAmount] = useState('0');
+
+  const _toAsset = fromAsset === MarketAsset.HBD ? MarketAsset.HIVE : MarketAsset.HBD;
+
+  useEffect(() => {
+
+    //update balance,
+    const _assetId = fromAsset === MarketAsset.HBD ? ASSET_IDS.HBD : ASSET_IDS.HIVE
+    const _balance = assetsData[_assetId].balance
+    setBalance(_balance)
+
+    //TODO: update marketPrice
+
+  }, [fromAsset])
+
+
+
+  const handleAmountChange = (value:string) => {
+    setFromAmount(value);
+
+    //check for amount validity
+    setIsInvalidAmount(Number(value) > balance)
+
+    //TODO: update toAmount based on market price
   };
 
+
+  const handleAssetChange = () => {
+    setFromAsset(_toAsset)
+  }
+
+
+  const _confirmSwap = async () => {
+    try{
+      const data:SwapOptions = {
+        fromAsset:MarketAsset.HBD,
+        fromAmount:0.01,
+        toAmount:0.028
+      }
+  
+      await swapToken(
+        currentAccount,
+        pinHash,
+        data
+      )
+
+      dispatch(toastNotification("successful swap"));
+
+    } catch(err){
+      Alert.alert('fail', err.message)
+    }
+    
+  }
+
+
   const handleContinue = () => {
     // Handle the continue button press
     console.log('Continue button pressed');
+
+
+
+    dispatch(showActionModal({
+      title:"confirm swap",
+      body:`swaping ${fromAmount} ${fromAsset} for ${_toAsset} ${toAmount}`,
+      buttons:[
+        {
+          text:'Cancel',
+          onPress:()=>{
+            console.log('Swap transaction canceled');
+          }
+        },
+        {
+          text:'Confirm',
+          onPress:()=>{
+            _confirmSwap
+          }
+        }
+      ]
+    }))
   };
 
   return (
     <View style={styles.container}>
-        <BasicHeader title={intl.formatMessage({ id: 'transfer.trade_token' })} />
-      <SwapInput
+      <BasicHeader title={intl.formatMessage({ id: 'transfer.trade_token' })} />
+      <SwapAmountInput
         label={intl.formatMessage({ id: 'transfer.from' })}
-        onChangeText={handleTextChange}
-        value={textValue}
+        onChangeText={handleAmountChange}
+        value={fromAmount}
+        symbol={fromAsset}
       />
-      <SwapInput
+      {isInvalidAmount && <Text style={{color:'red'}} >Please enter valid amount</Text>}
+      <Text>{`Balance: ${balance} ${fromAsset}`}</Text>
+      <SwapAmountInput
         label={intl.formatMessage({ id: 'transfer.to' })}
-        onChangeText={handleTextChange}
-        value={textValue}
+        value={toAmount}
+        symbol={_toAsset}
       />
-      <Button title="Continue" onPress={handleContinue} />
+      
+      <Text>{`1 ${fromAsset} = ${marketPrice} ${_toAsset}`}</Text>
+      
+      <Button title="Continue" onPress={handleContinue} disabled={isInvalidAmount || !Number(fromAmount)} />
+      <Button title="Change Asset" onPress={handleAssetChange} />
     </View>
   );
 };

From 862f60bb17be6757822927f0e41641d006e59a24 Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Wed, 5 Jul 2023 17:21:09 +0500
Subject: [PATCH 06/37] integrated market rate

---
 src/providers/hive-trade/hiveTrade.ts       |  32 ++++-
 src/providers/hive-trade/hiveTrade.types.ts |  13 +-
 src/providers/hive/dhive.js                 |   2 +
 src/screens/trade/screen/tradeScreen.tsx    | 150 +++++++++++++-------
 4 files changed, 141 insertions(+), 56 deletions(-)

diff --git a/src/providers/hive-trade/hiveTrade.ts b/src/providers/hive-trade/hiveTrade.ts
index dcdb7dbcb..3ffaa66a0 100644
--- a/src/providers/hive-trade/hiveTrade.ts
+++ b/src/providers/hive-trade/hiveTrade.ts
@@ -1,6 +1,6 @@
 import { PrivateKey } from '@esteemapp/dhive';
-import { getAnyPrivateKey, getDigitPinCode, sendHiveOperations } from '../hive/dhive';
-import { MarketAsset, OrderIdPrefix, SwapOptions, TransactionType } from './hiveTrade.types';
+import { getAnyPrivateKey, getDigitPinCode, getMarketStatistics, sendHiveOperations } from '../hive/dhive';
+import { MarketAsset, MarketStatistics, OrderIdPrefix, SwapOptions, TransactionType } from './hiveTrade.types';
 import { formatNumber } from '../../utils/number';
 import bugsnapInstance from '../../config/bugsnag';
 import { Operation } from '@hiveio/dhive';
@@ -113,4 +113,32 @@ export const swapToken = async (
         console.warn("Failed to swap token", err)
         throw err;
     }
+}
+
+
+
+export const fetchHiveMarketRate = async (asset: MarketAsset): Promise<number> => {
+
+    try {
+        const market: MarketStatistics = await getMarketStatistics();
+        const _lowestAsk = Number(market?.lowest_ask);
+
+        if (!_lowestAsk) {
+            throw new Error("Invalid market lowest ask")
+        }
+
+        switch (asset) {
+            case MarketAsset.HIVE:
+                return _lowestAsk
+            case MarketAsset.HBD:
+                return 1 / _lowestAsk;
+            default:
+                return 0;
+        }
+
+    } catch (err) {
+        console.warn("failed to get hive market rate");
+        bugsnapInstance.notify(err);
+        throw err;
+    }
 }
\ No newline at end of file
diff --git a/src/providers/hive-trade/hiveTrade.types.ts b/src/providers/hive-trade/hiveTrade.types.ts
index bbdd35917..2a800b8a3 100644
--- a/src/providers/hive-trade/hiveTrade.types.ts
+++ b/src/providers/hive-trade/hiveTrade.types.ts
@@ -13,11 +13,20 @@ export enum OrderIdPrefix {
 export enum MarketAsset {
     HIVE = "HIVE",
     HBD = "HBD"
-  }
+}
 
 
 export interface SwapOptions {
     fromAsset: MarketAsset;
     fromAmount: number;
     toAmount: number;
-  }
\ No newline at end of file
+}
+
+export interface MarketStatistics {
+    hbd_volume: string;
+    highest_bid: string;
+    hive_volume: string;
+    latest: string;
+    lowest_ask: string;
+    percent_change: string;
+}
diff --git a/src/providers/hive/dhive.js b/src/providers/hive/dhive.js
index 7615260c1..04814faf7 100644
--- a/src/providers/hive/dhive.js
+++ b/src/providers/hive/dhive.js
@@ -175,6 +175,8 @@ export const getDynamicGlobalProperties = () => client.database.getDynamicGlobal
 
 export const getRewardFund = () => client.database.call('get_reward_fund', ['post']);
 
+export const getMarketStatistics = () => client.call("condenser_api", "get_ticker", []);
+
 export const getFeedHistory = async () => {
   try {
     const feedHistory = await client.database.call('get_feed_history');
diff --git a/src/screens/trade/screen/tradeScreen.tsx b/src/screens/trade/screen/tradeScreen.tsx
index 2b5e43439..90151fffc 100644
--- a/src/screens/trade/screen/tradeScreen.tsx
+++ b/src/screens/trade/screen/tradeScreen.tsx
@@ -1,14 +1,15 @@
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useMemo, useState } from 'react';
 import { View, Button, Text, Alert } from 'react-native';
 import styles from '../styles/tradeScreen.styles';
-import {  SwapAmountInput } from '../children';
+import { SwapAmountInput } from '../children';
 import { BasicHeader } from '../../../components';
 import { useIntl } from 'react-intl';
-import { swapToken } from '../../../providers/hive-trade/hiveTrade';
+import { fetchHiveMarketRate, swapToken } from '../../../providers/hive-trade/hiveTrade';
 import { useAppDispatch, useAppSelector } from '../../../hooks';
 import { MarketAsset, SwapOptions } from '../../../providers/hive-trade/hiveTrade.types';
 import { ASSET_IDS } from '../../../constants/defaultAssets';
 import { showActionModal, toastNotification } from '../../../redux/actions/uiAction';
+import { walletQueries } from '../../../providers/queries';
 
 
 const TradeScreen = () => {
@@ -16,97 +17,139 @@ const TradeScreen = () => {
   const intl = useIntl();
   const dispatch = useAppDispatch();
 
-  const currentAccount = useAppSelector(state=>state.account.currentAccount)
-  const assetsData = useAppSelector(state=>state.wallet.coinsData);
-  const pinHash = useAppSelector(state=>state.application.pin);
+  //queres
+  const assetsQuery = walletQueries.useAssetsQuery();
+
+  const currentAccount = useAppSelector(state => state.account.currentAccount)
+  const assetsData = useAppSelector(state => state.wallet.coinsData);
+  const pinHash = useAppSelector(state => state.application.pin);
 
   const [fromAsset, setFromAsset] = useState(MarketAsset.HIVE); //TODO: initialise using route params
-  const [balance, setBalance] = useState(0);
   const [marketPrice, setMarketPrice] = useState(0);
   const [isInvalidAmount, setIsInvalidAmount] = useState(false);
 
+  const [loading, setLoading] = useState(false);
   const [toAmount, setToAmount] = useState('0');
   const [fromAmount, setFromAmount] = useState('0');
 
-  const _toAsset = fromAsset === MarketAsset.HBD ? MarketAsset.HIVE : MarketAsset.HBD;
+  const _toAsset = useMemo(() => fromAsset === MarketAsset.HBD ? MarketAsset.HIVE : MarketAsset.HBD, [fromAsset])
+  const _balance = useMemo(
+    () => assetsData[fromAsset === MarketAsset.HBD ? ASSET_IDS.HBD : ASSET_IDS.HIVE].balance,
+    [assetsData, fromAsset]);
+
 
   useEffect(() => {
-
-    //update balance,
-    const _assetId = fromAsset === MarketAsset.HBD ? ASSET_IDS.HBD : ASSET_IDS.HIVE
-    const _balance = assetsData[_assetId].balance
-    setBalance(_balance)
-
-    //TODO: update marketPrice
-
+    _fetchMarketRate();
   }, [fromAsset])
 
 
-
-  const handleAmountChange = (value:string) => {
-    setFromAmount(value);
+ //post process updated amount value
+  useEffect(() => {
+    const _value = Number(fromAmount);
 
     //check for amount validity
-    setIsInvalidAmount(Number(value) > balance)
+    setIsInvalidAmount(_value > _balance)
 
-    //TODO: update toAmount based on market price
-  };
+    //update toAmount based on market price
+    if (!!_value) {
+      setToAmount((_value * marketPrice).toFixed(3))
+    }
+  }, [fromAmount])
 
 
-  const handleAssetChange = () => {
-    setFromAsset(_toAsset)
+  //fetches and sets market rate based on selected assetew
+  const _fetchMarketRate = async () => {
+    try {
+      setLoading(true)
+
+      //TODO: update marketPrice
+      const _marketPrice = await fetchHiveMarketRate(fromAsset)
+      setMarketPrice(_marketPrice);
+
+      setLoading(false)
+    } catch (err) {
+      Alert.alert("fail", err.message)
+    }
+
+  }
+
+  //refreshes wallet data and market rate
+  const _refresh = async () => {
+    setLoading(true);
+    await assetsQuery.refetch();
+    _fetchMarketRate();
   }
 
 
+  //initiates swaping action on confirmation
   const _confirmSwap = async () => {
-    try{
-      const data:SwapOptions = {
-        fromAsset:MarketAsset.HBD,
-        fromAmount:0.01,
-        toAmount:0.028
+    try {
+
+      setLoading(true)
+      const _fromAmount = Number(fromAmount)
+      const _toAmount = Number(toAmount);
+
+      const data: SwapOptions = {
+        fromAsset: fromAsset,
+        fromAmount: _fromAmount,
+        toAmount: _toAmount
       }
-  
+
       await swapToken(
         currentAccount,
         pinHash,
         data
       )
 
-      dispatch(toastNotification("successful swap"));
+      await assetsQuery.refetch();
 
-    } catch(err){
+      dispatch(toastNotification("successful swap"));
+      setLoading(false)
+
+    } catch (err) {
       Alert.alert('fail', err.message)
+      setLoading(false)
     }
-    
+
   }
 
 
+  //prompts user to verify swap action;
   const handleContinue = () => {
-    // Handle the continue button press
-    console.log('Continue button pressed');
-
-
 
     dispatch(showActionModal({
-      title:"confirm swap",
-      body:`swaping ${fromAmount} ${fromAsset} for ${_toAsset} ${toAmount}`,
-      buttons:[
+      title: "confirm swap",
+      body: `swaping ${fromAmount} ${fromAsset} for ${_toAsset} ${toAmount}`,
+      buttons: [
         {
-          text:'Cancel',
-          onPress:()=>{
+          text: 'Cancel',
+          onPress: () => {
             console.log('Swap transaction canceled');
           }
         },
         {
-          text:'Confirm',
-          onPress:()=>{
-            _confirmSwap
+          text: 'Confirm',
+          onPress: () => {
+            _confirmSwap()
           }
         }
       ]
     }))
   };
 
+
+
+  const handleAmountChange = (value: string) => {
+    setFromAmount(value);
+  };
+
+
+  const handleAssetChange = () => {
+    setFromAsset(_toAsset)
+    setFromAmount(toAmount);
+  }
+
+
   return (
     <View style={styles.container}>
       <BasicHeader title={intl.formatMessage({ id: 'transfer.trade_token' })} />
@@ -116,18 +159,21 @@ const TradeScreen = () => {
         value={fromAmount}
         symbol={fromAsset}
       />
-      {isInvalidAmount && <Text style={{color:'red'}} >Please enter valid amount</Text>}
-      <Text>{`Balance: ${balance} ${fromAsset}`}</Text>
+      {isInvalidAmount && <Text style={{ color: 'red' }} >Please enter valid amount</Text>}
+      <Text>{`Balance: ${_balance} ${fromAsset}`}</Text>
       <SwapAmountInput
         label={intl.formatMessage({ id: 'transfer.to' })}
         value={toAmount}
         symbol={_toAsset}
       />
-      
-      <Text>{`1 ${fromAsset} = ${marketPrice} ${_toAsset}`}</Text>
-      
-      <Button title="Continue" onPress={handleContinue} disabled={isInvalidAmount || !Number(fromAmount)} />
-      <Button title="Change Asset" onPress={handleAssetChange} />
+
+      <Text>{`1 ${fromAsset} = ${marketPrice.toFixed(3)} ${_toAsset}`}</Text>
+
+      <Button title="Continue" onPress={handleContinue} disabled={loading || isInvalidAmount || !Number(fromAmount)} />
+      <Button title="Change Asset" onPress={handleAssetChange} disabled={loading} />
+
+
+      <Button title="refresh" onPress={_refresh} disabled={loading} />
     </View>
   );
 };

From 5087268dfca775134f6fd2c01d333e57ea7ce363 Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Wed, 5 Jul 2023 18:07:52 +0500
Subject: [PATCH 07/37] added TODO for reading fiatPrice

---
 src/screens/trade/screen/tradeScreen.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/screens/trade/screen/tradeScreen.tsx b/src/screens/trade/screen/tradeScreen.tsx
index 90151fffc..158c2be89 100644
--- a/src/screens/trade/screen/tradeScreen.tsx
+++ b/src/screens/trade/screen/tradeScreen.tsx
@@ -33,11 +33,15 @@ const TradeScreen = () => {
   const [fromAmount, setFromAmount] = useState('0');
 
   const _toAsset = useMemo(() => fromAsset === MarketAsset.HBD ? MarketAsset.HIVE : MarketAsset.HBD, [fromAsset])
-  const _balance = useMemo(
-    () => assetsData[fromAsset === MarketAsset.HBD ? ASSET_IDS.HBD : ASSET_IDS.HIVE].balance,
+  const _assetData = useMemo(
+    () => assetsData[fromAsset === MarketAsset.HBD ? ASSET_IDS.HBD : ASSET_IDS.HIVE],
     [assetsData, fromAsset]);
 
+    const _balance = _assetData.balance
+    //TODO: use asset data current price for dollar converstion
 
+
+   
   useEffect(() => {
     _fetchMarketRate();
   }, [fromAsset])

From 5f54f97650dc1175500c1a1a4cac164d0b045c46 Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Wed, 5 Jul 2023 19:21:52 +0500
Subject: [PATCH 08/37] integrated fiat pricing

---
 .../trade/children/swapAmountInput.tsx        |  7 +--
 src/screens/trade/screen/tradeScreen.tsx      | 45 ++++++++++---------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/src/screens/trade/children/swapAmountInput.tsx b/src/screens/trade/children/swapAmountInput.tsx
index 4560da585..3d439ec0a 100644
--- a/src/screens/trade/children/swapAmountInput.tsx
+++ b/src/screens/trade/children/swapAmountInput.tsx
@@ -5,7 +5,7 @@ interface SwapInputProps {
     label: string;
     onChangeText?: (text: string) => void;
     value: string;
-    fiatValue: number;
+    fiatPrice: number;
     symbol: string;
     disabled?: boolean;
   }
@@ -13,8 +13,9 @@ interface SwapInputProps {
 
 
 // Reusable component for label, text input, and bottom text
-export const SwapAmountInput = ({ label, onChangeText, value, fiatValue, symbol } : SwapInputProps) => {
+export const SwapAmountInput = ({ label, onChangeText, value, fiatPrice, symbol } : SwapInputProps) => {
 
+  const _fiatValue = ((Number(value) || 0) * fiatPrice).toFixed(3);
 
     return (
       <View>
@@ -31,7 +32,7 @@ export const SwapAmountInput = ({ label, onChangeText, value, fiatValue, symbol
             marginBottom: 10,
           }}
         />
-        <Text>{fiatValue}</Text>
+        <Text>{_fiatValue}</Text>
       </View>
     );
   };
\ No newline at end of file
diff --git a/src/screens/trade/screen/tradeScreen.tsx b/src/screens/trade/screen/tradeScreen.tsx
index 158c2be89..90bbff558 100644
--- a/src/screens/trade/screen/tradeScreen.tsx
+++ b/src/screens/trade/screen/tradeScreen.tsx
@@ -24,7 +24,7 @@ const TradeScreen = () => {
   const assetsData = useAppSelector(state => state.wallet.coinsData);
   const pinHash = useAppSelector(state => state.application.pin);
 
-  const [fromAsset, setFromAsset] = useState(MarketAsset.HIVE); //TODO: initialise using route params
+  const [fromAssetSymbol, setFromAssetSymbol] = useState(MarketAsset.HIVE); //TODO: initialise using route params
   const [marketPrice, setMarketPrice] = useState(0);
   const [isInvalidAmount, setIsInvalidAmount] = useState(false);
 
@@ -32,22 +32,23 @@ const TradeScreen = () => {
   const [toAmount, setToAmount] = useState('0');
   const [fromAmount, setFromAmount] = useState('0');
 
-  const _toAsset = useMemo(() => fromAsset === MarketAsset.HBD ? MarketAsset.HIVE : MarketAsset.HBD, [fromAsset])
-  const _assetData = useMemo(
-    () => assetsData[fromAsset === MarketAsset.HBD ? ASSET_IDS.HBD : ASSET_IDS.HIVE],
-    [assetsData, fromAsset]);
+  const _toAssetSymbol = useMemo(() => fromAssetSymbol === MarketAsset.HBD ? MarketAsset.HIVE : MarketAsset.HBD, [fromAssetSymbol])
+
+  //accumulate asset data properties
+  const _fromAssetData = assetsData[fromAssetSymbol === MarketAsset.HBD ? ASSET_IDS.HBD : ASSET_IDS.HIVE];
+  const _balance = _fromAssetData.balance;
+  const _fromFiatPrice = _fromAssetData.currentPrice;
+  const _toFiatPrice = assetsData[_toAssetSymbol === MarketAsset.HBD ? ASSET_IDS.HBD : ASSET_IDS.HIVE].currentPrice
+  const _marketFiatPrice = marketPrice * _toFiatPrice;
 
-    const _balance = _assetData.balance
-    //TODO: use asset data current price for dollar converstion
 
 
-   
   useEffect(() => {
     _fetchMarketRate();
-  }, [fromAsset])
+  }, [fromAssetSymbol])
 
 
- //post process updated amount value
+  //post process updated amount value
   useEffect(() => {
     const _value = Number(fromAmount);
 
@@ -67,7 +68,7 @@ const TradeScreen = () => {
       setLoading(true)
 
       //TODO: update marketPrice
-      const _marketPrice = await fetchHiveMarketRate(fromAsset)
+      const _marketPrice = await fetchHiveMarketRate(fromAssetSymbol)
       setMarketPrice(_marketPrice);
 
       setLoading(false)
@@ -80,7 +81,7 @@ const TradeScreen = () => {
   //refreshes wallet data and market rate
   const _refresh = async () => {
     setLoading(true);
-    await assetsQuery.refetch();
+    assetsQuery.refetch();
     _fetchMarketRate();
   }
 
@@ -94,7 +95,7 @@ const TradeScreen = () => {
       const _toAmount = Number(toAmount);
 
       const data: SwapOptions = {
-        fromAsset: fromAsset,
+        fromAsset: fromAssetSymbol,
         fromAmount: _fromAmount,
         toAmount: _toAmount
       }
@@ -105,7 +106,7 @@ const TradeScreen = () => {
         data
       )
 
-      await assetsQuery.refetch();
+      assetsQuery.refetch();
 
       dispatch(toastNotification("successful swap"));
       setLoading(false)
@@ -123,7 +124,7 @@ const TradeScreen = () => {
 
     dispatch(showActionModal({
       title: "confirm swap",
-      body: `swaping ${fromAmount} ${fromAsset} for ${_toAsset} ${toAmount}`,
+      body: `swaping ${fromAmount} ${fromAssetSymbol} for ${_toAssetSymbol} ${toAmount}`,
       buttons: [
         {
           text: 'Cancel',
@@ -149,7 +150,7 @@ const TradeScreen = () => {
 
 
   const handleAssetChange = () => {
-    setFromAsset(_toAsset)
+    setFromAssetSymbol(_toAssetSymbol)
     setFromAmount(toAmount);
   }
 
@@ -161,22 +162,22 @@ const TradeScreen = () => {
         label={intl.formatMessage({ id: 'transfer.from' })}
         onChangeText={handleAmountChange}
         value={fromAmount}
-        symbol={fromAsset}
+        symbol={fromAssetSymbol}
+        fiatPrice={_fromFiatPrice}
       />
       {isInvalidAmount && <Text style={{ color: 'red' }} >Please enter valid amount</Text>}
-      <Text>{`Balance: ${_balance} ${fromAsset}`}</Text>
+      <Text>{`Balance: ${_balance} ${fromAssetSymbol}`}</Text>
       <SwapAmountInput
         label={intl.formatMessage({ id: 'transfer.to' })}
         value={toAmount}
-        symbol={_toAsset}
+        symbol={_toAssetSymbol}
+        fiatPrice={_toFiatPrice}
       />
 
-      <Text>{`1 ${fromAsset} = ${marketPrice.toFixed(3)} ${_toAsset}`}</Text>
+      <Text>{`1 ${fromAssetSymbol} = ${marketPrice.toFixed(3)} (${_marketFiatPrice.toFixed(3)})`}</Text>
 
       <Button title="Continue" onPress={handleContinue} disabled={loading || isInvalidAmount || !Number(fromAmount)} />
       <Button title="Change Asset" onPress={handleAssetChange} disabled={loading} />
-
-
       <Button title="refresh" onPress={_refresh} disabled={loading} />
     </View>
   );

From 9512bd1deb0af8c193aa870ba675bfe0822abe03 Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Wed, 5 Jul 2023 19:27:52 +0500
Subject: [PATCH 09/37] added placeholder for market rate hook

---
 .../trade/children/useHiveMarketRate.tsx      | 162 ++++++++++++++++++
 1 file changed, 162 insertions(+)
 create mode 100644 src/screens/trade/children/useHiveMarketRate.tsx

diff --git a/src/screens/trade/children/useHiveMarketRate.tsx b/src/screens/trade/children/useHiveMarketRate.tsx
new file mode 100644
index 000000000..bc36b62d4
--- /dev/null
+++ b/src/screens/trade/children/useHiveMarketRate.tsx
@@ -0,0 +1,162 @@
+import { MarketAsset } from "../../market-pair";
+import { getOrderBook, OrdersDataItem } from "../../../../api/hive";
+import React, { useEffect, useState } from "react";
+import { error } from "../../../feedback";
+
+export namespace HiveMarket {
+  interface ProcessingResult {
+    tooMuchSlippage?: boolean;
+    invalidAmount?: boolean;
+    toAmount?: string;
+    emptyOrderBook?: boolean;
+  }
+
+  function calculatePrice(intAmount: number, book: OrdersDataItem[], asset: "hive" | "hbd") {
+    let available = book[0][asset] / 1000;
+    let index = 0;
+    while (available < intAmount && book.length > index + 1) {
+      available += book[index][asset] / 1000;
+      index++;
+    }
+    return +book[index].real_price;
+  }
+
+  export async function fetchHiveOrderBook() {
+    try {
+      return await getOrderBook();
+    } catch (e) {
+      error("Order book is empty.");
+    }
+    return null;
+  }
+
+  export function processHiveOrderBook(
+    buyOrderBook: OrdersDataItem[],
+    sellOrderBook: OrdersDataItem[],
+    amount: string,
+    asset: string
+  ): ProcessingResult {
+    if (buyOrderBook.length <= 0 || sellOrderBook.length <= 0) return { emptyOrderBook: true };
+
+    const intAmount = +amount.replace(/,/gm, "");
+
+    let tooMuchSlippage,
+      invalidAmount = false;
+    let availableInOrderBook,
+      price = 0;
+    let firstPrice = Infinity;
+    let toAmount = "";
+    let resultToAmount;
+
+    if (asset === MarketAsset.HIVE) {
+      availableInOrderBook =
+        buyOrderBook.map((item) => item.hive).reduce((acc, item) => acc + item, 0) / 1000;
+      price = calculatePrice(intAmount, buyOrderBook, "hive");
+      toAmount = intAmount * price + "";
+      firstPrice = +buyOrderBook[0].real_price;
+    } else if (asset === MarketAsset.HBD) {
+      availableInOrderBook =
+        sellOrderBook.map((item) => item.hbd).reduce((acc, item) => acc + item, 0) / 1000;
+      price = calculatePrice(intAmount, sellOrderBook, "hbd");
+      toAmount = intAmount / price + "";
+      firstPrice = +sellOrderBook[0].real_price;
+    }
+
+    if (!availableInOrderBook) return { emptyOrderBook: true };
+
+    const slippage = Math.abs(price - firstPrice);
+    tooMuchSlippage = slippage > 0.01;
+
+    if (intAmount > availableInOrderBook) {
+      invalidAmount = true;
+    } else if (toAmount) {
+      resultToAmount = toAmount;
+      invalidAmount = false;
+    }
+    return { toAmount: resultToAmount, tooMuchSlippage, invalidAmount };
+  }
+
+  export async function getNewAmount(toAmount: string, fromAmount: string, asset: MarketAsset) {
+    const book = await HiveMarket.fetchHiveOrderBook();
+    const { toAmount: newToAmount } = HiveMarket.processHiveOrderBook(
+      book?.bids ?? [],
+      book?.asks ?? [],
+      fromAmount,
+      asset
+    );
+    if (newToAmount) {
+      return newToAmount;
+    }
+    return toAmount;
+  }
+}
+
+interface Props {
+  asset: MarketAsset;
+  amount: string;
+  setToAmount: (amount: string) => void;
+  loading: boolean;
+  setLoading: (v: boolean) => void;
+  setInvalidAmount: (v: boolean) => void;
+  setTooMuchSlippage: (v: boolean) => void;
+}
+
+export const HiveMarketRateListener = ({
+  asset,
+  amount,
+  setToAmount,
+  setLoading,
+  setInvalidAmount,
+  setTooMuchSlippage
+}: Props) => {
+  const [buyOrderBook, setBuyOrderBook] = useState<OrdersDataItem[]>([]);
+  const [sellOrderBook, setSellOrderBook] = useState<OrdersDataItem[]>([]);
+
+  let updateInterval: any;
+
+  useEffect(() => {
+    fetchOrderBook();
+    updateInterval = setInterval(() => fetchOrderBook(), 60000);
+    return () => {
+      clearInterval(updateInterval);
+    };
+  }, []);
+
+  useEffect(() => {
+    fetchOrderBook();
+  }, [asset]);
+
+  useEffect(() => {
+    processOrderBook();
+  }, [amount]);
+
+  const processOrderBook = () => {
+    const { tooMuchSlippage, invalidAmount, toAmount } = HiveMarket.processHiveOrderBook(
+      buyOrderBook,
+      sellOrderBook,
+      amount,
+      asset
+    );
+    setTooMuchSlippage(!!tooMuchSlippage);
+    setInvalidAmount(!!invalidAmount);
+    if (toAmount) {
+      setToAmount(toAmount);
+    }
+  };
+
+  const fetchOrderBook = async () => {
+    setLoading(true);
+    try {
+      const book = await HiveMarket.fetchHiveOrderBook();
+      if (book) {
+        setBuyOrderBook(book.bids);
+        setSellOrderBook(book.asks);
+      }
+      processOrderBook();
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return <></>;
+};

From 0f2724c8b4f3c898eb5a8a3d0cc6e9ddfc7ee12b Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Fri, 7 Jul 2023 16:47:00 +0500
Subject: [PATCH 10/37] integrated swap price calculator

---
 src/providers/hive-trade/hiveTrade.types.ts   | 12 +++
 src/providers/hive/dhive.js                   |  3 +
 ...veMarketRate.tsx => useSwapCalculator.tsx} | 89 ++++++++++---------
 src/screens/trade/screen/tradeScreen.tsx      | 33 ++++---
 4 files changed, 83 insertions(+), 54 deletions(-)
 rename src/screens/trade/children/{useHiveMarketRate.tsx => useSwapCalculator.tsx} (67%)

diff --git a/src/providers/hive-trade/hiveTrade.types.ts b/src/providers/hive-trade/hiveTrade.types.ts
index 2a800b8a3..e8d5fd42e 100644
--- a/src/providers/hive-trade/hiveTrade.types.ts
+++ b/src/providers/hive-trade/hiveTrade.types.ts
@@ -30,3 +30,15 @@ export interface MarketStatistics {
     lowest_ask: string;
     percent_change: string;
 }
+
+
+export interface OrdersDataItem {
+    created: string;
+    hbd: number;
+    hive: number;
+    order_price: {
+      base: string;
+      quote: string;
+    };
+    real_price: string;
+  }
\ No newline at end of file
diff --git a/src/providers/hive/dhive.js b/src/providers/hive/dhive.js
index 04814faf7..1f63116b5 100644
--- a/src/providers/hive/dhive.js
+++ b/src/providers/hive/dhive.js
@@ -177,6 +177,9 @@ export const getRewardFund = () => client.database.call('get_reward_fund', ['pos
 
 export const getMarketStatistics = () => client.call("condenser_api", "get_ticker", []);
 
+export const getOrderBook = (limit = 500) =>
+  client.call("condenser_api", "get_order_book", [limit]);
+
 export const getFeedHistory = async () => {
   try {
     const feedHistory = await client.database.call('get_feed_history');
diff --git a/src/screens/trade/children/useHiveMarketRate.tsx b/src/screens/trade/children/useSwapCalculator.tsx
similarity index 67%
rename from src/screens/trade/children/useHiveMarketRate.tsx
rename to src/screens/trade/children/useSwapCalculator.tsx
index bc36b62d4..38d11e136 100644
--- a/src/screens/trade/children/useHiveMarketRate.tsx
+++ b/src/screens/trade/children/useSwapCalculator.tsx
@@ -1,13 +1,16 @@
-import { MarketAsset } from "../../market-pair";
-import { getOrderBook, OrdersDataItem } from "../../../../api/hive";
+
 import React, { useEffect, useState } from "react";
-import { error } from "../../../feedback";
+import { MarketAsset, OrdersDataItem } from "../../../providers/hive-trade/hiveTrade.types";
+import bugsnapInstance from "../../../config/bugsnag";
+import { Alert } from "react-native";
+import { getOrderBook } from "../../../providers/hive/dhive";
+
 
 export namespace HiveMarket {
   interface ProcessingResult {
     tooMuchSlippage?: boolean;
     invalidAmount?: boolean;
-    toAmount?: string;
+    toAmount?: number;
     emptyOrderBook?: boolean;
   }
 
@@ -25,7 +28,8 @@ export namespace HiveMarket {
     try {
       return await getOrderBook();
     } catch (e) {
-      error("Order book is empty.");
+      bugsnapInstance.notify(e)
+      Alert.alert("Order book is empty")
     }
     return null;
   }
@@ -33,32 +37,30 @@ export namespace HiveMarket {
   export function processHiveOrderBook(
     buyOrderBook: OrdersDataItem[],
     sellOrderBook: OrdersDataItem[],
-    amount: string,
+    fromAmount: number,
     asset: string
   ): ProcessingResult {
     if (buyOrderBook.length <= 0 || sellOrderBook.length <= 0) return { emptyOrderBook: true };
 
-    const intAmount = +amount.replace(/,/gm, "");
-
     let tooMuchSlippage,
       invalidAmount = false;
     let availableInOrderBook,
       price = 0;
     let firstPrice = Infinity;
-    let toAmount = "";
+    let toAmount = 0;;
     let resultToAmount;
 
     if (asset === MarketAsset.HIVE) {
       availableInOrderBook =
         buyOrderBook.map((item) => item.hive).reduce((acc, item) => acc + item, 0) / 1000;
-      price = calculatePrice(intAmount, buyOrderBook, "hive");
-      toAmount = intAmount * price + "";
+      price = calculatePrice(fromAmount, buyOrderBook, "hive");
+      toAmount = fromAmount * price;
       firstPrice = +buyOrderBook[0].real_price;
     } else if (asset === MarketAsset.HBD) {
       availableInOrderBook =
         sellOrderBook.map((item) => item.hbd).reduce((acc, item) => acc + item, 0) / 1000;
-      price = calculatePrice(intAmount, sellOrderBook, "hbd");
-      toAmount = intAmount / price + "";
+      price = calculatePrice(fromAmount, sellOrderBook, "hbd");
+      toAmount = fromAmount / price;
       firstPrice = +sellOrderBook[0].real_price;
     }
 
@@ -67,7 +69,7 @@ export namespace HiveMarket {
     const slippage = Math.abs(price - firstPrice);
     tooMuchSlippage = slippage > 0.01;
 
-    if (intAmount > availableInOrderBook) {
+    if (fromAmount > availableInOrderBook) {
       invalidAmount = true;
     } else if (toAmount) {
       resultToAmount = toAmount;
@@ -76,7 +78,7 @@ export namespace HiveMarket {
     return { toAmount: resultToAmount, tooMuchSlippage, invalidAmount };
   }
 
-  export async function getNewAmount(toAmount: string, fromAmount: string, asset: MarketAsset) {
+  export async function getNewAmount(toAmount: string, fromAmount: number, asset: MarketAsset) {
     const book = await HiveMarket.fetchHiveOrderBook();
     const { toAmount: newToAmount } = HiveMarket.processHiveOrderBook(
       book?.bids ?? [],
@@ -91,27 +93,20 @@ export namespace HiveMarket {
   }
 }
 
-interface Props {
-  asset: MarketAsset;
-  amount: string;
-  setToAmount: (amount: string) => void;
-  loading: boolean;
-  setLoading: (v: boolean) => void;
-  setInvalidAmount: (v: boolean) => void;
-  setTooMuchSlippage: (v: boolean) => void;
-}
 
-export const HiveMarketRateListener = ({
-  asset,
-  amount,
-  setToAmount,
-  setLoading,
-  setInvalidAmount,
-  setTooMuchSlippage
-}: Props) => {
+export const useSwapCalculator = (
+  asset:MarketAsset,
+  fromAmount:number,
+) => {
   const [buyOrderBook, setBuyOrderBook] = useState<OrdersDataItem[]>([]);
   const [sellOrderBook, setSellOrderBook] = useState<OrdersDataItem[]>([]);
 
+  const [isLoading, setIsLoading] = useState(false);
+  const [toAmount, setToAmount] = useState(0);
+  const [tooMuchSlippage, setTooMuchSlippage] = useState(false);
+  const [offerUnavailable, setOfferUnavailable] = useState(false);
+  
+
   let updateInterval: any;
 
   useEffect(() => {
@@ -126,26 +121,31 @@ export const HiveMarketRateListener = ({
     fetchOrderBook();
   }, [asset]);
 
+
+
   useEffect(() => {
     processOrderBook();
-  }, [amount]);
+  }, [fromAmount]);
+
+
 
   const processOrderBook = () => {
-    const { tooMuchSlippage, invalidAmount, toAmount } = HiveMarket.processHiveOrderBook(
+    const { tooMuchSlippage: _tooMuchSlippage, invalidAmount: _invalidAmount, toAmount: _toAmount } = HiveMarket.processHiveOrderBook(
       buyOrderBook,
       sellOrderBook,
-      amount,
+      fromAmount,
       asset
     );
-    setTooMuchSlippage(!!tooMuchSlippage);
-    setInvalidAmount(!!invalidAmount);
-    if (toAmount) {
-      setToAmount(toAmount);
+    setTooMuchSlippage(!!_tooMuchSlippage);
+    setOfferUnavailable(!!_invalidAmount);
+    if (_toAmount) {
+      setToAmount(_toAmount);
     }
   };
 
+
   const fetchOrderBook = async () => {
-    setLoading(true);
+    setIsLoading(true);
     try {
       const book = await HiveMarket.fetchHiveOrderBook();
       if (book) {
@@ -154,9 +154,14 @@ export const HiveMarketRateListener = ({
       }
       processOrderBook();
     } finally {
-      setLoading(false);
+      setIsLoading(false);
     }
   };
 
-  return <></>;
+  return {
+    toAmount,
+    offerUnavailable,
+    tooMuchSlippage,
+    isLoading,
+  };
 };
diff --git a/src/screens/trade/screen/tradeScreen.tsx b/src/screens/trade/screen/tradeScreen.tsx
index 90bbff558..e4f563a66 100644
--- a/src/screens/trade/screen/tradeScreen.tsx
+++ b/src/screens/trade/screen/tradeScreen.tsx
@@ -10,6 +10,7 @@ import { MarketAsset, SwapOptions } from '../../../providers/hive-trade/hiveTrad
 import { ASSET_IDS } from '../../../constants/defaultAssets';
 import { showActionModal, toastNotification } from '../../../redux/actions/uiAction';
 import { walletQueries } from '../../../providers/queries';
+import { useSwapCalculator } from '../children/useSwapCalculator';
 
 
 const TradeScreen = () => {
@@ -29,20 +30,29 @@ const TradeScreen = () => {
   const [isInvalidAmount, setIsInvalidAmount] = useState(false);
 
   const [loading, setLoading] = useState(false);
-  const [toAmount, setToAmount] = useState('0');
   const [fromAmount, setFromAmount] = useState('0');
 
   const _toAssetSymbol = useMemo(() => fromAssetSymbol === MarketAsset.HBD ? MarketAsset.HIVE : MarketAsset.HBD, [fromAssetSymbol])
 
+
+  const {
+    toAmount,
+    offerUnavailable,
+    tooMuchSlippage,
+    isLoading: _isFetchingOrders
+  } = useSwapCalculator(fromAssetSymbol, Number(fromAmount) || 0);
+
   //accumulate asset data properties
   const _fromAssetData = assetsData[fromAssetSymbol === MarketAsset.HBD ? ASSET_IDS.HBD : ASSET_IDS.HIVE];
   const _balance = _fromAssetData.balance;
   const _fromFiatPrice = _fromAssetData.currentPrice;
   const _toFiatPrice = assetsData[_toAssetSymbol === MarketAsset.HBD ? ASSET_IDS.HBD : ASSET_IDS.HIVE].currentPrice
   const _marketFiatPrice = marketPrice * _toFiatPrice;
+  
+  const _toAmountStr = toAmount.toFixed(3)
 
 
-
+  //initialize market data
   useEffect(() => {
     _fetchMarketRate();
   }, [fromAssetSymbol])
@@ -55,10 +65,6 @@ const TradeScreen = () => {
     //check for amount validity
     setIsInvalidAmount(_value > _balance)
 
-    //update toAmount based on market price
-    if (!!_value) {
-      setToAmount((_value * marketPrice).toFixed(3))
-    }
   }, [fromAmount])
 
 
@@ -92,12 +98,11 @@ const TradeScreen = () => {
 
       setLoading(true)
       const _fromAmount = Number(fromAmount)
-      const _toAmount = Number(toAmount);
 
       const data: SwapOptions = {
         fromAsset: fromAssetSymbol,
         fromAmount: _fromAmount,
-        toAmount: _toAmount
+        toAmount: toAmount
       }
 
       await swapToken(
@@ -124,7 +129,7 @@ const TradeScreen = () => {
 
     dispatch(showActionModal({
       title: "confirm swap",
-      body: `swaping ${fromAmount} ${fromAssetSymbol} for ${_toAssetSymbol} ${toAmount}`,
+      body: `swaping ${fromAmount} ${fromAssetSymbol} for ${_toAssetSymbol} ${_toAmountStr}`,
       buttons: [
         {
           text: 'Cancel',
@@ -151,10 +156,12 @@ const TradeScreen = () => {
 
   const handleAssetChange = () => {
     setFromAssetSymbol(_toAssetSymbol)
-    setFromAmount(toAmount);
+    setFromAmount(_toAmountStr);
   }
 
 
+  const _disabledContinue = _isFetchingOrders || loading || isInvalidAmount || offerUnavailable || !Number(fromAmount)
+
   return (
     <View style={styles.container}>
       <BasicHeader title={intl.formatMessage({ id: 'transfer.trade_token' })} />
@@ -166,17 +173,19 @@ const TradeScreen = () => {
         fiatPrice={_fromFiatPrice}
       />
       {isInvalidAmount && <Text style={{ color: 'red' }} >Please enter valid amount</Text>}
+      {tooMuchSlippage && <Text style={{ color: 'red' }} >Too Much Slippage</Text>}
+      {offerUnavailable && <Text style={{ color: 'red' }} >Swap not possible for the price, try lower price</Text>}
       <Text>{`Balance: ${_balance} ${fromAssetSymbol}`}</Text>
       <SwapAmountInput
         label={intl.formatMessage({ id: 'transfer.to' })}
-        value={toAmount}
+        value={_toAmountStr}
         symbol={_toAssetSymbol}
         fiatPrice={_toFiatPrice}
       />
 
       <Text>{`1 ${fromAssetSymbol} = ${marketPrice.toFixed(3)} (${_marketFiatPrice.toFixed(3)})`}</Text>
 
-      <Button title="Continue" onPress={handleContinue} disabled={loading || isInvalidAmount || !Number(fromAmount)} />
+      <Button title="Continue" onPress={handleContinue} disabled={_disabledContinue} />
       <Button title="Change Asset" onPress={handleAssetChange} disabled={loading} />
       <Button title="refresh" onPress={_refresh} disabled={loading} />
     </View>

From 6453a075c22519715b3d90400dd0bde0b79e52bc Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Fri, 7 Jul 2023 17:42:13 +0500
Subject: [PATCH 11/37] laid out swap views and texts

---
 src/config/locales/en-US.json                 |  4 +-
 src/screens/trade/children/index.ts           |  3 +-
 .../trade/children/swapAmountInput.tsx        | 46 +++++++++--------
 src/screens/trade/children/swapFeeSection.tsx | 18 +++++++
 src/screens/trade/screen/tradeScreen.tsx      | 13 +++--
 .../trade/styles/sawpFeeSection.styles.ts     | 37 ++++++++++++++
 .../trade/styles/swapAmountInput.styles.ts    | 51 +++++++++++++++++++
 .../trade/styles/tradeScreen.styles.ts        | 14 +++++
 8 files changed, 160 insertions(+), 26 deletions(-)
 create mode 100644 src/screens/trade/children/swapFeeSection.tsx
 create mode 100644 src/screens/trade/styles/sawpFeeSection.styles.ts
 create mode 100644 src/screens/trade/styles/swapAmountInput.styles.ts

diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json
index 5e03dc294..b05f0fad4 100644
--- a/src/config/locales/en-US.json
+++ b/src/config/locales/en-US.json
@@ -779,7 +779,6 @@
     "transfer_to_savings": "Transfer To Saving",
     "transfer_to_vesting": "Power Up | Stake",
     "withdraw_to_saving": "Withdraw To Saving",
-    "trade_token":"Trade Token",
     "steemconnect_title": "Hivesigner Transfer",
     "estimated_weekly": "Estimated Weekly",
     "destination_accounts": "Destination Accounts",
@@ -837,6 +836,9 @@
     "amount_select_description": "Enter amount within maximum available balance {suffix}",
     "amount_select_desc_limit":" and must be greater than 0.001"
   },
+  "trade":{
+    "title":"Swap Your Funds"
+  },
   "boost": {
     "title": "Get Points",
     "buy": "GET Points",
diff --git a/src/screens/trade/children/index.ts b/src/screens/trade/children/index.ts
index 9bacf215b..5da8418e5 100644
--- a/src/screens/trade/children/index.ts
+++ b/src/screens/trade/children/index.ts
@@ -1 +1,2 @@
-export * from './swapAmountInput';
\ No newline at end of file
+export * from './swapAmountInput';
+export * from './swapFeeSection'
\ No newline at end of file
diff --git a/src/screens/trade/children/swapAmountInput.tsx b/src/screens/trade/children/swapAmountInput.tsx
index 3d439ec0a..f27eeb709 100644
--- a/src/screens/trade/children/swapAmountInput.tsx
+++ b/src/screens/trade/children/swapAmountInput.tsx
@@ -1,38 +1,44 @@
 import React from 'react';
 import { View, TextInput, Text } from "react-native";
+import styles from '../styles/swapAmountInput.styles';
+import { useAppSelector } from '../../../hooks';
 
 interface SwapInputProps {
-    label: string;
-    onChangeText?: (text: string) => void;
-    value: string;
-    fiatPrice: number;
-    symbol: string;
-    disabled?: boolean;
-  }
+  label: string;
+  onChangeText?: (text: string) => void;
+  value: string;
+  fiatPrice: number;
+  symbol: string;
+  disabled?: boolean;
+}
 
 
 
 // Reusable component for label, text input, and bottom text
-export const SwapAmountInput = ({ label, onChangeText, value, fiatPrice, symbol } : SwapInputProps) => {
+export const SwapAmountInput = ({ label, onChangeText, value, fiatPrice, symbol }: SwapInputProps) => {
+
+  const currency = useAppSelector((state) => state.application.currency);
 
   const _fiatValue = ((Number(value) || 0) * fiatPrice).toFixed(3);
 
-    return (
-      <View>
-        <Text>{label + ' ' + symbol}</Text>
+
+  return (
+    <View style={styles.container} >
+      <Text style={styles.label}>{label}</Text>
+      <View style={styles.inputContainer}>
         <TextInput
           editable={!!onChangeText}
           onChangeText={onChangeText}
           value={value}
           keyboardType='numeric'
-          style={{
-            borderWidth: 1,
-            borderColor: '#ccc',
-            padding: 10,
-            marginBottom: 10,
-          }}
+          style={styles.input}
+          autoFocus={true}
         />
-        <Text>{_fiatValue}</Text>
+        <View style={styles.symbolContainer}>
+          <Text style={styles.symbol}>{symbol}</Text>
+        </View>
       </View>
-    );
-  };
\ No newline at end of file
+      <Text style={styles.fiat}>{currency.currencySymbol + _fiatValue}</Text>
+    </View>
+  );
+};
\ No newline at end of file
diff --git a/src/screens/trade/children/swapFeeSection.tsx b/src/screens/trade/children/swapFeeSection.tsx
new file mode 100644
index 000000000..e4440755b
--- /dev/null
+++ b/src/screens/trade/children/swapFeeSection.tsx
@@ -0,0 +1,18 @@
+import React from 'react';
+import { View, Text } from "react-native";
+import styles from '../styles/sawpFeeSection.styles';
+
+
+// Reusable component for label, text input, and bottom text
+export const SwapFeeSection = () => {
+
+    return (
+        <View style={styles.container} >
+            <Text style={styles.label}>{'Fee'}</Text>
+            <View style={styles.freeContainer}>
+                <Text style={styles.free}>{'Free'}</Text>
+            </View>
+
+        </View>
+    );
+};
\ No newline at end of file
diff --git a/src/screens/trade/screen/tradeScreen.tsx b/src/screens/trade/screen/tradeScreen.tsx
index e4f563a66..137553d22 100644
--- a/src/screens/trade/screen/tradeScreen.tsx
+++ b/src/screens/trade/screen/tradeScreen.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useMemo, useState } from 'react';
 import { View, Button, Text, Alert } from 'react-native';
 import styles from '../styles/tradeScreen.styles';
-import { SwapAmountInput } from '../children';
+import { SwapAmountInput, SwapFeeSection } from '../children';
 import { BasicHeader } from '../../../components';
 import { useIntl } from 'react-intl';
 import { fetchHiveMarketRate, swapToken } from '../../../providers/hive-trade/hiveTrade';
@@ -25,6 +25,7 @@ const TradeScreen = () => {
   const assetsData = useAppSelector(state => state.wallet.coinsData);
   const pinHash = useAppSelector(state => state.application.pin);
 
+
   const [fromAssetSymbol, setFromAssetSymbol] = useState(MarketAsset.HIVE); //TODO: initialise using route params
   const [marketPrice, setMarketPrice] = useState(0);
   const [isInvalidAmount, setIsInvalidAmount] = useState(false);
@@ -164,7 +165,8 @@ const TradeScreen = () => {
 
   return (
     <View style={styles.container}>
-      <BasicHeader title={intl.formatMessage({ id: 'transfer.trade_token' })} />
+      <BasicHeader title={intl.formatMessage({ id: 'trade.title' })} />
+      <Text style={styles.balance}>{`Balance: ${_balance} ${fromAssetSymbol}`}</Text>
       <SwapAmountInput
         label={intl.formatMessage({ id: 'transfer.from' })}
         onChangeText={handleAmountChange}
@@ -172,10 +174,11 @@ const TradeScreen = () => {
         symbol={fromAssetSymbol}
         fiatPrice={_fromFiatPrice}
       />
+      
       {isInvalidAmount && <Text style={{ color: 'red' }} >Please enter valid amount</Text>}
       {tooMuchSlippage && <Text style={{ color: 'red' }} >Too Much Slippage</Text>}
       {offerUnavailable && <Text style={{ color: 'red' }} >Swap not possible for the price, try lower price</Text>}
-      <Text>{`Balance: ${_balance} ${fromAssetSymbol}`}</Text>
+      
       <SwapAmountInput
         label={intl.formatMessage({ id: 'transfer.to' })}
         value={_toAmountStr}
@@ -183,7 +186,9 @@ const TradeScreen = () => {
         fiatPrice={_toFiatPrice}
       />
 
-      <Text>{`1 ${fromAssetSymbol} = ${marketPrice.toFixed(3)} (${_marketFiatPrice.toFixed(3)})`}</Text>
+      <Text style={styles.marketRate}>{`1 ${fromAssetSymbol} = ${marketPrice.toFixed(3)} (${_marketFiatPrice.toFixed(3)})`}</Text>
+
+      <SwapFeeSection />
 
       <Button title="Continue" onPress={handleContinue} disabled={_disabledContinue} />
       <Button title="Change Asset" onPress={handleAssetChange} disabled={loading} />
diff --git a/src/screens/trade/styles/sawpFeeSection.styles.ts b/src/screens/trade/styles/sawpFeeSection.styles.ts
new file mode 100644
index 000000000..1e3e71155
--- /dev/null
+++ b/src/screens/trade/styles/sawpFeeSection.styles.ts
@@ -0,0 +1,37 @@
+import { TextStyle, ViewStyle } from 'react-native';
+import EStyleSheet from 'react-native-extended-stylesheet';
+
+export default EStyleSheet.create({
+    container: {
+        margin: 12,
+        padding: 6,
+        borderRadius: 16,
+        flexDirection:'row',
+        justifyContent: 'space-between',
+        alignItems:'center',
+        backgroundColor: '$primaryLightBackground'
+    } as ViewStyle,
+    label: {
+        fontSize: 18,
+        color: '$primaryDarkText',
+        padding: 10,
+    } as TextStyle,
+    freeContainer:{
+        paddingVertical:4,
+        paddingHorizontal:8,
+        borderRadius:6,
+        marginHorizontal:8,
+        backgroundColor:'$primaryGreen'
+    } as ViewStyle,
+    free: {
+        borderWidth: 0,
+        color: '$primaryDarkText',
+        fontSize: 16,
+        fontWeight: 'bold',
+    } as TextStyle,
+    fiat: {
+        fontSize: 14,
+        padding: 10,
+        color: '$iconColor'
+    }
+})
\ No newline at end of file
diff --git a/src/screens/trade/styles/swapAmountInput.styles.ts b/src/screens/trade/styles/swapAmountInput.styles.ts
new file mode 100644
index 000000000..01e6321ef
--- /dev/null
+++ b/src/screens/trade/styles/swapAmountInput.styles.ts
@@ -0,0 +1,51 @@
+import { TextStyle, ViewStyle } from 'react-native';
+import EStyleSheet from 'react-native-extended-stylesheet';
+
+export default EStyleSheet.create({
+    container: {
+        marginHorizontal: 12,
+        marginVertical:6,
+        paddingHorizontal: 16,
+        paddingBottom:32,
+        paddingTop:12,
+        borderWidth: 1,
+        borderRadius: 16,
+        borderColor: '$primaryLightBackground',
+        backgroundColor: '$primaryLightBackground'
+    } as ViewStyle,
+    label: {
+        fontSize: 18,
+        color: '$primaryDarkText',
+        paddingVertical: 6,
+    } as TextStyle,
+    inputContainer:{
+        flexDirection:'row',
+        justifyContent:'space-between',
+        alignItems:'center',
+    } as ViewStyle,
+    input: {
+        borderWidth: 0,
+        color: '$primaryDarkText',
+        fontSize: 28,
+        fontWeight: 'bold',
+        paddingVertical: 6,
+        marginTop: 10,
+    } as TextStyle,
+    symbolContainer:{
+        padding:6,
+        paddingHorizontal:12,
+        backgroundColor:'$primaryDarkGray',
+        borderRadius:24,
+    } as ViewStyle,
+    symbol:{
+        fontSize:16,
+        fontWeight:'bold',
+        color: '$white',
+    } as TextStyle,
+    fiat: {
+        fontSize: 14,
+        paddingVertical: 6,
+        color: '$iconColor'
+    },
+
+})
\ No newline at end of file
diff --git a/src/screens/trade/styles/tradeScreen.styles.ts b/src/screens/trade/styles/tradeScreen.styles.ts
index 113b4ed64..5e9c1e836 100644
--- a/src/screens/trade/styles/tradeScreen.styles.ts
+++ b/src/screens/trade/styles/tradeScreen.styles.ts
@@ -1,3 +1,4 @@
+import { TextStyle } from 'react-native';
 import EStyleSheet from 'react-native-extended-stylesheet';
 
 export default EStyleSheet.create({
@@ -5,4 +6,17 @@ export default EStyleSheet.create({
     flex:1,
     backgroundColor:'$primaryBackgroundColor'
   },
+  balance:{
+    marginHorizontal:16,
+    fontSize:14,
+    color:'$iconColor',
+    alignSelf:'flex-end'
+  } as TextStyle ,
+  marketRate:{
+    padding:10,
+    marginHorizontal:10,
+    fontSize:16,
+    fontWeight:'bold',
+    color:'$primaryDarkText'
+  } as TextStyle
 })
\ No newline at end of file

From d1d6108967a63a237f30164dafc2de7683fcc01b Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Mon, 10 Jul 2023 21:02:32 +0500
Subject: [PATCH 12/37] updated button stylings

---
 src/screens/trade/screen/tradeScreen.tsx      | 128 +++++++++++++-----
 .../trade/styles/swapAmountInput.styles.ts    |   1 +
 .../trade/styles/tradeScreen.styles.ts        |  66 ++++++---
 3 files changed, 145 insertions(+), 50 deletions(-)

diff --git a/src/screens/trade/screen/tradeScreen.tsx b/src/screens/trade/screen/tradeScreen.tsx
index 137553d22..10615e3ef 100644
--- a/src/screens/trade/screen/tradeScreen.tsx
+++ b/src/screens/trade/screen/tradeScreen.tsx
@@ -1,8 +1,8 @@
 import React, { useEffect, useMemo, useState } from 'react';
-import { View, Button, Text, Alert } from 'react-native';
+import { View, Button, Text, Alert, RefreshControl } from 'react-native';
 import styles from '../styles/tradeScreen.styles';
 import { SwapAmountInput, SwapFeeSection } from '../children';
-import { BasicHeader } from '../../../components';
+import { BasicHeader, IconButton, MainButton } from '../../../components';
 import { useIntl } from 'react-intl';
 import { fetchHiveMarketRate, swapToken } from '../../../providers/hive-trade/hiveTrade';
 import { useAppDispatch, useAppSelector } from '../../../hooks';
@@ -11,9 +11,11 @@ import { ASSET_IDS } from '../../../constants/defaultAssets';
 import { showActionModal, toastNotification } from '../../../redux/actions/uiAction';
 import { walletQueries } from '../../../providers/queries';
 import { useSwapCalculator } from '../children/useSwapCalculator';
+import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
+import EStyleSheet from 'react-native-extended-stylesheet';
 
 
-const TradeScreen = () => {
+const TradeScreen = ({ route }) => {
 
   const intl = useIntl();
   const dispatch = useAppDispatch();
@@ -24,13 +26,15 @@ const TradeScreen = () => {
   const currentAccount = useAppSelector(state => state.account.currentAccount)
   const assetsData = useAppSelector(state => state.wallet.coinsData);
   const pinHash = useAppSelector(state => state.application.pin);
+  const isDarkTheme = useAppSelector(state => state.application.isDarkTheme);
 
 
-  const [fromAssetSymbol, setFromAssetSymbol] = useState(MarketAsset.HIVE); //TODO: initialise using route params
+  const [fromAssetSymbol, setFromAssetSymbol] = useState(route?.params?.fundType || MarketAsset.HIVE); //TODO: initialise using route params
   const [marketPrice, setMarketPrice] = useState(0);
   const [isInvalidAmount, setIsInvalidAmount] = useState(false);
 
   const [loading, setLoading] = useState(false);
+  const [swapping, setSwapping] = useState(false);
   const [fromAmount, setFromAmount] = useState('0');
 
   const _toAssetSymbol = useMemo(() => fromAssetSymbol === MarketAsset.HBD ? MarketAsset.HIVE : MarketAsset.HBD, [fromAssetSymbol])
@@ -49,7 +53,7 @@ const TradeScreen = () => {
   const _fromFiatPrice = _fromAssetData.currentPrice;
   const _toFiatPrice = assetsData[_toAssetSymbol === MarketAsset.HBD ? ASSET_IDS.HBD : ASSET_IDS.HIVE].currentPrice
   const _marketFiatPrice = marketPrice * _toFiatPrice;
-  
+
   const _toAmountStr = toAmount.toFixed(3)
 
 
@@ -97,7 +101,7 @@ const TradeScreen = () => {
   const _confirmSwap = async () => {
     try {
 
-      setLoading(true)
+      setSwapping(true)
       const _fromAmount = Number(fromAmount)
 
       const data: SwapOptions = {
@@ -115,11 +119,11 @@ const TradeScreen = () => {
       assetsQuery.refetch();
 
       dispatch(toastNotification("successful swap"));
-      setLoading(false)
+      setSwapping(false)
 
     } catch (err) {
       Alert.alert('fail', err.message)
-      setLoading(false)
+      setSwapping(false)
     }
 
   }
@@ -163,36 +167,92 @@ const TradeScreen = () => {
 
   const _disabledContinue = _isFetchingOrders || loading || isInvalidAmount || offerUnavailable || !Number(fromAmount)
 
+
+  const _renderSwapBtn = () => (
+
+    <View style={styles.changeBtnContainer} pointerEvents='box-none'>
+      <View style={styles.changeBtn}>
+        <IconButton
+          style={styles.changeBtnSize}
+          color={EStyleSheet.value('$primaryBlue')}
+          iconType="MaterialIcons"
+          name="swap-vert"
+          onPress={handleAssetChange}
+          size={44}
+        />
+      </View>
+
+
+    </View>
+
+  )
+
+
+  const _renderContent = () => {
+    return (
+      <KeyboardAwareScrollView style={styles.container} refreshControl={
+        <RefreshControl
+          refreshing={loading}
+          onRefresh={_refresh}
+          progressBackgroundColor="#357CE6"
+          tintColor={!isDarkTheme ? '#357ce6' : '#96c0ff'}
+          titleColor="#fff"
+          colors={['#fff']}
+        />
+      }>
+        <Text style={styles.balance}>{`Balance: ${_balance} ${fromAssetSymbol}`}</Text>
+
+        <View style={{ flex: 1 }}>
+
+          <SwapAmountInput
+            label={intl.formatMessage({ id: 'transfer.from' })}
+            onChangeText={handleAmountChange}
+            value={fromAmount}
+            symbol={fromAssetSymbol}
+            fiatPrice={_fromFiatPrice}
+          />
+
+          <SwapAmountInput
+            label={intl.formatMessage({ id: 'transfer.to' })}
+            value={_toAmountStr}
+            symbol={_toAssetSymbol}
+            fiatPrice={_toFiatPrice}
+          />
+          {_renderSwapBtn()}
+
+        </View>
+
+        {isInvalidAmount && <Text style={{ color: 'red' }} >Please enter valid amount</Text>}
+        {tooMuchSlippage && <Text style={{ color: 'red' }} >Too Much Slippage</Text>}
+        {offerUnavailable && <Text style={{ color: 'red' }} >Swap not possible for the price, try lower price</Text>}
+
+        <Text style={styles.marketRate}>{`1 ${fromAssetSymbol} = ${marketPrice.toFixed(3)} (${_marketFiatPrice.toFixed(3)})`}</Text>
+
+        <SwapFeeSection />
+
+        <View style={styles.mainBtnContainer}>
+          <MainButton
+            style={styles.mainBtn}
+            isDisable={_disabledContinue}
+            onPress={handleContinue}
+            isLoading={swapping}
+          >
+            <Text style={styles.buttonText}>{intl.formatMessage({ id: 'transfer.next' })}</Text>
+          </MainButton>
+        </View>
+
+
+      </KeyboardAwareScrollView>
+
+    )
+  }
+
+
   return (
     <View style={styles.container}>
       <BasicHeader title={intl.formatMessage({ id: 'trade.title' })} />
-      <Text style={styles.balance}>{`Balance: ${_balance} ${fromAssetSymbol}`}</Text>
-      <SwapAmountInput
-        label={intl.formatMessage({ id: 'transfer.from' })}
-        onChangeText={handleAmountChange}
-        value={fromAmount}
-        symbol={fromAssetSymbol}
-        fiatPrice={_fromFiatPrice}
-      />
-      
-      {isInvalidAmount && <Text style={{ color: 'red' }} >Please enter valid amount</Text>}
-      {tooMuchSlippage && <Text style={{ color: 'red' }} >Too Much Slippage</Text>}
-      {offerUnavailable && <Text style={{ color: 'red' }} >Swap not possible for the price, try lower price</Text>}
-      
-      <SwapAmountInput
-        label={intl.formatMessage({ id: 'transfer.to' })}
-        value={_toAmountStr}
-        symbol={_toAssetSymbol}
-        fiatPrice={_toFiatPrice}
-      />
+      {_renderContent()}
 
-      <Text style={styles.marketRate}>{`1 ${fromAssetSymbol} = ${marketPrice.toFixed(3)} (${_marketFiatPrice.toFixed(3)})`}</Text>
-
-      <SwapFeeSection />
-
-      <Button title="Continue" onPress={handleContinue} disabled={_disabledContinue} />
-      <Button title="Change Asset" onPress={handleAssetChange} disabled={loading} />
-      <Button title="refresh" onPress={_refresh} disabled={loading} />
     </View>
   );
 };
diff --git a/src/screens/trade/styles/swapAmountInput.styles.ts b/src/screens/trade/styles/swapAmountInput.styles.ts
index 01e6321ef..3aa68aebe 100644
--- a/src/screens/trade/styles/swapAmountInput.styles.ts
+++ b/src/screens/trade/styles/swapAmountInput.styles.ts
@@ -24,6 +24,7 @@ export default EStyleSheet.create({
         alignItems:'center',
     } as ViewStyle,
     input: {
+        flex: 1,
         borderWidth: 0,
         color: '$primaryDarkText',
         fontSize: 28,
diff --git a/src/screens/trade/styles/tradeScreen.styles.ts b/src/screens/trade/styles/tradeScreen.styles.ts
index 5e9c1e836..6dea0c5ba 100644
--- a/src/screens/trade/styles/tradeScreen.styles.ts
+++ b/src/screens/trade/styles/tradeScreen.styles.ts
@@ -1,22 +1,56 @@
-import { TextStyle } from 'react-native';
+import { TextStyle, ViewStyle } from 'react-native';
 import EStyleSheet from 'react-native-extended-stylesheet';
 
 export default EStyleSheet.create({
   container: {
-    flex:1,
-    backgroundColor:'$primaryBackgroundColor'
+    flex: 1,
+    backgroundColor: '$primaryBackgroundColor'
   },
-  balance:{
-    marginHorizontal:16,
-    fontSize:14,
-    color:'$iconColor',
-    alignSelf:'flex-end'
-  } as TextStyle ,
-  marketRate:{
-    padding:10,
-    marginHorizontal:10,
-    fontSize:16,
-    fontWeight:'bold',
-    color:'$primaryDarkText'
-  } as TextStyle
+  balance: {
+    marginHorizontal: 16,
+    fontSize: 14,
+    color: '$iconColor',
+    alignSelf: 'flex-end'
+  } as TextStyle,
+  marketRate: {
+    padding: 10,
+    marginHorizontal: 10,
+    fontSize: 16,
+    fontWeight: 'bold',
+    color: '$primaryDarkText'
+  } as TextStyle,
+  changeBtnContainer:{ 
+    position: 'absolute', 
+    top: 0, 
+    bottom: 0, 
+    right: 0, 
+    left: 0, 
+    justifyContent: 'center', 
+    alignItems: 'center' 
+  } as ViewStyle,
+  changeBtn: { 
+    justifyContent:'center',
+    alignItems:'center',
+    backgroundColor: '$primaryLightBackground', 
+    borderRadius: 28, 
+    borderWidth: 8, 
+    borderColor: '$primaryBackgroundColor',
+  } as ViewStyle,
+  changeBtnSize:{
+      height: 60, 
+      width: 60, 
+  } as ViewStyle,
+  mainBtnContainer:{
+    alignItems:'center'
+  } as ViewStyle,
+  mainBtn: {
+    width: '$deviceWidth / 3',
+    justifyContent: 'center',
+    alignItems: 'center',
+    fontWeight: 'bold',
+    marginVertical: 16,
+  } as ViewStyle,
+  buttonText:{
+    color: 'white',
+  }
 })
\ No newline at end of file

From c058e314859781103f56b2100a2e644eccde94bd Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Tue, 11 Jul 2023 12:56:59 +0500
Subject: [PATCH 13/37] added error section, refined code structure

---
 src/config/locales/en-US.json                 |   5 +-
 src/screens/trade/children/assetChangeBtn.tsx |  30 +++++
 src/screens/trade/children/errorSection.tsx   |  30 +++++
 src/screens/trade/children/index.ts           |   4 +-
 src/screens/trade/screen/tradeScreen.tsx      | 125 ++++++++++--------
 .../trade/styles/assetChangeBtn.styles.ts     |  27 ++++
 .../trade/styles/errorSection.styles.ts       |  38 ++++++
 .../trade/styles/tradeScreen.styles.ts        |  22 +--
 8 files changed, 203 insertions(+), 78 deletions(-)
 create mode 100644 src/screens/trade/children/assetChangeBtn.tsx
 create mode 100644 src/screens/trade/children/errorSection.tsx
 create mode 100644 src/screens/trade/styles/assetChangeBtn.styles.ts
 create mode 100644 src/screens/trade/styles/errorSection.styles.ts

diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json
index b05f0fad4..d9378fb3a 100644
--- a/src/config/locales/en-US.json
+++ b/src/config/locales/en-US.json
@@ -837,7 +837,10 @@
     "amount_select_desc_limit":" and must be greater than 0.001"
   },
   "trade":{
-    "title":"Swap Your Funds"
+    "title":"Swap Your Funds",
+    "more-than-balance": "Entered amount is more than your available available balance",
+    "offer-unavailable": "Offer not available for entered amount. Please, enter less value",
+    "too-much-slippage": "We highly recommend you to reduce amount for better pricing!"
   },
   "boost": {
     "title": "Get Points",
diff --git a/src/screens/trade/children/assetChangeBtn.tsx b/src/screens/trade/children/assetChangeBtn.tsx
new file mode 100644
index 000000000..1c3a3677c
--- /dev/null
+++ b/src/screens/trade/children/assetChangeBtn.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import { View } from "react-native";
+import styles from '../styles/assetChangeBtn.styles';
+import { IconButton } from '../../../components';
+import EStyleSheet from 'react-native-extended-stylesheet';
+
+
+interface Props {
+    onPress:()=>void;
+}
+
+// Reusable component for label, text input, and bottom text
+export const AssetChangeBtn = ({onPress}:Props) => {
+
+    return (
+        <View style={styles.changeBtnContainer} pointerEvents='box-none'>
+        <View style={styles.changeBtn}>
+          <IconButton
+            style={styles.changeBtnSize}
+            color={EStyleSheet.value('$primaryBlue')}
+            iconType="MaterialIcons"
+            name="swap-vert"
+            onPress={onPress}
+            size={44}
+          />
+        </View>
+      </View>
+  
+    );
+};
\ No newline at end of file
diff --git a/src/screens/trade/children/errorSection.tsx b/src/screens/trade/children/errorSection.tsx
new file mode 100644
index 000000000..8c9ee1419
--- /dev/null
+++ b/src/screens/trade/children/errorSection.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import { View, Text } from "react-native";
+import styles from '../styles/errorSection.styles';
+import { Icon } from '../../../components';
+import EStyleSheet from 'react-native-extended-stylesheet';
+
+
+interface Props {
+    message:string|null;
+}
+
+// Reusable component for label, text input, and bottom text
+export const ErrorSection = ({message}:Props) => {
+
+    if(!message){
+        return null;
+    }
+
+    return (
+        <View style={styles.container} >
+            <Text style={styles.label}>{message}</Text>
+            <Icon
+             iconType="MaterialIcons"
+             name={'error'}
+             color={EStyleSheet.value('$pureWhite')}
+             size={24}
+            />
+        </View>
+    );
+};
\ No newline at end of file
diff --git a/src/screens/trade/children/index.ts b/src/screens/trade/children/index.ts
index 5da8418e5..ef3785bb8 100644
--- a/src/screens/trade/children/index.ts
+++ b/src/screens/trade/children/index.ts
@@ -1,2 +1,4 @@
 export * from './swapAmountInput';
-export * from './swapFeeSection'
\ No newline at end of file
+export * from './swapFeeSection';
+export * from './errorSection';
+export * from './assetChangeBtn';
\ No newline at end of file
diff --git a/src/screens/trade/screen/tradeScreen.tsx b/src/screens/trade/screen/tradeScreen.tsx
index 10615e3ef..30460c198 100644
--- a/src/screens/trade/screen/tradeScreen.tsx
+++ b/src/screens/trade/screen/tradeScreen.tsx
@@ -1,8 +1,8 @@
 import React, { useEffect, useMemo, useState } from 'react';
-import { View, Button, Text, Alert, RefreshControl } from 'react-native';
+import { View, Text, Alert, RefreshControl } from 'react-native';
 import styles from '../styles/tradeScreen.styles';
-import { SwapAmountInput, SwapFeeSection } from '../children';
-import { BasicHeader, IconButton, MainButton } from '../../../components';
+import { AssetChangeBtn, ErrorSection, SwapAmountInput, SwapFeeSection } from '../children';
+import { BasicHeader, MainButton } from '../../../components';
 import { useIntl } from 'react-intl';
 import { fetchHiveMarketRate, swapToken } from '../../../providers/hive-trade/hiveTrade';
 import { useAppDispatch, useAppSelector } from '../../../hooks';
@@ -31,7 +31,7 @@ const TradeScreen = ({ route }) => {
 
   const [fromAssetSymbol, setFromAssetSymbol] = useState(route?.params?.fundType || MarketAsset.HIVE); //TODO: initialise using route params
   const [marketPrice, setMarketPrice] = useState(0);
-  const [isInvalidAmount, setIsInvalidAmount] = useState(false);
+  const [isMoreThanBalance, setIsMoreThanBalance] = useState(false);
 
   const [loading, setLoading] = useState(false);
   const [swapping, setSwapping] = useState(false);
@@ -47,6 +47,22 @@ const TradeScreen = ({ route }) => {
     isLoading: _isFetchingOrders
   } = useSwapCalculator(fromAssetSymbol, Number(fromAmount) || 0);
 
+
+  const _errorMessage = useMemo(() => {
+    let msg = '';
+    if (isMoreThanBalance) {
+      msg += intl.formatMessage({ id: 'trade.more-than-balance' }) + '\n';
+    }
+    if (offerUnavailable) {
+      msg += intl.formatMessage({ id: 'trade.offer-unavailable' }) + '\n';
+    }
+    if (tooMuchSlippage) {
+      msg += intl.formatMessage({ id: 'trade.too-much-slippage' }) + '\n';
+    }
+    return msg.trim();
+  }, [tooMuchSlippage, offerUnavailable, isMoreThanBalance])
+
+
   //accumulate asset data properties
   const _fromAssetData = assetsData[fromAssetSymbol === MarketAsset.HBD ? ASSET_IDS.HBD : ASSET_IDS.HIVE];
   const _balance = _fromAssetData.balance;
@@ -57,6 +73,7 @@ const TradeScreen = ({ route }) => {
   const _toAmountStr = toAmount.toFixed(3)
 
 
+
   //initialize market data
   useEffect(() => {
     _fetchMarketRate();
@@ -68,7 +85,7 @@ const TradeScreen = ({ route }) => {
     const _value = Number(fromAmount);
 
     //check for amount validity
-    setIsInvalidAmount(_value > _balance)
+    setIsMoreThanBalance(_value > _balance)
 
   }, [fromAmount])
 
@@ -161,33 +178,62 @@ const TradeScreen = ({ route }) => {
 
   const handleAssetChange = () => {
     setFromAssetSymbol(_toAssetSymbol)
+    //TOOD: make sure order book is updated before updating from amount
     setFromAmount(_toAmountStr);
   }
 
-
-  const _disabledContinue = _isFetchingOrders || loading || isInvalidAmount || offerUnavailable || !Number(fromAmount)
+  const _disabledContinue = _isFetchingOrders || loading || isMoreThanBalance || offerUnavailable || !Number(fromAmount)
 
 
-  const _renderSwapBtn = () => (
+  const _renderBalance = () => (
+    <Text style={styles.balance}>
+      {`Balance: `}
+      <Text
+        style={{ color: EStyleSheet.value('$primaryBlue') }}
+        onPress={() => { setFromAmount(_balance + '') }}>
+        {`${_balance} ${fromAssetSymbol}`}
+      </Text>
+    </Text>
+  )
 
-    <View style={styles.changeBtnContainer} pointerEvents='box-none'>
-      <View style={styles.changeBtn}>
-        <IconButton
-          style={styles.changeBtnSize}
-          color={EStyleSheet.value('$primaryBlue')}
-          iconType="MaterialIcons"
-          name="swap-vert"
-          onPress={handleAssetChange}
-          size={44}
-        />
-      </View>
+  const _renderInputs = () => (
+    <View style={{ flex: 1 }}>
 
+      <SwapAmountInput
+        label={intl.formatMessage({ id: 'transfer.from' })}
+        onChangeText={handleAmountChange}
+        value={fromAmount}
+        symbol={fromAssetSymbol}
+        fiatPrice={_fromFiatPrice}
+      />
+
+      <SwapAmountInput
+        label={intl.formatMessage({ id: 'transfer.to' })}
+        value={_toAmountStr}
+        symbol={_toAssetSymbol}
+        fiatPrice={_toFiatPrice}
+      />
+      <AssetChangeBtn onPress={handleAssetChange} />
 
     </View>
-
   )
 
 
+  const _renderMainBtn = () => (
+    <View style={styles.mainBtnContainer}>
+      <MainButton
+        style={styles.mainBtn}
+        isDisable={_disabledContinue}
+        onPress={handleContinue}
+        isLoading={swapping}
+      >
+        <Text style={styles.buttonText}>{intl.formatMessage({ id: 'transfer.next' })}</Text>
+      </MainButton>
+    </View>
+  )
+
+
+
   const _renderContent = () => {
     return (
       <KeyboardAwareScrollView style={styles.container} refreshControl={
@@ -200,46 +246,15 @@ const TradeScreen = ({ route }) => {
           colors={['#fff']}
         />
       }>
-        <Text style={styles.balance}>{`Balance: ${_balance} ${fromAssetSymbol}`}</Text>
 
-        <View style={{ flex: 1 }}>
-
-          <SwapAmountInput
-            label={intl.formatMessage({ id: 'transfer.from' })}
-            onChangeText={handleAmountChange}
-            value={fromAmount}
-            symbol={fromAssetSymbol}
-            fiatPrice={_fromFiatPrice}
-          />
-
-          <SwapAmountInput
-            label={intl.formatMessage({ id: 'transfer.to' })}
-            value={_toAmountStr}
-            symbol={_toAssetSymbol}
-            fiatPrice={_toFiatPrice}
-          />
-          {_renderSwapBtn()}
-
-        </View>
-
-        {isInvalidAmount && <Text style={{ color: 'red' }} >Please enter valid amount</Text>}
-        {tooMuchSlippage && <Text style={{ color: 'red' }} >Too Much Slippage</Text>}
-        {offerUnavailable && <Text style={{ color: 'red' }} >Swap not possible for the price, try lower price</Text>}
+        {_renderBalance()}
+        {_renderInputs()}
 
         <Text style={styles.marketRate}>{`1 ${fromAssetSymbol} = ${marketPrice.toFixed(3)} (${_marketFiatPrice.toFixed(3)})`}</Text>
-
         <SwapFeeSection />
+        <ErrorSection message={_errorMessage} />
 
-        <View style={styles.mainBtnContainer}>
-          <MainButton
-            style={styles.mainBtn}
-            isDisable={_disabledContinue}
-            onPress={handleContinue}
-            isLoading={swapping}
-          >
-            <Text style={styles.buttonText}>{intl.formatMessage({ id: 'transfer.next' })}</Text>
-          </MainButton>
-        </View>
+        {_renderMainBtn()}
 
 
       </KeyboardAwareScrollView>
diff --git a/src/screens/trade/styles/assetChangeBtn.styles.ts b/src/screens/trade/styles/assetChangeBtn.styles.ts
new file mode 100644
index 000000000..f17dbfd2b
--- /dev/null
+++ b/src/screens/trade/styles/assetChangeBtn.styles.ts
@@ -0,0 +1,27 @@
+import { ViewStyle } from 'react-native';
+import EStyleSheet from 'react-native-extended-stylesheet';
+
+export default EStyleSheet.create({
+    changeBtnContainer:{ 
+        position: 'absolute', 
+        top: 0, 
+        bottom: 0, 
+        right: 0, 
+        left: 0, 
+        justifyContent: 'center', 
+        alignItems: 'center' 
+      } as ViewStyle,
+      changeBtn: { 
+        justifyContent:'center',
+        alignItems:'center',
+        backgroundColor: '$primaryLightBackground', 
+        borderRadius: 28, 
+        borderWidth: 8, 
+        borderColor: '$primaryBackgroundColor',
+      } as ViewStyle,
+      changeBtnSize:{
+          height: 60, 
+          width: 60, 
+      } as ViewStyle,
+})
+
diff --git a/src/screens/trade/styles/errorSection.styles.ts b/src/screens/trade/styles/errorSection.styles.ts
new file mode 100644
index 000000000..5779128c8
--- /dev/null
+++ b/src/screens/trade/styles/errorSection.styles.ts
@@ -0,0 +1,38 @@
+import { TextStyle, ViewStyle } from 'react-native';
+import EStyleSheet from 'react-native-extended-stylesheet';
+
+export default EStyleSheet.create({
+    container: {
+        margin: 12,
+        padding: 14,
+        borderRadius: 16,
+        flexDirection:'row',
+        justifyContent: 'space-between',
+        alignItems:'center',
+        backgroundColor: '$primaryRed'
+    } as ViewStyle,
+    label: {
+        fontSize: 14,
+        flex: 1,
+        paddingRight:12,
+        color: '$pureWhite',
+    } as TextStyle,
+    freeContainer:{
+        paddingVertical:4,
+        paddingHorizontal:8,
+        borderRadius:6,
+        marginHorizontal:8,
+        backgroundColor:'$primaryGreen'
+    } as ViewStyle,
+    free: {
+        borderWidth: 0,
+        color: '$primaryDarkText',
+        fontSize: 16,
+        fontWeight: 'bold',
+    } as TextStyle,
+    fiat: {
+        fontSize: 14,
+        padding: 10,
+        color: '$iconColor'
+    }
+})
\ No newline at end of file
diff --git a/src/screens/trade/styles/tradeScreen.styles.ts b/src/screens/trade/styles/tradeScreen.styles.ts
index 6dea0c5ba..add883168 100644
--- a/src/screens/trade/styles/tradeScreen.styles.ts
+++ b/src/screens/trade/styles/tradeScreen.styles.ts
@@ -19,27 +19,7 @@ export default EStyleSheet.create({
     fontWeight: 'bold',
     color: '$primaryDarkText'
   } as TextStyle,
-  changeBtnContainer:{ 
-    position: 'absolute', 
-    top: 0, 
-    bottom: 0, 
-    right: 0, 
-    left: 0, 
-    justifyContent: 'center', 
-    alignItems: 'center' 
-  } as ViewStyle,
-  changeBtn: { 
-    justifyContent:'center',
-    alignItems:'center',
-    backgroundColor: '$primaryLightBackground', 
-    borderRadius: 28, 
-    borderWidth: 8, 
-    borderColor: '$primaryBackgroundColor',
-  } as ViewStyle,
-  changeBtnSize:{
-      height: 60, 
-      width: 60, 
-  } as ViewStyle,
+
   mainBtnContainer:{
     alignItems:'center'
   } as ViewStyle,

From c2f8bb789a441b19f705cfbee50a18874e4d244a Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Tue, 11 Jul 2023 13:01:28 +0500
Subject: [PATCH 14/37] updated fee section translations

---
 src/config/locales/en-US.json                 | 4 +++-
 src/screens/trade/children/swapFeeSection.tsx | 7 +++++--
 src/screens/trade/screen/tradeScreen.tsx      | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json
index d9378fb3a..71eaebd2e 100644
--- a/src/config/locales/en-US.json
+++ b/src/config/locales/en-US.json
@@ -840,7 +840,9 @@
     "title":"Swap Your Funds",
     "more-than-balance": "Entered amount is more than your available available balance",
     "offer-unavailable": "Offer not available for entered amount. Please, enter less value",
-    "too-much-slippage": "We highly recommend you to reduce amount for better pricing!"
+    "too-much-slippage": "We highly recommend you to reduce amount for better pricing!",
+    "fee":"Fee",
+    "free":"Free"
   },
   "boost": {
     "title": "Get Points",
diff --git a/src/screens/trade/children/swapFeeSection.tsx b/src/screens/trade/children/swapFeeSection.tsx
index e4440755b..c2404dbdc 100644
--- a/src/screens/trade/children/swapFeeSection.tsx
+++ b/src/screens/trade/children/swapFeeSection.tsx
@@ -1,16 +1,19 @@
 import React from 'react';
 import { View, Text } from "react-native";
 import styles from '../styles/sawpFeeSection.styles';
+import { useIntl } from 'react-intl';
 
 
 // Reusable component for label, text input, and bottom text
 export const SwapFeeSection = () => {
 
+    const intl = useIntl();
+
     return (
         <View style={styles.container} >
-            <Text style={styles.label}>{'Fee'}</Text>
+            <Text style={styles.label}>{intl.formatMessage({id:'trade.fee'})}</Text>
             <View style={styles.freeContainer}>
-                <Text style={styles.free}>{'Free'}</Text>
+                <Text style={styles.free}>{intl.formatMessage({id:'trade.free'})}</Text>
             </View>
 
         </View>
diff --git a/src/screens/trade/screen/tradeScreen.tsx b/src/screens/trade/screen/tradeScreen.tsx
index 30460c198..6e4cb8138 100644
--- a/src/screens/trade/screen/tradeScreen.tsx
+++ b/src/screens/trade/screen/tradeScreen.tsx
@@ -29,7 +29,7 @@ const TradeScreen = ({ route }) => {
   const isDarkTheme = useAppSelector(state => state.application.isDarkTheme);
 
 
-  const [fromAssetSymbol, setFromAssetSymbol] = useState(route?.params?.fundType || MarketAsset.HIVE); //TODO: initialise using route params
+  const [fromAssetSymbol, setFromAssetSymbol] = useState(route?.params?.fundType || MarketAsset.HIVE);
   const [marketPrice, setMarketPrice] = useState(0);
   const [isMoreThanBalance, setIsMoreThanBalance] = useState(false);
 

From 401187dabf1dd66b2bf605c7895cbd15ed661766 Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Tue, 11 Jul 2023 13:15:27 +0500
Subject: [PATCH 15/37] exchange from to values on after order book fetched

---
 .../trade/children/useSwapCalculator.tsx      | 18 +++++++----
 src/screens/trade/screen/tradeScreen.tsx      | 30 +++++++++----------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/screens/trade/children/useSwapCalculator.tsx b/src/screens/trade/children/useSwapCalculator.tsx
index 38d11e136..a7d4b159a 100644
--- a/src/screens/trade/children/useSwapCalculator.tsx
+++ b/src/screens/trade/children/useSwapCalculator.tsx
@@ -1,5 +1,5 @@
 
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import { MarketAsset, OrdersDataItem } from "../../../providers/hive-trade/hiveTrade.types";
 import bugsnapInstance from "../../../config/bugsnag";
 import { Alert } from "react-native";
@@ -95,8 +95,9 @@ export namespace HiveMarket {
 
 
 export const useSwapCalculator = (
-  asset:MarketAsset,
-  fromAmount:number,
+  asset: MarketAsset,
+  fromAmount: number,
+  onAssetChangeComplete: () => void,
 ) => {
   const [buyOrderBook, setBuyOrderBook] = useState<OrdersDataItem[]>([]);
   const [sellOrderBook, setSellOrderBook] = useState<OrdersDataItem[]>([]);
@@ -105,7 +106,9 @@ export const useSwapCalculator = (
   const [toAmount, setToAmount] = useState(0);
   const [tooMuchSlippage, setTooMuchSlippage] = useState(false);
   const [offerUnavailable, setOfferUnavailable] = useState(false);
-  
+
+  const assetRef = useRef(asset);
+
 
   let updateInterval: any;
 
@@ -118,7 +121,12 @@ export const useSwapCalculator = (
   }, []);
 
   useEffect(() => {
-    fetchOrderBook();
+    fetchOrderBook().then(() => {
+      if (assetRef.current !== asset) {
+        assetRef.current = asset;
+        onAssetChangeComplete();
+      }
+    });
   }, [asset]);
 
 
diff --git a/src/screens/trade/screen/tradeScreen.tsx b/src/screens/trade/screen/tradeScreen.tsx
index 6e4cb8138..d2386985c 100644
--- a/src/screens/trade/screen/tradeScreen.tsx
+++ b/src/screens/trade/screen/tradeScreen.tsx
@@ -40,12 +40,18 @@ const TradeScreen = ({ route }) => {
   const _toAssetSymbol = useMemo(() => fromAssetSymbol === MarketAsset.HBD ? MarketAsset.HIVE : MarketAsset.HBD, [fromAssetSymbol])
 
 
+  //this method makes sure amount is only updated when new order book is fetched after asset change
+  //this avoid wrong from and to swap value on changing source asset
+  const _onAssetChangeComplete = () => {
+    setFromAmount(_toAmountStr);
+  }
+
   const {
     toAmount,
     offerUnavailable,
     tooMuchSlippage,
     isLoading: _isFetchingOrders
-  } = useSwapCalculator(fromAssetSymbol, Number(fromAmount) || 0);
+  } = useSwapCalculator(fromAssetSymbol, Number(fromAmount) || 0, _onAssetChangeComplete);
 
 
   const _errorMessage = useMemo(() => {
@@ -83,10 +89,8 @@ const TradeScreen = ({ route }) => {
   //post process updated amount value
   useEffect(() => {
     const _value = Number(fromAmount);
-
     //check for amount validity
     setIsMoreThanBalance(_value > _balance)
-
   }, [fromAmount])
 
 
@@ -106,13 +110,6 @@ const TradeScreen = ({ route }) => {
 
   }
 
-  //refreshes wallet data and market rate
-  const _refresh = async () => {
-    setLoading(true);
-    assetsQuery.refetch();
-    _fetchMarketRate();
-  }
-
 
   //initiates swaping action on confirmation
   const _confirmSwap = async () => {
@@ -170,16 +167,17 @@ const TradeScreen = ({ route }) => {
   };
 
 
+    //refreshes wallet data and market rate
+    const _refresh = async () => {
+      setLoading(true);
+      assetsQuery.refetch();
+      _fetchMarketRate();
+    }
 
-  const handleAmountChange = (value: string) => {
-    setFromAmount(value);
-  };
 
 
   const handleAssetChange = () => {
     setFromAssetSymbol(_toAssetSymbol)
-    //TOOD: make sure order book is updated before updating from amount
-    setFromAmount(_toAmountStr);
   }
 
   const _disabledContinue = _isFetchingOrders || loading || isMoreThanBalance || offerUnavailable || !Number(fromAmount)
@@ -201,7 +199,7 @@ const TradeScreen = ({ route }) => {
 
       <SwapAmountInput
         label={intl.formatMessage({ id: 'transfer.from' })}
-        onChangeText={handleAmountChange}
+        onChangeText={setFromAmount}
         value={fromAmount}
         symbol={fromAssetSymbol}
         fiatPrice={_fromFiatPrice}

From 6dbc6768c84e1fba011ea2e5e10ab872ffb07c35 Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Tue, 11 Jul 2023 13:22:54 +0500
Subject: [PATCH 16/37] removed format number in favour of toFixed

---
 src/providers/hive-trade/hiveTrade.ts |  9 ++++-----
 src/utils/number.ts                   | 13 -------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/providers/hive-trade/hiveTrade.ts b/src/providers/hive-trade/hiveTrade.ts
index 3ffaa66a0..5da51edd3 100644
--- a/src/providers/hive-trade/hiveTrade.ts
+++ b/src/providers/hive-trade/hiveTrade.ts
@@ -1,7 +1,6 @@
 import { PrivateKey } from '@esteemapp/dhive';
 import { getAnyPrivateKey, getDigitPinCode, getMarketStatistics, sendHiveOperations } from '../hive/dhive';
 import { MarketAsset, MarketStatistics, OrderIdPrefix, SwapOptions, TransactionType } from './hiveTrade.types';
-import { formatNumber } from '../../utils/number';
 import bugsnapInstance from '../../config/bugsnag';
 import { Operation } from '@hiveio/dhive';
 
@@ -43,12 +42,12 @@ export const limitOrderCreate = (
                             .slice(2)}`
                     ),
                     amount_to_sell: `${orderType === TransactionType.Buy
-                        ? formatNumber(amountToSell, 3)
-                        : formatNumber(minToReceive, 3)
+                        ? amountToSell.toFixed(3)
+                        : minToReceive.toFixed(3)
                         } ${orderType === TransactionType.Buy ? MarketAsset.HBD : MarketAsset.HIVE}`,
                     min_to_receive: `${orderType === TransactionType.Buy
-                        ? formatNumber(minToReceive, 3)
-                        : formatNumber(amountToSell, 3)
+                        ? minToReceive.toFixed(3)
+                        : amountToSell.toFixed(3)
                         } ${orderType === TransactionType.Buy ? MarketAsset.HIVE : MarketAsset.HBD}`,
                     fill_or_kill: false,
                     expiration: expiration
diff --git a/src/utils/number.ts b/src/utils/number.ts
index 00d7b656a..eafb0b731 100644
--- a/src/utils/number.ts
+++ b/src/utils/number.ts
@@ -9,16 +9,3 @@ export const countDecimals = (value) => {
 
   return value.toString().split('.')[1].length || 0;
 };
-
-
-export const formatNumber = (value:number, precision:number):string => {
-  if(!value){
-    return '0.000'
-  }
-
-  if(countDecimals(value) < precision){
-    return value.toFixed(precision)
-  }
-
-  return value.toString();
-}

From 44053edfd4ee8d6509cbfee5a81c860e3681cdb2 Mon Sep 17 00:00:00 2001
From: Syed Moazzam Ali <moazzambukhari52@gmail.com>
Date: Wed, 12 Jul 2023 17:50:40 +0500
Subject: [PATCH 17/37] open quick profile modal instead of profile screen from
 followsScreen.

---
 src/screens/follows/screen/followsScreen.js | 22 ++++++---------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/screens/follows/screen/followsScreen.js b/src/screens/follows/screen/followsScreen.js
index 79783c3a0..52a7ba399 100644
--- a/src/screens/follows/screen/followsScreen.js
+++ b/src/screens/follows/screen/followsScreen.js
@@ -2,12 +2,11 @@
 import React, { PureComponent } from 'react';
 import { View, Text, FlatList, ActivityIndicator } from 'react-native';
 import { injectIntl } from 'react-intl';
-
 // Constants
 import { useNavigation } from '@react-navigation/native';
 import EStyleSheet from 'react-native-extended-stylesheet';
-import ROUTES from '../../../constants/routeNames';
-
+import { useDispatch, connect } from 'react-redux';
+import { showProfileModal } from '../../../redux/actions/uiAction';
 // Components
 import { BasicHeader, UserListItem } from '../../../components';
 
@@ -29,15 +28,7 @@ class FollowsScreen extends PureComponent {
 
   // Component Functions
   _handleOnUserPress = (username) => {
-    const { navigation } = this.props;
-
-    navigation.navigate({
-      name: ROUTES.SCREENS.PROFILE,
-      params: {
-        username,
-      },
-      key: username,
-    });
+    this.props.dispatch(showProfileModal(username));
   };
 
   _renderItem = ({ item, index }) => {
@@ -93,8 +84,7 @@ class FollowsScreen extends PureComponent {
 
 const mapHooksToProps = (props) => {
   const navigation = useNavigation();
-  return <FollowsScreen {...props} navigation={navigation} />;
+  const dispatch = useDispatch();
+  return <FollowsScreen {...props} navigation={navigation} dispatch={dispatch} />;
 };
-
-export default injectIntl(mapHooksToProps);
-/* eslint-enable */
+export default connect(mapHooksToProps)(injectIntl(FollowsScreen));

From ea8f2afbbc0fa74380f763a3620f643c5a5e688d Mon Sep 17 00:00:00 2001
From: Syed Moazzam Ali <moazzambukhari52@gmail.com>
Date: Wed, 12 Jul 2023 18:55:03 +0500
Subject: [PATCH 18/37] use redux store in class component

---
 src/screens/follows/screen/followsScreen.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/screens/follows/screen/followsScreen.js b/src/screens/follows/screen/followsScreen.js
index 52a7ba399..461038f91 100644
--- a/src/screens/follows/screen/followsScreen.js
+++ b/src/screens/follows/screen/followsScreen.js
@@ -81,10 +81,4 @@ class FollowsScreen extends PureComponent {
     );
   }
 }
-
-const mapHooksToProps = (props) => {
-  const navigation = useNavigation();
-  const dispatch = useDispatch();
-  return <FollowsScreen {...props} navigation={navigation} dispatch={dispatch} />;
-};
-export default connect(mapHooksToProps)(injectIntl(FollowsScreen));
+export default connect()(injectIntl(FollowsScreen));

From 495151ad57fc02cbe00545e9b35eb176b6ad1a1a Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Wed, 19 Jul 2023 17:01:18 +0500
Subject: [PATCH 19/37] formatting hive market price string

---
 src/screens/trade/screen/tradeScreen.tsx | 26 +++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/screens/trade/screen/tradeScreen.tsx b/src/screens/trade/screen/tradeScreen.tsx
index d2386985c..898172c8e 100644
--- a/src/screens/trade/screen/tradeScreen.tsx
+++ b/src/screens/trade/screen/tradeScreen.tsx
@@ -24,6 +24,8 @@ const TradeScreen = ({ route }) => {
   const assetsQuery = walletQueries.useAssetsQuery();
 
   const currentAccount = useAppSelector(state => state.account.currentAccount)
+  const currency = useAppSelector((state) => state.application.currency);
+
   const assetsData = useAppSelector(state => state.wallet.coinsData);
   const pinHash = useAppSelector(state => state.application.pin);
   const isDarkTheme = useAppSelector(state => state.application.isDarkTheme);
@@ -167,12 +169,12 @@ const TradeScreen = ({ route }) => {
   };
 
 
-    //refreshes wallet data and market rate
-    const _refresh = async () => {
-      setLoading(true);
-      assetsQuery.refetch();
-      _fetchMarketRate();
-    }
+  //refreshes wallet data and market rate
+  const _refresh = async () => {
+    setLoading(true);
+    assetsQuery.refetch();
+    _fetchMarketRate();
+  }
 
 
 
@@ -231,6 +233,16 @@ const TradeScreen = ({ route }) => {
   )
 
 
+  const _renderMarketPrice = () => (
+    <Text style={styles.marketRate}>
+      {
+        `1 ${fromAssetSymbol} = ${marketPrice.toFixed(3)} ` 
+        + `${_toAssetSymbol} (${currency.currencySymbol + _marketFiatPrice.toFixed(3)})`
+      }
+    </Text>
+  )
+
+
 
   const _renderContent = () => {
     return (
@@ -247,8 +259,8 @@ const TradeScreen = ({ route }) => {
 
         {_renderBalance()}
         {_renderInputs()}
+        {_renderMarketPrice()}
 
-        <Text style={styles.marketRate}>{`1 ${fromAssetSymbol} = ${marketPrice.toFixed(3)} (${_marketFiatPrice.toFixed(3)})`}</Text>
         <SwapFeeSection />
         <ErrorSection message={_errorMessage} />
 

From 975f2317f286eb77d5c57205d939b362332782ac Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Wed, 19 Jul 2023 17:45:46 +0500
Subject: [PATCH 20/37] updated fiat currency rate calculation logic

---
 src/providers/ecency/ecency.ts                      |  4 ++--
 src/redux/actions/applicationActions.ts             | 12 ++++++++++--
 src/screens/application/hook/useInitApplication.tsx |  7 +++++--
 src/utils/wallet.ts                                 |  4 +---
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/providers/ecency/ecency.ts b/src/providers/ecency/ecency.ts
index afc59c570..6fb3436ae 100644
--- a/src/providers/ecency/ecency.ts
+++ b/src/providers/ecency/ecency.ts
@@ -31,9 +31,9 @@ import {
  * ************************************
  */
 
-export const getCurrencyRate = (currency) =>
+export const getFiatHbdRate = (fiatCode:string) =>
   ecencyApi
-    .get(`/private-api/market-data/${currency}/hbd?fixed=1`)
+    .get(`/private-api/market-data/${fiatCode}/hbd?fixed=1`)
     .then((resp) => resp.data)
     .catch((err) => {
       bugsnagInstance.notify(err);
diff --git a/src/redux/actions/applicationActions.ts b/src/redux/actions/applicationActions.ts
index 120d1f8ed..a8cac4272 100644
--- a/src/redux/actions/applicationActions.ts
+++ b/src/redux/actions/applicationActions.ts
@@ -1,5 +1,5 @@
 import getSymbolFromCurrency from 'currency-symbol-map';
-import { getCurrencyRate } from '../../providers/ecency/ecency';
+import { getFiatHbdRate } from '../../providers/ecency/ecency';
 import {
   CHANGE_COMMENT_NOTIFICATION,
   CHANGE_FOLLOW_NOTIFICATION,
@@ -165,14 +165,22 @@ export const isDefaultFooter = (payload) => ({
  */
 export const setCurrency = (currency) => async (dispatch) => {
   const currencySymbol = getSymbolFromCurrency(currency);
+  
+  let currencyRate = 1;
+  if(currency !== 'usd'){
+    const _usdRate = await getFiatHbdRate('usd')
+    const _fiatRate = await getFiatHbdRate(currency);
+    currencyRate = _fiatRate / _usdRate;
+  }
+  
 
-  const currencyRate = await getCurrencyRate(currency);
   dispatch({
     type: SET_CURRENCY,
     payload: { currency, currencyRate, currencySymbol },
   });
 };
 
+
 export const setPinCode = (data) => ({
   type: SET_PIN_CODE,
   payload: data,
diff --git a/src/screens/application/hook/useInitApplication.tsx b/src/screens/application/hook/useInitApplication.tsx
index 988678d4e..c9caf8f4b 100644
--- a/src/screens/application/hook/useInitApplication.tsx
+++ b/src/screens/application/hook/useInitApplication.tsx
@@ -21,7 +21,7 @@ import darkTheme from '../../../themes/darkTheme';
 import lightTheme from '../../../themes/lightTheme';
 import { useUserActivityMutation } from '../../../providers/queries';
 import THEME_OPTIONS from '../../../constants/options/theme';
-import { setIsDarkTheme } from '../../../redux/actions/applicationActions';
+import { setCurrency, setIsDarkTheme } from '../../../redux/actions/applicationActions';
 import { markNotifications } from '../../../providers/ecency/ecency';
 import { updateUnreadActivityCount } from '../../../redux/actions/accountAction';
 import RootNavigation from '../../../navigation/rootNavigation';
@@ -30,7 +30,7 @@ import FastImage from 'react-native-fast-image';
 
 export const useInitApplication = () => {
   const dispatch = useAppDispatch();
-  const { isDarkTheme, colorTheme, isPinCodeOpen } = useAppSelector((state) => state.application);
+  const { isDarkTheme, colorTheme, isPinCodeOpen, currency } = useAppSelector((state) => state.application);
 
   const systemColorScheme = useColorScheme();
 
@@ -74,6 +74,9 @@ export const useInitApplication = () => {
 
     userActivityMutation.lazyMutatePendingActivities();
 
+    //update fiat currency rate usd:fiat
+    dispatch(setCurrency(currency.currency));
+
     _initPushListener();
 
     return _cleanup;
diff --git a/src/utils/wallet.ts b/src/utils/wallet.ts
index ecab88178..1314d8623 100644
--- a/src/utils/wallet.ts
+++ b/src/utils/wallet.ts
@@ -1,5 +1,4 @@
 import get from 'lodash/get';
-import isArray from 'lodash/isArray';
 import { operationOrders } from '@hiveio/dhive/lib/utils';
 import { utils } from '@hiveio/dhive';
 import parseDate from './parseDate';
@@ -37,9 +36,8 @@ import {
 import { EngineActions, EngineOperations, HistoryItem } from '../providers/hive-engine/hiveEngine.types';
 import { ClaimsCollection } from '../redux/reducers/cacheReducer';
 import { fetchSpkWallet } from '../providers/hive-spk/hiveSpk';
-import { SpkActions } from '../providers/hive-spk/hiveSpk.types';
 import TransferTypes from '../constants/transferTypes';
-import { Alert } from 'react-native';
+
 
 export const transferTypes = [
   'curation_reward',

From 070ac6e9e6ccaa2a82ef16ed3447470f0e2c005c Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Wed, 19 Jul 2023 18:48:06 +0500
Subject: [PATCH 21/37] fixed prevision calculation

---
 src/screens/trade/children/useSwapCalculator.tsx |  3 ++-
 src/screens/trade/screen/tradeScreen.tsx         |  2 +-
 src/utils/number.ts                              | 11 +++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/screens/trade/children/useSwapCalculator.tsx b/src/screens/trade/children/useSwapCalculator.tsx
index a7d4b159a..e8df0395a 100644
--- a/src/screens/trade/children/useSwapCalculator.tsx
+++ b/src/screens/trade/children/useSwapCalculator.tsx
@@ -4,6 +4,7 @@ import { MarketAsset, OrdersDataItem } from "../../../providers/hive-trade/hiveT
 import bugsnapInstance from "../../../config/bugsnag";
 import { Alert } from "react-native";
 import { getOrderBook } from "../../../providers/hive/dhive";
+import { stripDecimalPlaces } from "../../../utils/number";
 
 
 export namespace HiveMarket {
@@ -147,7 +148,7 @@ export const useSwapCalculator = (
     setTooMuchSlippage(!!_tooMuchSlippage);
     setOfferUnavailable(!!_invalidAmount);
     if (_toAmount) {
-      setToAmount(_toAmount);
+      setToAmount(stripDecimalPlaces(_toAmount));
     }
   };
 
diff --git a/src/screens/trade/screen/tradeScreen.tsx b/src/screens/trade/screen/tradeScreen.tsx
index 898172c8e..1e365057b 100644
--- a/src/screens/trade/screen/tradeScreen.tsx
+++ b/src/screens/trade/screen/tradeScreen.tsx
@@ -78,7 +78,7 @@ const TradeScreen = ({ route }) => {
   const _toFiatPrice = assetsData[_toAssetSymbol === MarketAsset.HBD ? ASSET_IDS.HBD : ASSET_IDS.HIVE].currentPrice
   const _marketFiatPrice = marketPrice * _toFiatPrice;
 
-  const _toAmountStr = toAmount.toFixed(3)
+  const _toAmountStr = toAmount.toFixed(3);
 
 
 
diff --git a/src/utils/number.ts b/src/utils/number.ts
index eafb0b731..f00f889dc 100644
--- a/src/utils/number.ts
+++ b/src/utils/number.ts
@@ -9,3 +9,14 @@ export const countDecimals = (value) => {
 
   return value.toString().split('.')[1].length || 0;
 };
+
+
+export const stripDecimalPlaces = (value:number, precision:number = 3) => {
+  if (!Number(value)) {
+    return 0;
+  }
+
+  const power = Math.pow(10, precision)
+
+  return Math.floor(value * power) / power;
+}
\ No newline at end of file

From c10d9607c7ebeb07f158652a944c0713001fb274 Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Thu, 20 Jul 2023 19:21:17 +0500
Subject: [PATCH 22/37] renamed trade_token to swap_token

---
 src/config/locales/en-US.json                          | 4 ++--
 src/constants/transferTypes.ts                         | 2 +-
 src/screens/assetDetails/screen/assetDetailsScreen.tsx | 2 +-
 src/utils/wallet.ts                                    | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json
index 71eaebd2e..47f7cf102 100644
--- a/src/config/locales/en-US.json
+++ b/src/config/locales/en-US.json
@@ -83,7 +83,7 @@
     "withdraw_hive": "Withdraw Savings",
     "withdraw_hbd": "Withdraw Savings",
     "transfer_to_savings": "To Savings",
-    "trade_token":"Trade Token",
+    "swap_token":"Swap Token",
     "convert": "Convert",
     "convert_request":"Convert Request",
     "escrow_transfer": "Escrow Transfer",
@@ -837,7 +837,7 @@
     "amount_select_desc_limit":" and must be greater than 0.001"
   },
   "trade":{
-    "title":"Swap Your Funds",
+    "swap_token":"Swap Your Funds",
     "more-than-balance": "Entered amount is more than your available available balance",
     "offer-unavailable": "Offer not available for entered amount. Please, enter less value",
     "too-much-slippage": "We highly recommend you to reduce amount for better pricing!",
diff --git a/src/constants/transferTypes.ts b/src/constants/transferTypes.ts
index 8ced0c017..090465916 100644
--- a/src/constants/transferTypes.ts
+++ b/src/constants/transferTypes.ts
@@ -7,7 +7,7 @@ const TransferTypes = {
   POINTS: 'points',
   WITHDRAW_HIVE: 'withdraw_hive',
   WITHDRAW_HBD: 'withdraw_hbd',
-  TRADE_TOKEN : 'trade_token',
+  SWAP_TOKEN : 'swap_token',
   DELEGATE: 'delegate',
   POWER_DOWN: 'power_down',
   ADDRESS_VIEW: 'address_view',
diff --git a/src/screens/assetDetails/screen/assetDetailsScreen.tsx b/src/screens/assetDetails/screen/assetDetailsScreen.tsx
index 0334504d4..2e2e1b0c1 100644
--- a/src/screens/assetDetails/screen/assetDetailsScreen.tsx
+++ b/src/screens/assetDetails/screen/assetDetailsScreen.tsx
@@ -139,7 +139,7 @@ const AssetDetailsScreen = ({ navigation, route }: AssetDetailsScreenProps) => {
           balance = coinData.savings ?? 0;
           break;
 
-        case TransferTypes.TRADE_TOKEN:
+        case TransferTypes.SWAP_TOKEN:
           navigateTo = ROUTES.SCREENS.TRADE;
           break;
 
diff --git a/src/utils/wallet.ts b/src/utils/wallet.ts
index 1314d8623..3e5c930be 100644
--- a/src/utils/wallet.ts
+++ b/src/utils/wallet.ts
@@ -67,14 +67,14 @@ const HIVE_ACTIONS = [
   'transfer_to_savings',
   'transfer_to_vesting',
   'withdraw_hive',
-  'trade_token'
+  'swap_token'
 ];
 const HBD_ACTIONS = [
   'transfer_token', 
   'transfer_to_savings', 
   'convert', 
   'withdraw_hbd',
-  'trade_token'
+  'swap_token'
 ];
 const HIVE_POWER_ACTIONS = ['delegate', 'power_down'];
 

From 3236797fb13b7001b08f0a81f9655ccb2858ba8b Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Thu, 20 Jul 2023 19:22:43 +0500
Subject: [PATCH 23/37] made swap separate section inside trade screen

---
 src/screens/trade/children/index.ts           |   1 +
 .../trade/children/swapTokenContent.tsx       | 276 +++++++++++++++++
 src/screens/trade/screen/tradeScreen.tsx      | 282 +-----------------
 3 files changed, 293 insertions(+), 266 deletions(-)
 create mode 100644 src/screens/trade/children/swapTokenContent.tsx

diff --git a/src/screens/trade/children/index.ts b/src/screens/trade/children/index.ts
index ef3785bb8..3fb1ce428 100644
--- a/src/screens/trade/children/index.ts
+++ b/src/screens/trade/children/index.ts
@@ -1,3 +1,4 @@
+export * from './swapTokenContent'
 export * from './swapAmountInput';
 export * from './swapFeeSection';
 export * from './errorSection';
diff --git a/src/screens/trade/children/swapTokenContent.tsx b/src/screens/trade/children/swapTokenContent.tsx
new file mode 100644
index 000000000..9d9d22d97
--- /dev/null
+++ b/src/screens/trade/children/swapTokenContent.tsx
@@ -0,0 +1,276 @@
+import React, { useEffect, useMemo, useState } from 'react';
+import { View, Text, Alert, RefreshControl } from 'react-native';
+import styles from '../styles/tradeScreen.styles';
+import { AssetChangeBtn, ErrorSection, SwapAmountInput, SwapFeeSection } from '../children';
+import { MainButton } from '../../../components';
+import { useIntl } from 'react-intl';
+import { fetchHiveMarketRate, swapToken } from '../../../providers/hive-trade/hiveTrade';
+import { useAppDispatch, useAppSelector } from '../../../hooks';
+import { MarketAsset, SwapOptions } from '../../../providers/hive-trade/hiveTrade.types';
+import { ASSET_IDS } from '../../../constants/defaultAssets';
+import { showActionModal, toastNotification } from '../../../redux/actions/uiAction';
+import { walletQueries } from '../../../providers/queries';
+import { useSwapCalculator } from '../children/useSwapCalculator';
+import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
+import EStyleSheet from 'react-native-extended-stylesheet';
+
+
+
+
+export const SwapTokenContent = ({ initialSymbol }: { initialSymbol: MarketAsset }) => {
+
+    const intl = useIntl();
+    const dispatch = useAppDispatch();
+
+    //queres
+    const assetsQuery = walletQueries.useAssetsQuery();
+
+    const currentAccount = useAppSelector(state => state.account.currentAccount)
+    const currency = useAppSelector((state) => state.application.currency);
+
+    const assetsData = useAppSelector(state => state.wallet.coinsData);
+    const pinHash = useAppSelector(state => state.application.pin);
+    const isDarkTheme = useAppSelector(state => state.application.isDarkTheme);
+
+
+    const [fromAssetSymbol, setFromAssetSymbol] = useState(initialSymbol || MarketAsset.HIVE);
+    const [marketPrice, setMarketPrice] = useState(0);
+    const [isMoreThanBalance, setIsMoreThanBalance] = useState(false);
+
+    const [loading, setLoading] = useState(false);
+    const [swapping, setSwapping] = useState(false);
+    const [fromAmount, setFromAmount] = useState('0');
+
+    const _toAssetSymbol = useMemo(() => fromAssetSymbol === MarketAsset.HBD ? MarketAsset.HIVE : MarketAsset.HBD, [fromAssetSymbol])
+
+
+    //this method makes sure amount is only updated when new order book is fetched after asset change
+    //this avoid wrong from and to swap value on changing source asset
+    const _onAssetChangeComplete = () => {
+        setFromAmount(_toAmountStr);
+    }
+
+    const {
+        toAmount,
+        offerUnavailable,
+        tooMuchSlippage,
+        isLoading: _isFetchingOrders
+    } = useSwapCalculator(fromAssetSymbol, Number(fromAmount) || 0, _onAssetChangeComplete);
+
+
+    const _errorMessage = useMemo(() => {
+        let msg = '';
+        if (isMoreThanBalance) {
+            msg += intl.formatMessage({ id: 'trade.more-than-balance' }) + '\n';
+        }
+        if (offerUnavailable) {
+            msg += intl.formatMessage({ id: 'trade.offer-unavailable' }) + '\n';
+        }
+        if (tooMuchSlippage) {
+            msg += intl.formatMessage({ id: 'trade.too-much-slippage' }) + '\n';
+        }
+        return msg.trim();
+    }, [tooMuchSlippage, offerUnavailable, isMoreThanBalance])
+
+
+    //accumulate asset data properties
+    const _fromAssetData = assetsData[fromAssetSymbol === MarketAsset.HBD ? ASSET_IDS.HBD : ASSET_IDS.HIVE];
+    const _balance = _fromAssetData.balance;
+    const _fromFiatPrice = _fromAssetData.currentPrice;
+    const _toFiatPrice = assetsData[_toAssetSymbol === MarketAsset.HBD ? ASSET_IDS.HBD : ASSET_IDS.HIVE].currentPrice
+    const _marketFiatPrice = marketPrice * _toFiatPrice;
+
+    const _toAmountStr = toAmount.toFixed(3);
+
+
+
+    //initialize market data
+    useEffect(() => {
+        _fetchMarketRate();
+    }, [fromAssetSymbol])
+
+
+    //post process updated amount value
+    useEffect(() => {
+        const _value = Number(fromAmount);
+        //check for amount validity
+        setIsMoreThanBalance(_value > _balance)
+    }, [fromAmount])
+
+
+    //fetches and sets market rate based on selected assetew
+    const _fetchMarketRate = async () => {
+        try {
+            setLoading(true)
+
+            //TODO: update marketPrice
+            const _marketPrice = await fetchHiveMarketRate(fromAssetSymbol)
+            setMarketPrice(_marketPrice);
+
+            setLoading(false)
+        } catch (err) {
+            Alert.alert("fail", err.message)
+        }
+
+    }
+
+
+    //initiates swaping action on confirmation
+    const _confirmSwap = async () => {
+        try {
+
+            setSwapping(true)
+            const _fromAmount = Number(fromAmount)
+
+            const data: SwapOptions = {
+                fromAsset: fromAssetSymbol,
+                fromAmount: _fromAmount,
+                toAmount: toAmount
+            }
+
+            await swapToken(
+                currentAccount,
+                pinHash,
+                data
+            )
+
+            assetsQuery.refetch();
+
+            dispatch(toastNotification("successful swap"));
+            setSwapping(false)
+
+        } catch (err) {
+            Alert.alert('fail', err.message)
+            setSwapping(false)
+        }
+
+    }
+
+
+    //prompts user to verify swap action;
+    const handleContinue = () => {
+
+        dispatch(showActionModal({
+            title: "confirm swap",
+            body: `swaping ${fromAmount} ${fromAssetSymbol} for ${_toAssetSymbol} ${_toAmountStr}`,
+            buttons: [
+                {
+                    text: 'Cancel',
+                    onPress: () => {
+                        console.log('Swap transaction canceled');
+                    }
+                },
+                {
+                    text: 'Confirm',
+                    onPress: () => {
+                        _confirmSwap()
+                    }
+                }
+            ]
+        }))
+    };
+
+
+    //refreshes wallet data and market rate
+    const _refresh = async () => {
+        setLoading(true);
+        assetsQuery.refetch();
+        _fetchMarketRate();
+    }
+
+
+
+    const handleAssetChange = () => {
+        setFromAssetSymbol(_toAssetSymbol)
+    }
+
+    const _disabledContinue = _isFetchingOrders || loading || isMoreThanBalance || offerUnavailable || !Number(fromAmount)
+
+
+    const _renderBalance = () => (
+        <Text style={styles.balance}>
+            {`Balance: `}
+            <Text
+                style={{ color: EStyleSheet.value('$primaryBlue') }}
+                onPress={() => { setFromAmount(_balance + '') }}>
+                {`${_balance} ${fromAssetSymbol}`}
+            </Text>
+        </Text>
+    )
+
+    const _renderInputs = () => (
+        <View style={{ flex: 1 }}>
+
+            <SwapAmountInput
+                label={intl.formatMessage({ id: 'transfer.from' })}
+                onChangeText={setFromAmount}
+                value={fromAmount}
+                symbol={fromAssetSymbol}
+                fiatPrice={_fromFiatPrice}
+            />
+
+            <SwapAmountInput
+                label={intl.formatMessage({ id: 'transfer.to' })}
+                value={_toAmountStr}
+                symbol={_toAssetSymbol}
+                fiatPrice={_toFiatPrice}
+            />
+            <AssetChangeBtn onPress={handleAssetChange} />
+
+        </View>
+    )
+
+
+    const _renderMainBtn = () => (
+        <View style={styles.mainBtnContainer}>
+            <MainButton
+                style={styles.mainBtn}
+                isDisable={_disabledContinue}
+                onPress={handleContinue}
+                isLoading={swapping}
+            >
+                <Text style={styles.buttonText}>{intl.formatMessage({ id: 'transfer.next' })}</Text>
+            </MainButton>
+        </View>
+    )
+
+
+    const _renderMarketPrice = () => (
+        <Text style={styles.marketRate}>
+            {
+                `1 ${fromAssetSymbol} = ${marketPrice.toFixed(3)} `
+                + `${_toAssetSymbol} (${currency.currencySymbol + _marketFiatPrice.toFixed(3)})`
+            }
+        </Text>
+    )
+
+
+
+    return (
+        <KeyboardAwareScrollView style={styles.container} refreshControl={
+            <RefreshControl
+                refreshing={loading}
+                onRefresh={_refresh}
+                progressBackgroundColor="#357CE6"
+                tintColor={!isDarkTheme ? '#357ce6' : '#96c0ff'}
+                titleColor="#fff"
+                colors={['#fff']}
+            />
+        }>
+
+            {_renderBalance()}
+            {_renderInputs()}
+            {_renderMarketPrice()}
+
+            <SwapFeeSection />
+            <ErrorSection message={_errorMessage} />
+
+            {_renderMainBtn()}
+
+
+        </KeyboardAwareScrollView>
+
+    )
+
+
+};
diff --git a/src/screens/trade/screen/tradeScreen.tsx b/src/screens/trade/screen/tradeScreen.tsx
index 1e365057b..36a52fe3e 100644
--- a/src/screens/trade/screen/tradeScreen.tsx
+++ b/src/screens/trade/screen/tradeScreen.tsx
@@ -1,282 +1,32 @@
-import React, { useEffect, useMemo, useState } from 'react';
-import { View, Text, Alert, RefreshControl } from 'react-native';
+import React from 'react';
+import { View } from 'react-native';
 import styles from '../styles/tradeScreen.styles';
-import { AssetChangeBtn, ErrorSection, SwapAmountInput, SwapFeeSection } from '../children';
-import { BasicHeader, MainButton } from '../../../components';
+import {SwapTokenContent } from '../children';
+import { BasicHeader } from '../../../components';
+
+import TransferTypes from '../../../constants/transferTypes';
 import { useIntl } from 'react-intl';
-import { fetchHiveMarketRate, swapToken } from '../../../providers/hive-trade/hiveTrade';
-import { useAppDispatch, useAppSelector } from '../../../hooks';
-import { MarketAsset, SwapOptions } from '../../../providers/hive-trade/hiveTrade.types';
-import { ASSET_IDS } from '../../../constants/defaultAssets';
-import { showActionModal, toastNotification } from '../../../redux/actions/uiAction';
-import { walletQueries } from '../../../providers/queries';
-import { useSwapCalculator } from '../children/useSwapCalculator';
-import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
-import EStyleSheet from 'react-native-extended-stylesheet';
 
 
 const TradeScreen = ({ route }) => {
-
   const intl = useIntl();
-  const dispatch = useAppDispatch();
 
-  //queres
-  const assetsQuery = walletQueries.useAssetsQuery();
+  const transferType = route?.params?.transferType;
+  const fundType = route?.params?.fundType;
 
-  const currentAccount = useAppSelector(state => state.account.currentAccount)
-  const currency = useAppSelector((state) => state.application.currency);
+  let _content:any = null;
+  switch(transferType){
+    case TransferTypes.SWAP_TOKEN:
+      _content = <SwapTokenContent initialSymbol={fundType}/>
+      break;
 
-  const assetsData = useAppSelector(state => state.wallet.coinsData);
-  const pinHash = useAppSelector(state => state.application.pin);
-  const isDarkTheme = useAppSelector(state => state.application.isDarkTheme);
-
-
-  const [fromAssetSymbol, setFromAssetSymbol] = useState(route?.params?.fundType || MarketAsset.HIVE);
-  const [marketPrice, setMarketPrice] = useState(0);
-  const [isMoreThanBalance, setIsMoreThanBalance] = useState(false);
-
-  const [loading, setLoading] = useState(false);
-  const [swapping, setSwapping] = useState(false);
-  const [fromAmount, setFromAmount] = useState('0');
-
-  const _toAssetSymbol = useMemo(() => fromAssetSymbol === MarketAsset.HBD ? MarketAsset.HIVE : MarketAsset.HBD, [fromAssetSymbol])
-
-
-  //this method makes sure amount is only updated when new order book is fetched after asset change
-  //this avoid wrong from and to swap value on changing source asset
-  const _onAssetChangeComplete = () => {
-    setFromAmount(_toAmountStr);
+    //NOTE: when we add support for different modes of trade, those section will separatly rendered from here.
   }
 
-  const {
-    toAmount,
-    offerUnavailable,
-    tooMuchSlippage,
-    isLoading: _isFetchingOrders
-  } = useSwapCalculator(fromAssetSymbol, Number(fromAmount) || 0, _onAssetChangeComplete);
-
-
-  const _errorMessage = useMemo(() => {
-    let msg = '';
-    if (isMoreThanBalance) {
-      msg += intl.formatMessage({ id: 'trade.more-than-balance' }) + '\n';
-    }
-    if (offerUnavailable) {
-      msg += intl.formatMessage({ id: 'trade.offer-unavailable' }) + '\n';
-    }
-    if (tooMuchSlippage) {
-      msg += intl.formatMessage({ id: 'trade.too-much-slippage' }) + '\n';
-    }
-    return msg.trim();
-  }, [tooMuchSlippage, offerUnavailable, isMoreThanBalance])
-
-
-  //accumulate asset data properties
-  const _fromAssetData = assetsData[fromAssetSymbol === MarketAsset.HBD ? ASSET_IDS.HBD : ASSET_IDS.HIVE];
-  const _balance = _fromAssetData.balance;
-  const _fromFiatPrice = _fromAssetData.currentPrice;
-  const _toFiatPrice = assetsData[_toAssetSymbol === MarketAsset.HBD ? ASSET_IDS.HBD : ASSET_IDS.HIVE].currentPrice
-  const _marketFiatPrice = marketPrice * _toFiatPrice;
-
-  const _toAmountStr = toAmount.toFixed(3);
-
-
-
-  //initialize market data
-  useEffect(() => {
-    _fetchMarketRate();
-  }, [fromAssetSymbol])
-
-
-  //post process updated amount value
-  useEffect(() => {
-    const _value = Number(fromAmount);
-    //check for amount validity
-    setIsMoreThanBalance(_value > _balance)
-  }, [fromAmount])
-
-
-  //fetches and sets market rate based on selected assetew
-  const _fetchMarketRate = async () => {
-    try {
-      setLoading(true)
-
-      //TODO: update marketPrice
-      const _marketPrice = await fetchHiveMarketRate(fromAssetSymbol)
-      setMarketPrice(_marketPrice);
-
-      setLoading(false)
-    } catch (err) {
-      Alert.alert("fail", err.message)
-    }
-
-  }
-
-
-  //initiates swaping action on confirmation
-  const _confirmSwap = async () => {
-    try {
-
-      setSwapping(true)
-      const _fromAmount = Number(fromAmount)
-
-      const data: SwapOptions = {
-        fromAsset: fromAssetSymbol,
-        fromAmount: _fromAmount,
-        toAmount: toAmount
-      }
-
-      await swapToken(
-        currentAccount,
-        pinHash,
-        data
-      )
-
-      assetsQuery.refetch();
-
-      dispatch(toastNotification("successful swap"));
-      setSwapping(false)
-
-    } catch (err) {
-      Alert.alert('fail', err.message)
-      setSwapping(false)
-    }
-
-  }
-
-
-  //prompts user to verify swap action;
-  const handleContinue = () => {
-
-    dispatch(showActionModal({
-      title: "confirm swap",
-      body: `swaping ${fromAmount} ${fromAssetSymbol} for ${_toAssetSymbol} ${_toAmountStr}`,
-      buttons: [
-        {
-          text: 'Cancel',
-          onPress: () => {
-            console.log('Swap transaction canceled');
-          }
-        },
-        {
-          text: 'Confirm',
-          onPress: () => {
-            _confirmSwap()
-          }
-        }
-      ]
-    }))
-  };
-
-
-  //refreshes wallet data and market rate
-  const _refresh = async () => {
-    setLoading(true);
-    assetsQuery.refetch();
-    _fetchMarketRate();
-  }
-
-
-
-  const handleAssetChange = () => {
-    setFromAssetSymbol(_toAssetSymbol)
-  }
-
-  const _disabledContinue = _isFetchingOrders || loading || isMoreThanBalance || offerUnavailable || !Number(fromAmount)
-
-
-  const _renderBalance = () => (
-    <Text style={styles.balance}>
-      {`Balance: `}
-      <Text
-        style={{ color: EStyleSheet.value('$primaryBlue') }}
-        onPress={() => { setFromAmount(_balance + '') }}>
-        {`${_balance} ${fromAssetSymbol}`}
-      </Text>
-    </Text>
-  )
-
-  const _renderInputs = () => (
-    <View style={{ flex: 1 }}>
-
-      <SwapAmountInput
-        label={intl.formatMessage({ id: 'transfer.from' })}
-        onChangeText={setFromAmount}
-        value={fromAmount}
-        symbol={fromAssetSymbol}
-        fiatPrice={_fromFiatPrice}
-      />
-
-      <SwapAmountInput
-        label={intl.formatMessage({ id: 'transfer.to' })}
-        value={_toAmountStr}
-        symbol={_toAssetSymbol}
-        fiatPrice={_toFiatPrice}
-      />
-      <AssetChangeBtn onPress={handleAssetChange} />
-
-    </View>
-  )
-
-
-  const _renderMainBtn = () => (
-    <View style={styles.mainBtnContainer}>
-      <MainButton
-        style={styles.mainBtn}
-        isDisable={_disabledContinue}
-        onPress={handleContinue}
-        isLoading={swapping}
-      >
-        <Text style={styles.buttonText}>{intl.formatMessage({ id: 'transfer.next' })}</Text>
-      </MainButton>
-    </View>
-  )
-
-
-  const _renderMarketPrice = () => (
-    <Text style={styles.marketRate}>
-      {
-        `1 ${fromAssetSymbol} = ${marketPrice.toFixed(3)} ` 
-        + `${_toAssetSymbol} (${currency.currencySymbol + _marketFiatPrice.toFixed(3)})`
-      }
-    </Text>
-  )
-
-
-
-  const _renderContent = () => {
-    return (
-      <KeyboardAwareScrollView style={styles.container} refreshControl={
-        <RefreshControl
-          refreshing={loading}
-          onRefresh={_refresh}
-          progressBackgroundColor="#357CE6"
-          tintColor={!isDarkTheme ? '#357ce6' : '#96c0ff'}
-          titleColor="#fff"
-          colors={['#fff']}
-        />
-      }>
-
-        {_renderBalance()}
-        {_renderInputs()}
-        {_renderMarketPrice()}
-
-        <SwapFeeSection />
-        <ErrorSection message={_errorMessage} />
-
-        {_renderMainBtn()}
-
-
-      </KeyboardAwareScrollView>
-
-    )
-  }
-
-
   return (
     <View style={styles.container}>
-      <BasicHeader title={intl.formatMessage({ id: 'trade.title' })} />
-      {_renderContent()}
+      <BasicHeader title={intl.formatMessage({ id: `trade.${transferType}` })} />
+      {_content}
 
     </View>
   );

From 4eff0f0af782224e6ffc9894061a3ec7e995f2ff Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Thu, 20 Jul 2023 19:24:17 +0500
Subject: [PATCH 24/37] updated error messages

---
 src/config/locales/en-US.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json
index 47f7cf102..4d2070279 100644
--- a/src/config/locales/en-US.json
+++ b/src/config/locales/en-US.json
@@ -838,9 +838,9 @@
   },
   "trade":{
     "swap_token":"Swap Your Funds",
-    "more-than-balance": "Entered amount is more than your available available balance",
-    "offer-unavailable": "Offer not available for entered amount. Please, enter less value",
-    "too-much-slippage": "We highly recommend you to reduce amount for better pricing!",
+    "more-than-balance": "Entered amount is more than your available balance",
+    "offer-unavailable": "Offer not available for entered amount. Please reduce amount",
+    "too-much-slippage": "We highly recommend you to reduce amount for better pricing",
     "fee":"Fee",
     "free":"Free"
   },

From a6269dd6058364f8fda50e6cc7e432a947c6a242 Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Thu, 20 Jul 2023 20:45:20 +0500
Subject: [PATCH 25/37] added redundency to swap amount inputs

---
 .../trade/children/swapAmountInput.tsx        | 10 +++++-
 .../trade/children/swapTokenContent.tsx       |  2 +-
 src/utils/number.ts                           | 31 +++++++++++++++++--
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/src/screens/trade/children/swapAmountInput.tsx b/src/screens/trade/children/swapAmountInput.tsx
index f27eeb709..051bd682c 100644
--- a/src/screens/trade/children/swapAmountInput.tsx
+++ b/src/screens/trade/children/swapAmountInput.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { View, TextInput, Text } from "react-native";
 import styles from '../styles/swapAmountInput.styles';
 import { useAppSelector } from '../../../hooks';
+import { formatNumberInputStr } from '../../../utils/number';
 
 interface SwapInputProps {
   label: string;
@@ -21,6 +22,13 @@ export const SwapAmountInput = ({ label, onChangeText, value, fiatPrice, symbol
 
   const _fiatValue = ((Number(value) || 0) * fiatPrice).toFixed(3);
 
+  const _onChangeText = (text: string) => {
+    if(onChangeText){
+      onChangeText(formatNumberInputStr(text, 3))
+    }
+    
+  }
+
 
   return (
     <View style={styles.container} >
@@ -28,7 +36,7 @@ export const SwapAmountInput = ({ label, onChangeText, value, fiatPrice, symbol
       <View style={styles.inputContainer}>
         <TextInput
           editable={!!onChangeText}
-          onChangeText={onChangeText}
+          onChangeText={_onChangeText}
           value={value}
           keyboardType='numeric'
           style={styles.input}
diff --git a/src/screens/trade/children/swapTokenContent.tsx b/src/screens/trade/children/swapTokenContent.tsx
index 9d9d22d97..71df43b6c 100644
--- a/src/screens/trade/children/swapTokenContent.tsx
+++ b/src/screens/trade/children/swapTokenContent.tsx
@@ -184,7 +184,7 @@ export const SwapTokenContent = ({ initialSymbol }: { initialSymbol: MarketAsset
         setFromAssetSymbol(_toAssetSymbol)
     }
 
-    const _disabledContinue = _isFetchingOrders || loading || isMoreThanBalance || offerUnavailable || !Number(fromAmount)
+    const _disabledContinue = _isFetchingOrders || loading || isMoreThanBalance || offerUnavailable || !Number(fromAmount) || !Number(toAmount)
 
 
     const _renderBalance = () => (
diff --git a/src/utils/number.ts b/src/utils/number.ts
index f00f889dc..50c399ec4 100644
--- a/src/utils/number.ts
+++ b/src/utils/number.ts
@@ -11,7 +11,7 @@ export const countDecimals = (value) => {
 };
 
 
-export const stripDecimalPlaces = (value:number, precision:number = 3) => {
+export const stripDecimalPlaces = (value: number, precision: number = 3) => {
   if (!Number(value)) {
     return 0;
   }
@@ -19,4 +19,31 @@ export const stripDecimalPlaces = (value:number, precision:number = 3) => {
   const power = Math.pow(10, precision)
 
   return Math.floor(value * power) / power;
-}
\ No newline at end of file
+}
+
+export const getDecimalPlaces = (value: number) => {
+  const regex = /(?<=\.)\d+/;
+  const match = value.toString().match(regex);
+  return match ? match[0].length : 0;
+}
+
+export const formatNumberInputStr = (text: string, precision: number = 10) => {
+  const _num = parseFloat(text);
+
+  if (_num) {
+    let _retVal = text;
+    if ((text.startsWith('0') && _num >= 1) || text.startsWith('.')) {
+      _retVal = '' + _num;
+    }
+
+    if (getDecimalPlaces(_num) > precision) {
+      _retVal = '' + stripDecimalPlaces(_num, precision)
+    }
+    return _retVal;
+  } else if(text === ''){
+    return '0'
+  } else {
+    return text;
+  }
+
+}

From e7f74143fedb37d495d6c6d8acfc3239f64075e1 Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Thu, 20 Jul 2023 21:31:06 +0500
Subject: [PATCH 26/37] action modal now accepts intl ids

---
 .../actionModal/container/actionModalContainer.tsx         | 7 ++++++-
 src/components/actionModal/view/actionModalView.tsx        | 5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/components/actionModal/container/actionModalContainer.tsx b/src/components/actionModal/container/actionModalContainer.tsx
index 750f63a22..1445993f9 100644
--- a/src/components/actionModal/container/actionModalContainer.tsx
+++ b/src/components/actionModal/container/actionModalContainer.tsx
@@ -5,11 +5,16 @@ import { useSelector, useDispatch } from 'react-redux';
 import { hideActionModal } from '../../../redux/actions/uiAction';
 import ActionModalView, { ActionModalRef } from '../view/actionModalView';
 
+
+interface ExtendedAlertButton extends AlertButton {
+  textId:string
+}
+
 export interface ActionModalData {
   title: string;
   body: string;
   para?: string;
-  buttons: AlertButton[];
+  buttons: ExtendedAlertButton[];
   headerImage?: Source;
   onClosed: () => void;
   headerContent?: React.ReactNode;
diff --git a/src/components/actionModal/view/actionModalView.tsx b/src/components/actionModal/view/actionModalView.tsx
index a61a7a9d8..be152689e 100644
--- a/src/components/actionModal/view/actionModalView.tsx
+++ b/src/components/actionModal/view/actionModalView.tsx
@@ -7,6 +7,7 @@ import styles from './actionModalStyles';
 
 import { ActionModalData } from '../container/actionModalContainer';
 import { MainButton } from '../../mainButton';
+import { useIntl } from 'react-intl';
 
 export interface ActionModalRef {
   showModal: () => void;
@@ -21,6 +22,8 @@ interface ActionModalViewProps {
 const ActionModalView = ({ onClose, data }: ActionModalViewProps, ref) => {
   const sheetModalRef = useRef<ActionSheet>();
 
+  const intl = useIntl();
+
   useImperativeHandle(ref, () => ({
     showModal: () => {
       console.log('Showing action modal');
@@ -59,7 +62,7 @@ const ActionModalView = ({ onClose, data }: ActionModalViewProps, ref) => {
           buttons.map((props) => (
             <MainButton
               key={props.text}
-              text={props.text}
+              text={props.textId ? intl.formatMessage({id:props.textId}) : props.text}
               onPress={(evn) => {
                 sheetModalRef.current?.setModalVisible(false);
                 props.onPress(evn);

From 0c16b8982017282995d8eac8fa355a97f4a34ac2 Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Thu, 20 Jul 2023 21:31:33 +0500
Subject: [PATCH 27/37] updated translations

---
 src/config/locales/en-US.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json
index 4d2070279..b1f091ad9 100644
--- a/src/config/locales/en-US.json
+++ b/src/config/locales/en-US.json
@@ -842,7 +842,11 @@
     "offer-unavailable": "Offer not available for entered amount. Please reduce amount",
     "too-much-slippage": "We highly recommend you to reduce amount for better pricing",
     "fee":"Fee",
-    "free":"Free"
+    "free":"Free",
+    "confirm_swap":"Swap Confirmation!",
+    "swap_for" :"{fromAmount} for {toAmount}",
+    "swap_successful":"Successfully Swapped!",
+    "new_swap":"New Swap"
   },
   "boost": {
     "title": "Get Points",

From 5941305b07de21c3cee932282cca58626e07a6f3 Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Thu, 20 Jul 2023 21:32:00 +0500
Subject: [PATCH 28/37] updated success and confirmation modals

---
 .../trade/children/swapTokenContent.tsx       | 59 +++++++++++++------
 1 file changed, 41 insertions(+), 18 deletions(-)

diff --git a/src/screens/trade/children/swapTokenContent.tsx b/src/screens/trade/children/swapTokenContent.tsx
index 71df43b6c..3d7da1e8a 100644
--- a/src/screens/trade/children/swapTokenContent.tsx
+++ b/src/screens/trade/children/swapTokenContent.tsx
@@ -2,17 +2,19 @@ import React, { useEffect, useMemo, useState } from 'react';
 import { View, Text, Alert, RefreshControl } from 'react-native';
 import styles from '../styles/tradeScreen.styles';
 import { AssetChangeBtn, ErrorSection, SwapAmountInput, SwapFeeSection } from '../children';
-import { MainButton } from '../../../components';
+import { Icon, MainButton } from '../../../components';
 import { useIntl } from 'react-intl';
 import { fetchHiveMarketRate, swapToken } from '../../../providers/hive-trade/hiveTrade';
 import { useAppDispatch, useAppSelector } from '../../../hooks';
 import { MarketAsset, SwapOptions } from '../../../providers/hive-trade/hiveTrade.types';
 import { ASSET_IDS } from '../../../constants/defaultAssets';
-import { showActionModal, toastNotification } from '../../../redux/actions/uiAction';
+import { showActionModal } from '../../../redux/actions/uiAction';
 import { walletQueries } from '../../../providers/queries';
 import { useSwapCalculator } from '../children/useSwapCalculator';
 import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
 import EStyleSheet from 'react-native-extended-stylesheet';
+import { useNavigation } from '@react-navigation/native';
+import { delay } from '../../../utils/editor';
 
 
 
@@ -21,6 +23,7 @@ export const SwapTokenContent = ({ initialSymbol }: { initialSymbol: MarketAsset
 
     const intl = useIntl();
     const dispatch = useAppDispatch();
+    const navigation = useNavigation();
 
     //queres
     const assetsQuery = walletQueries.useAssetsQuery();
@@ -115,6 +118,35 @@ export const SwapTokenContent = ({ initialSymbol }: { initialSymbol: MarketAsset
     }
 
 
+    const _reset = () => {
+        setFromAmount('0');
+    }
+
+
+    const _onSwapSuccess = () => {
+
+        const headerContent = (
+            <View style={{ backgroundColor: EStyleSheet.value('$primaryGreen'), borderRadius: 56, padding: 8 }} >
+                <Icon
+                    style={{ borderWidth: 0 }}
+                    size={64}
+                    color={EStyleSheet.value('$pureWhite')}
+                    name="check"
+                    iconType="MaterialIcons"
+                />
+            </View>
+        )
+        dispatch(showActionModal({
+            headerContent,
+            title: intl.formatMessage({ id: 'trade.swap_successful' }),
+            buttons: [
+                { textId: 'trade.new_swap', onPress: _reset },
+                { textId: 'alert.okay', onPress: () => navigation.goBack() }
+            ]
+        }))
+    }
+
+
     //initiates swaping action on confirmation
     const _confirmSwap = async () => {
         try {
@@ -135,9 +167,8 @@ export const SwapTokenContent = ({ initialSymbol }: { initialSymbol: MarketAsset
             )
 
             assetsQuery.refetch();
-
-            dispatch(toastNotification("successful swap"));
             setSwapping(false)
+            _onSwapSuccess();
 
         } catch (err) {
             Alert.alert('fail', err.message)
@@ -151,21 +182,13 @@ export const SwapTokenContent = ({ initialSymbol }: { initialSymbol: MarketAsset
     const handleContinue = () => {
 
         dispatch(showActionModal({
-            title: "confirm swap",
-            body: `swaping ${fromAmount} ${fromAssetSymbol} for ${_toAssetSymbol} ${_toAmountStr}`,
+            title: intl.formatMessage({ id: 'trade.confirm_swap' }),
+            body: intl.formatMessage(
+                { id: 'trade.swap_for' },
+                { fromAmount: `${fromAmount} ${fromAssetSymbol}`, toAmount: `${_toAmountStr} ${_toAssetSymbol}` }),
             buttons: [
-                {
-                    text: 'Cancel',
-                    onPress: () => {
-                        console.log('Swap transaction canceled');
-                    }
-                },
-                {
-                    text: 'Confirm',
-                    onPress: () => {
-                        _confirmSwap()
-                    }
-                }
+                { textId: 'alert.cancel', onPress: () => { } },
+                { textId: 'alert.continue', onPress: _confirmSwap }
             ]
         }))
     };

From df5a6cdb7e6f7e08d1331659379fda4a324f7e23 Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Thu, 20 Jul 2023 22:19:21 +0500
Subject: [PATCH 29/37] support for hivesigner swap action

---
 src/providers/hive-trade/converters.ts        |  27 +++++
 src/providers/hive-trade/hiveTrade.ts         | 107 ++++++++++++------
 .../trade/children/swapTokenContent.tsx       |  57 ++++++----
 src/screens/trade/screen/tradeScreen.tsx      |  52 ++++++++-
 src/screens/transfer/screen/transferScreen.js |   2 +-
 5 files changed, 188 insertions(+), 57 deletions(-)
 create mode 100644 src/providers/hive-trade/converters.ts

diff --git a/src/providers/hive-trade/converters.ts b/src/providers/hive-trade/converters.ts
new file mode 100644
index 000000000..9c29e19e3
--- /dev/null
+++ b/src/providers/hive-trade/converters.ts
@@ -0,0 +1,27 @@
+import { MarketAsset, SwapOptions, TransactionType } from "./hiveTrade.types";
+
+
+export const convertSwapOptionsToLimitOrder = (data:SwapOptions) => {
+    let amountToSell = 0;
+    let minToRecieve = 0;
+    let transactionType = TransactionType.None;
+
+    switch (data.fromAsset) {
+        case MarketAsset.HIVE:
+            amountToSell = data.toAmount
+            minToRecieve = data.fromAmount
+            transactionType = TransactionType.Sell
+            break;
+        case MarketAsset.HBD:
+            amountToSell = data.fromAmount
+            minToRecieve = data.toAmount
+            transactionType = TransactionType.Buy
+            break;
+    }
+
+    return {
+        amountToSell,
+        minToRecieve,
+        transactionType
+    }
+}
\ No newline at end of file
diff --git a/src/providers/hive-trade/hiveTrade.ts b/src/providers/hive-trade/hiveTrade.ts
index 5da51edd3..2cc95bf52 100644
--- a/src/providers/hive-trade/hiveTrade.ts
+++ b/src/providers/hive-trade/hiveTrade.ts
@@ -3,6 +3,7 @@ import { getAnyPrivateKey, getDigitPinCode, getMarketStatistics, sendHiveOperati
 import { MarketAsset, MarketStatistics, OrderIdPrefix, SwapOptions, TransactionType } from './hiveTrade.types';
 import bugsnapInstance from '../../config/bugsnag';
 import { Operation } from '@hiveio/dhive';
+import { convertSwapOptionsToLimitOrder } from './converters';
 
 
 //This operation creates a limit order and matches it against existing open orders. 
@@ -31,27 +32,12 @@ export const limitOrderCreate = (
         expiration.setDate(expiration.getDate() + 27);
         expiration = expiration.toISOString().split(".")[0];
 
+        const data = getLimitOrderCreateOpData(currentAccount.username, amountToSell, minToReceive, orderType, idPrefix);
+
         const args: Operation[] = [
             [
                 'limit_order_create',
-                {
-                    owner: currentAccount.username,
-                    orderid: Number(
-                        `${idPrefix}${Math.floor(Date.now() / 1000)
-                            .toString()
-                            .slice(2)}`
-                    ),
-                    amount_to_sell: `${orderType === TransactionType.Buy
-                        ? amountToSell.toFixed(3)
-                        : minToReceive.toFixed(3)
-                        } ${orderType === TransactionType.Buy ? MarketAsset.HBD : MarketAsset.HIVE}`,
-                    min_to_receive: `${orderType === TransactionType.Buy
-                        ? minToReceive.toFixed(3)
-                        : amountToSell.toFixed(3)
-                        } ${orderType === TransactionType.Buy ? MarketAsset.HIVE : MarketAsset.HBD}`,
-                    fill_or_kill: false,
-                    expiration: expiration
-                },
+                data
             ],
         ];
 
@@ -76,28 +62,57 @@ export const limitOrderCreate = (
 
 
 
+export const generateHsLimitOrderCreatePath = (
+    currentAccount: any,
+    amountToSell: number,
+    minToReceive: number,
+    orderType: TransactionType,
+    idPrefix = OrderIdPrefix.EMPTY) => {
+
+    const data = getLimitOrderCreateOpData(currentAccount.username, amountToSell, minToReceive, orderType, idPrefix)
+
+    const query = new URLSearchParams(data).toString()
+
+    return `sign/limitOrderCreate?${query}`
+
+}
+
+
+
+export const generateHsSwapTokenPath = (
+    currentAccount: any,
+    data: SwapOptions) => {
+
+    const {
+        amountToSell,
+        minToRecieve,
+        transactionType
+    } = convertSwapOptionsToLimitOrder(data)
+
+    return generateHsLimitOrderCreatePath(
+        currentAccount,
+        amountToSell,
+        minToRecieve,
+        transactionType,
+        OrderIdPrefix.SWAP
+    )
+}
+
+
+
+
 export const swapToken = async (
     currentAccount: any,
     pinHash: string,
     data: SwapOptions) => {
 
     try {
-        let amountToSell = 0;
-        let minToRecieve = 0;
-        let transactionType = TransactionType.None;
+        const {
+            amountToSell,
+            minToRecieve,
+            transactionType
+        } = convertSwapOptionsToLimitOrder(data)
 
-        switch (data.fromAsset) {
-            case MarketAsset.HIVE:
-                amountToSell = data.toAmount
-                minToRecieve = data.fromAmount
-                transactionType = TransactionType.Sell
-                break;
-            case MarketAsset.HBD:
-                amountToSell = data.fromAmount
-                minToRecieve = data.toAmount
-                transactionType = TransactionType.Buy
-                break;
-        }
 
         await limitOrderCreate(
             currentAccount,
@@ -140,4 +155,30 @@ export const fetchHiveMarketRate = async (asset: MarketAsset): Promise<number> =
         bugsnapInstance.notify(err);
         throw err;
     }
+}
+
+
+const getLimitOrderCreateOpData = (username, amountToSell, minToReceive, orderType, idPrefix) => {
+    let expiration: any = new Date(Date.now());
+    expiration.setDate(expiration.getDate() + 27);
+    expiration = expiration.toISOString().split(".")[0];
+
+    return {
+        owner: username,
+        orderid: Number(
+            `${idPrefix}${Math.floor(Date.now() / 1000)
+                .toString()
+                .slice(2)}`
+        ),
+        amount_to_sell: `${orderType === TransactionType.Buy
+            ? amountToSell.toFixed(3)
+            : minToReceive.toFixed(3)
+            } ${orderType === TransactionType.Buy ? MarketAsset.HBD : MarketAsset.HIVE}`,
+        min_to_receive: `${orderType === TransactionType.Buy
+            ? minToReceive.toFixed(3)
+            : amountToSell.toFixed(3)
+            } ${orderType === TransactionType.Buy ? MarketAsset.HIVE : MarketAsset.HBD}`,
+        fill_or_kill: false,
+        expiration: expiration
+    }
 }
\ No newline at end of file
diff --git a/src/screens/trade/children/swapTokenContent.tsx b/src/screens/trade/children/swapTokenContent.tsx
index 3d7da1e8a..8b997660b 100644
--- a/src/screens/trade/children/swapTokenContent.tsx
+++ b/src/screens/trade/children/swapTokenContent.tsx
@@ -4,7 +4,7 @@ import styles from '../styles/tradeScreen.styles';
 import { AssetChangeBtn, ErrorSection, SwapAmountInput, SwapFeeSection } from '../children';
 import { Icon, MainButton } from '../../../components';
 import { useIntl } from 'react-intl';
-import { fetchHiveMarketRate, swapToken } from '../../../providers/hive-trade/hiveTrade';
+import { fetchHiveMarketRate, generateHsSwapTokenPath, swapToken } from '../../../providers/hive-trade/hiveTrade';
 import { useAppDispatch, useAppSelector } from '../../../hooks';
 import { MarketAsset, SwapOptions } from '../../../providers/hive-trade/hiveTrade.types';
 import { ASSET_IDS } from '../../../constants/defaultAssets';
@@ -14,12 +14,18 @@ import { useSwapCalculator } from '../children/useSwapCalculator';
 import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
 import EStyleSheet from 'react-native-extended-stylesheet';
 import { useNavigation } from '@react-navigation/native';
+import AUTH_TYPE from '../../../constants/authType';
 import { delay } from '../../../utils/editor';
 
 
+interface Props {
+    initialSymbol: MarketAsset,
+    handleHsTransfer: (hsSignPath: string) => void,
+    onSuccess: () => void
+}
 
 
-export const SwapTokenContent = ({ initialSymbol }: { initialSymbol: MarketAsset }) => {
+export const SwapTokenContent = ({ initialSymbol, handleHsTransfer, onSuccess }: Props) => {
 
     const intl = useIntl();
     const dispatch = useAppDispatch();
@@ -149,30 +155,42 @@ export const SwapTokenContent = ({ initialSymbol }: { initialSymbol: MarketAsset
 
     //initiates swaping action on confirmation
     const _confirmSwap = async () => {
-        try {
 
-            setSwapping(true)
-            const _fromAmount = Number(fromAmount)
+        const _fromAmount = Number(fromAmount)
 
-            const data: SwapOptions = {
-                fromAsset: fromAssetSymbol,
-                fromAmount: _fromAmount,
-                toAmount: toAmount
-            }
+        const data: SwapOptions = {
+            fromAsset: fromAssetSymbol,
+            fromAmount: _fromAmount,
+            toAmount: toAmount
+        }
 
-            await swapToken(
+
+        if (currentAccount.local.authType === AUTH_TYPE.STEEM_CONNECT) {
+            await delay(500); //NOTE: it's required to avoid modal mis fire
+            handleHsTransfer(generateHsSwapTokenPath(
                 currentAccount,
-                pinHash,
                 data
-            )
+            ))
 
-            assetsQuery.refetch();
-            setSwapping(false)
-            _onSwapSuccess();
+        } else {
+            try {
 
-        } catch (err) {
-            Alert.alert('fail', err.message)
-            setSwapping(false)
+                setSwapping(true)
+
+                await swapToken(
+                    currentAccount,
+                    pinHash,
+                    data
+                )
+
+                onSuccess();
+                setSwapping(false)
+                _onSwapSuccess();
+
+            } catch (err) {
+                Alert.alert('fail', err.message)
+                setSwapping(false)
+            }
         }
 
     }
@@ -191,6 +209,7 @@ export const SwapTokenContent = ({ initialSymbol }: { initialSymbol: MarketAsset
                 { textId: 'alert.continue', onPress: _confirmSwap }
             ]
         }))
+
     };
 
 
diff --git a/src/screens/trade/screen/tradeScreen.tsx b/src/screens/trade/screen/tradeScreen.tsx
index 36a52fe3e..b91485923 100644
--- a/src/screens/trade/screen/tradeScreen.tsx
+++ b/src/screens/trade/screen/tradeScreen.tsx
@@ -1,33 +1,77 @@
-import React from 'react';
+import React, { useState } from 'react';
 import { View } from 'react-native';
 import styles from '../styles/tradeScreen.styles';
 import {SwapTokenContent } from '../children';
-import { BasicHeader } from '../../../components';
+import { BasicHeader, Modal } from '../../../components';
 
 import TransferTypes from '../../../constants/transferTypes';
 import { useIntl } from 'react-intl';
+import { hsOptions } from '../../../constants/hsOptions';
+import WebView from 'react-native-webview';
+import { useDispatch } from 'react-redux';
+import { walletQueries } from '../../../providers/queries';
 
 
-const TradeScreen = ({ route }) => {
+const TradeScreen = ({ route, navigation }) => {
   const intl = useIntl();
 
+  const assetsQuery = walletQueries.useAssetsQuery();
+
   const transferType = route?.params?.transferType;
   const fundType = route?.params?.fundType;
 
+  const [showHsModal, setShowHsModal] = useState(false);
+  const [hsSignPath, setHsSignPath] = useState('');
+
+
+  const _delayedRefreshCoinsData = () => {
+    setTimeout(() => {
+      assetsQuery.refetch();
+    }, 3000);
+  };
+
+  const _handleOnModalClose = () => {
+    setShowHsModal(false);
+    setHsSignPath('');
+    navigation.goBack();
+  }
+
+  const _onSuccess = () => {
+    _delayedRefreshCoinsData()
+  }
+
+
+  const _handleHsTransfer = (_hsSignPath:string) => {
+    setHsSignPath(_hsSignPath)
+    setShowHsModal(true)
+  }
+
   let _content:any = null;
   switch(transferType){
     case TransferTypes.SWAP_TOKEN:
-      _content = <SwapTokenContent initialSymbol={fundType}/>
+      _content = <SwapTokenContent initialSymbol={fundType} handleHsTransfer={_handleHsTransfer} onSuccess={_onSuccess} />
       break;
 
     //NOTE: when we add support for different modes of trade, those section will separatly rendered from here.
   }
 
+
   return (
     <View style={styles.container}>
       <BasicHeader title={intl.formatMessage({ id: `trade.${transferType}` })} />
       {_content}
 
+      {!!hsSignPath && (
+        <Modal
+          isOpen={showHsModal}
+          isFullScreen
+          isCloseButton
+          handleOnModalClose={_handleOnModalClose}
+          title={intl.formatMessage({ id: 'transfer.steemconnect_title' })}
+        >
+          <WebView source={{ uri: `${hsOptions.base_url}${hsSignPath}` }} />
+        </Modal>
+      )}
     </View>
   );
 };
diff --git a/src/screens/transfer/screen/transferScreen.js b/src/screens/transfer/screen/transferScreen.js
index b37515dba..07c04ab26 100644
--- a/src/screens/transfer/screen/transferScreen.js
+++ b/src/screens/transfer/screen/transferScreen.js
@@ -1,5 +1,5 @@
 import React, { useState, useMemo } from 'react';
-import { Button, Text, View } from 'react-native';
+import { Text, View } from 'react-native';
 import { WebView } from 'react-native-webview';
 import { injectIntl } from 'react-intl';
 import { get, debounce } from 'lodash';

From 46bfa25f5267ebc7bcfcd296e202a51fac683d60 Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Thu, 20 Jul 2023 22:25:35 +0500
Subject: [PATCH 30/37] short dealy after closing web modal and navigating to
 back screen

---
 src/screens/trade/screen/tradeScreen.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/screens/trade/screen/tradeScreen.tsx b/src/screens/trade/screen/tradeScreen.tsx
index b91485923..559968c55 100644
--- a/src/screens/trade/screen/tradeScreen.tsx
+++ b/src/screens/trade/screen/tradeScreen.tsx
@@ -10,6 +10,7 @@ import { hsOptions } from '../../../constants/hsOptions';
 import WebView from 'react-native-webview';
 import { useDispatch } from 'react-redux';
 import { walletQueries } from '../../../providers/queries';
+import { delay } from '../../../utils/editor';
 
 
 const TradeScreen = ({ route, navigation }) => {
@@ -30,9 +31,11 @@ const TradeScreen = ({ route, navigation }) => {
     }, 3000);
   };
 
-  const _handleOnModalClose = () => {
+  const _handleOnModalClose = async () => {
     setShowHsModal(false);
     setHsSignPath('');
+
+    await delay(300)
     navigation.goBack();
   }
 

From 73785f62e99cc4c8348f1177eeadf06e00dbcdf0 Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Thu, 20 Jul 2023 22:29:57 +0500
Subject: [PATCH 31/37] lint

---
 .../container/actionModalContainer.tsx        |   3 +-
 .../actionModal/view/actionModalView.tsx      |   4 +-
 src/constants/transferTypes.ts                |   3 +-
 src/providers/hive-trade/converters.ts        |  47 +-
 src/providers/hive-trade/hiveTrade.ts         | 330 ++++++-----
 src/providers/hive-trade/hiveTrade.types.ts   |  54 +-
 src/providers/hive/dhive.js                   |   4 +-
 .../queries/walletQueries/walletQueries.ts    |  11 +-
 src/redux/actions/applicationActions.ts       |   8 +-
 .../application/hook/useInitApplication.tsx   |   8 +-
 .../screen/assetDetailsScreen.tsx             |   6 +-
 src/screens/trade/children/assetChangeBtn.tsx |  39 +-
 src/screens/trade/children/errorSection.tsx   |  40 +-
 src/screens/trade/children/index.ts           |   4 +-
 .../trade/children/swapAmountInput.tsx        |  27 +-
 src/screens/trade/children/swapFeeSection.tsx |  27 +-
 .../trade/children/swapTokenContent.tsx       | 517 +++++++++---------
 src/screens/trade/screen/tradeScreen.tsx      |  44 +-
 .../webBrowser/screen/webBrowserStyles.ts     |   6 +-
 src/utils/number.ts                           |  18 +-
 src/utils/strings.ts                          |  18 +-
 21 files changed, 582 insertions(+), 636 deletions(-)

diff --git a/src/components/actionModal/container/actionModalContainer.tsx b/src/components/actionModal/container/actionModalContainer.tsx
index 1445993f9..ebb9a2825 100644
--- a/src/components/actionModal/container/actionModalContainer.tsx
+++ b/src/components/actionModal/container/actionModalContainer.tsx
@@ -5,9 +5,8 @@ import { useSelector, useDispatch } from 'react-redux';
 import { hideActionModal } from '../../../redux/actions/uiAction';
 import ActionModalView, { ActionModalRef } from '../view/actionModalView';
 
-
 interface ExtendedAlertButton extends AlertButton {
-  textId:string
+  textId: string;
 }
 
 export interface ActionModalData {
diff --git a/src/components/actionModal/view/actionModalView.tsx b/src/components/actionModal/view/actionModalView.tsx
index be152689e..d130b1e6c 100644
--- a/src/components/actionModal/view/actionModalView.tsx
+++ b/src/components/actionModal/view/actionModalView.tsx
@@ -3,11 +3,11 @@ import { View, Text } from 'react-native';
 import FastImage from 'react-native-fast-image';
 import EStyleSheet from 'react-native-extended-stylesheet';
 import ActionSheet from 'react-native-actions-sheet';
+import { useIntl } from 'react-intl';
 import styles from './actionModalStyles';
 
 import { ActionModalData } from '../container/actionModalContainer';
 import { MainButton } from '../../mainButton';
-import { useIntl } from 'react-intl';
 
 export interface ActionModalRef {
   showModal: () => void;
@@ -62,7 +62,7 @@ const ActionModalView = ({ onClose, data }: ActionModalViewProps, ref) => {
           buttons.map((props) => (
             <MainButton
               key={props.text}
-              text={props.textId ? intl.formatMessage({id:props.textId}) : props.text}
+              text={props.textId ? intl.formatMessage({ id: props.textId }) : props.text}
               onPress={(evn) => {
                 sheetModalRef.current?.setModalVisible(false);
                 props.onPress(evn);
diff --git a/src/constants/transferTypes.ts b/src/constants/transferTypes.ts
index 090465916..c07d7d305 100644
--- a/src/constants/transferTypes.ts
+++ b/src/constants/transferTypes.ts
@@ -7,12 +7,11 @@ const TransferTypes = {
   POINTS: 'points',
   WITHDRAW_HIVE: 'withdraw_hive',
   WITHDRAW_HBD: 'withdraw_hbd',
-  SWAP_TOKEN : 'swap_token',
+  SWAP_TOKEN: 'swap_token',
   DELEGATE: 'delegate',
   POWER_DOWN: 'power_down',
   ADDRESS_VIEW: 'address_view',
   DELEGATE_VESTING_SHARES: 'delegate_vesting_shares',
-  
 
   // Engine Transfer types
   WITHDRAW_VESTING: 'withdraw_vesting',
diff --git a/src/providers/hive-trade/converters.ts b/src/providers/hive-trade/converters.ts
index 9c29e19e3..da99d2536 100644
--- a/src/providers/hive-trade/converters.ts
+++ b/src/providers/hive-trade/converters.ts
@@ -1,27 +1,26 @@
-import { MarketAsset, SwapOptions, TransactionType } from "./hiveTrade.types";
+import { MarketAsset, SwapOptions, TransactionType } from './hiveTrade.types';
 
+export const convertSwapOptionsToLimitOrder = (data: SwapOptions) => {
+  let amountToSell = 0;
+  let minToRecieve = 0;
+  let transactionType = TransactionType.None;
 
-export const convertSwapOptionsToLimitOrder = (data:SwapOptions) => {
-    let amountToSell = 0;
-    let minToRecieve = 0;
-    let transactionType = TransactionType.None;
+  switch (data.fromAsset) {
+    case MarketAsset.HIVE:
+      amountToSell = data.toAmount;
+      minToRecieve = data.fromAmount;
+      transactionType = TransactionType.Sell;
+      break;
+    case MarketAsset.HBD:
+      amountToSell = data.fromAmount;
+      minToRecieve = data.toAmount;
+      transactionType = TransactionType.Buy;
+      break;
+  }
 
-    switch (data.fromAsset) {
-        case MarketAsset.HIVE:
-            amountToSell = data.toAmount
-            minToRecieve = data.fromAmount
-            transactionType = TransactionType.Sell
-            break;
-        case MarketAsset.HBD:
-            amountToSell = data.fromAmount
-            minToRecieve = data.toAmount
-            transactionType = TransactionType.Buy
-            break;
-    }
-
-    return {
-        amountToSell,
-        minToRecieve,
-        transactionType
-    }
-}
\ No newline at end of file
+  return {
+    amountToSell,
+    minToRecieve,
+    transactionType,
+  };
+};
diff --git a/src/providers/hive-trade/hiveTrade.ts b/src/providers/hive-trade/hiveTrade.ts
index 2cc95bf52..073b670df 100644
--- a/src/providers/hive-trade/hiveTrade.ts
+++ b/src/providers/hive-trade/hiveTrade.ts
@@ -1,184 +1,168 @@
 import { PrivateKey } from '@esteemapp/dhive';
-import { getAnyPrivateKey, getDigitPinCode, getMarketStatistics, sendHiveOperations } from '../hive/dhive';
-import { MarketAsset, MarketStatistics, OrderIdPrefix, SwapOptions, TransactionType } from './hiveTrade.types';
-import bugsnapInstance from '../../config/bugsnag';
 import { Operation } from '@hiveio/dhive';
+import {
+  getAnyPrivateKey,
+  getDigitPinCode,
+  getMarketStatistics,
+  sendHiveOperations,
+} from '../hive/dhive';
+import {
+  MarketAsset,
+  MarketStatistics,
+  OrderIdPrefix,
+  SwapOptions,
+  TransactionType,
+} from './hiveTrade.types';
+import bugsnapInstance from '../../config/bugsnag';
 import { convertSwapOptionsToLimitOrder } from './converters';
 
-
-//This operation creates a limit order and matches it against existing open orders. 
-//The maximum expiration time for any limit order is 28 days from head_block_time()
+// This operation creates a limit order and matches it against existing open orders.
+// The maximum expiration time for any limit order is 28 days from head_block_time()
 export const limitOrderCreate = (
-    currentAccount: any,
-    pinHash: string,
-    amountToSell: number,
-    minToReceive: number,
-    orderType: TransactionType,
-    idPrefix = OrderIdPrefix.EMPTY) => {
+  currentAccount: any,
+  pinHash: string,
+  amountToSell: number,
+  minToReceive: number,
+  orderType: TransactionType,
+  idPrefix = OrderIdPrefix.EMPTY,
+) => {
+  const digitPinCode = getDigitPinCode(pinHash);
+  const key = getAnyPrivateKey(
+    {
+      activeKey: currentAccount?.local?.activeKey,
+    },
+    digitPinCode,
+  );
 
+  if (key) {
+    const privateKey = PrivateKey.fromString(key);
 
-    const digitPinCode = getDigitPinCode(pinHash);
-    const key = getAnyPrivateKey(
-        {
-            activeKey: currentAccount?.local?.activeKey,
-        },
-        digitPinCode,
-    );
-
-    if (key) {
-        const privateKey = PrivateKey.fromString(key);
-
-        let expiration: any = new Date(Date.now());
-        expiration.setDate(expiration.getDate() + 27);
-        expiration = expiration.toISOString().split(".")[0];
-
-        const data = getLimitOrderCreateOpData(currentAccount.username, amountToSell, minToReceive, orderType, idPrefix);
-
-        const args: Operation[] = [
-            [
-                'limit_order_create',
-                data
-            ],
-        ];
-
-        return new Promise((resolve, reject) => {
-            sendHiveOperations(args, privateKey)
-                .then((result) => {
-                    if (result) {
-                        resolve(result);
-                    }
-                })
-                .catch((err) => {
-                    bugsnapInstance.notify(err);
-                    reject(err);
-                });
-        });
-    }
-
-    return Promise.reject(
-        new Error('Check private key permission! Required private active key or above.'),
-    );
-};
-
-
-
-export const generateHsLimitOrderCreatePath = (
-    currentAccount: any,
-    amountToSell: number,
-    minToReceive: number,
-    orderType: TransactionType,
-    idPrefix = OrderIdPrefix.EMPTY) => {
-
-    const data = getLimitOrderCreateOpData(currentAccount.username, amountToSell, minToReceive, orderType, idPrefix)
-
-    const query = new URLSearchParams(data).toString()
-
-    return `sign/limitOrderCreate?${query}`
-
-}
-
-
-
-export const generateHsSwapTokenPath = (
-    currentAccount: any,
-    data: SwapOptions) => {
-
-    const {
-        amountToSell,
-        minToRecieve,
-        transactionType
-    } = convertSwapOptionsToLimitOrder(data)
-
-    return generateHsLimitOrderCreatePath(
-        currentAccount,
-        amountToSell,
-        minToRecieve,
-        transactionType,
-        OrderIdPrefix.SWAP
-    )
-}
-
-
-
-
-export const swapToken = async (
-    currentAccount: any,
-    pinHash: string,
-    data: SwapOptions) => {
-
-    try {
-        const {
-            amountToSell,
-            minToRecieve,
-            transactionType
-        } = convertSwapOptionsToLimitOrder(data)
-
-
-        await limitOrderCreate(
-            currentAccount,
-            pinHash,
-            amountToSell,
-            minToRecieve,
-            transactionType,
-            OrderIdPrefix.SWAP
-        )
-    }
-    catch (err) {
-        console.warn("Failed to swap token", err)
-        throw err;
-    }
-}
-
-
-
-export const fetchHiveMarketRate = async (asset: MarketAsset): Promise<number> => {
-
-    try {
-        const market: MarketStatistics = await getMarketStatistics();
-        const _lowestAsk = Number(market?.lowest_ask);
-
-        if (!_lowestAsk) {
-            throw new Error("Invalid market lowest ask")
-        }
-
-        switch (asset) {
-            case MarketAsset.HIVE:
-                return _lowestAsk
-            case MarketAsset.HBD:
-                return 1 / _lowestAsk;
-            default:
-                return 0;
-        }
-
-    } catch (err) {
-        console.warn("failed to get hive market rate");
-        bugsnapInstance.notify(err);
-        throw err;
-    }
-}
-
-
-const getLimitOrderCreateOpData = (username, amountToSell, minToReceive, orderType, idPrefix) => {
     let expiration: any = new Date(Date.now());
     expiration.setDate(expiration.getDate() + 27);
-    expiration = expiration.toISOString().split(".")[0];
+    expiration = expiration.toISOString().split('.')[0];
 
-    return {
-        owner: username,
-        orderid: Number(
-            `${idPrefix}${Math.floor(Date.now() / 1000)
-                .toString()
-                .slice(2)}`
-        ),
-        amount_to_sell: `${orderType === TransactionType.Buy
-            ? amountToSell.toFixed(3)
-            : minToReceive.toFixed(3)
-            } ${orderType === TransactionType.Buy ? MarketAsset.HBD : MarketAsset.HIVE}`,
-        min_to_receive: `${orderType === TransactionType.Buy
-            ? minToReceive.toFixed(3)
-            : amountToSell.toFixed(3)
-            } ${orderType === TransactionType.Buy ? MarketAsset.HIVE : MarketAsset.HBD}`,
-        fill_or_kill: false,
-        expiration: expiration
+    const data = getLimitOrderCreateOpData(
+      currentAccount.username,
+      amountToSell,
+      minToReceive,
+      orderType,
+      idPrefix,
+    );
+
+    const args: Operation[] = [['limit_order_create', data]];
+
+    return new Promise((resolve, reject) => {
+      sendHiveOperations(args, privateKey)
+        .then((result) => {
+          if (result) {
+            resolve(result);
+          }
+        })
+        .catch((err) => {
+          bugsnapInstance.notify(err);
+          reject(err);
+        });
+    });
+  }
+
+  return Promise.reject(
+    new Error('Check private key permission! Required private active key or above.'),
+  );
+};
+
+export const generateHsLimitOrderCreatePath = (
+  currentAccount: any,
+  amountToSell: number,
+  minToReceive: number,
+  orderType: TransactionType,
+  idPrefix = OrderIdPrefix.EMPTY,
+) => {
+  const data = getLimitOrderCreateOpData(
+    currentAccount.username,
+    amountToSell,
+    minToReceive,
+    orderType,
+    idPrefix,
+  );
+
+  const query = new URLSearchParams(data).toString();
+
+  return `sign/limitOrderCreate?${query}`;
+};
+
+export const generateHsSwapTokenPath = (currentAccount: any, data: SwapOptions) => {
+  const { amountToSell, minToRecieve, transactionType } = convertSwapOptionsToLimitOrder(data);
+
+  return generateHsLimitOrderCreatePath(
+    currentAccount,
+    amountToSell,
+    minToRecieve,
+    transactionType,
+    OrderIdPrefix.SWAP,
+  );
+};
+
+export const swapToken = async (currentAccount: any, pinHash: string, data: SwapOptions) => {
+  try {
+    const { amountToSell, minToRecieve, transactionType } = convertSwapOptionsToLimitOrder(data);
+
+    await limitOrderCreate(
+      currentAccount,
+      pinHash,
+      amountToSell,
+      minToRecieve,
+      transactionType,
+      OrderIdPrefix.SWAP,
+    );
+  } catch (err) {
+    console.warn('Failed to swap token', err);
+    throw err;
+  }
+};
+
+export const fetchHiveMarketRate = async (asset: MarketAsset): Promise<number> => {
+  try {
+    const market: MarketStatistics = await getMarketStatistics();
+    const _lowestAsk = Number(market?.lowest_ask);
+
+    if (!_lowestAsk) {
+      throw new Error('Invalid market lowest ask');
     }
-}
\ No newline at end of file
+
+    switch (asset) {
+      case MarketAsset.HIVE:
+        return _lowestAsk;
+      case MarketAsset.HBD:
+        return 1 / _lowestAsk;
+      default:
+        return 0;
+    }
+  } catch (err) {
+    console.warn('failed to get hive market rate');
+    bugsnapInstance.notify(err);
+    throw err;
+  }
+};
+
+const getLimitOrderCreateOpData = (username, amountToSell, minToReceive, orderType, idPrefix) => {
+  let expiration: any = new Date(Date.now());
+  expiration.setDate(expiration.getDate() + 27);
+  expiration = expiration.toISOString().split('.')[0];
+
+  return {
+    owner: username,
+    orderid: Number(
+      `${idPrefix}${Math.floor(Date.now() / 1000)
+        .toString()
+        .slice(2)}`,
+    ),
+    amount_to_sell: `${
+      orderType === TransactionType.Buy ? amountToSell.toFixed(3) : minToReceive.toFixed(3)
+    } ${orderType === TransactionType.Buy ? MarketAsset.HBD : MarketAsset.HIVE}`,
+    min_to_receive: `${
+      orderType === TransactionType.Buy ? minToReceive.toFixed(3) : amountToSell.toFixed(3)
+    } ${orderType === TransactionType.Buy ? MarketAsset.HIVE : MarketAsset.HBD}`,
+    fill_or_kill: false,
+    expiration,
+  };
+};
diff --git a/src/providers/hive-trade/hiveTrade.types.ts b/src/providers/hive-trade/hiveTrade.types.ts
index e8d5fd42e..6486cbbb1 100644
--- a/src/providers/hive-trade/hiveTrade.types.ts
+++ b/src/providers/hive-trade/hiveTrade.types.ts
@@ -1,44 +1,42 @@
 export enum TransactionType {
-    None = 0,
-    Sell = 2,
-    Buy = 1,
-    Cancel = 3
+  None = 0,
+  Sell = 2,
+  Buy = 1,
+  Cancel = 3,
 }
 
 export enum OrderIdPrefix {
-    EMPTY = "",
-    SWAP = "9"
+  EMPTY = '',
+  SWAP = '9',
 }
 
 export enum MarketAsset {
-    HIVE = "HIVE",
-    HBD = "HBD"
+  HIVE = 'HIVE',
+  HBD = 'HBD',
 }
 
-
 export interface SwapOptions {
-    fromAsset: MarketAsset;
-    fromAmount: number;
-    toAmount: number;
+  fromAsset: MarketAsset;
+  fromAmount: number;
+  toAmount: number;
 }
 
 export interface MarketStatistics {
-    hbd_volume: string;
-    highest_bid: string;
-    hive_volume: string;
-    latest: string;
-    lowest_ask: string;
-    percent_change: string;
+  hbd_volume: string;
+  highest_bid: string;
+  hive_volume: string;
+  latest: string;
+  lowest_ask: string;
+  percent_change: string;
 }
 
-
 export interface OrdersDataItem {
-    created: string;
-    hbd: number;
-    hive: number;
-    order_price: {
-      base: string;
-      quote: string;
-    };
-    real_price: string;
-  }
\ No newline at end of file
+  created: string;
+  hbd: number;
+  hive: number;
+  order_price: {
+    base: string;
+    quote: string;
+  };
+  real_price: string;
+}
diff --git a/src/providers/hive/dhive.js b/src/providers/hive/dhive.js
index 1f63116b5..872df9153 100644
--- a/src/providers/hive/dhive.js
+++ b/src/providers/hive/dhive.js
@@ -175,10 +175,10 @@ export const getDynamicGlobalProperties = () => client.database.getDynamicGlobal
 
 export const getRewardFund = () => client.database.call('get_reward_fund', ['post']);
 
-export const getMarketStatistics = () => client.call("condenser_api", "get_ticker", []);
+export const getMarketStatistics = () => client.call('condenser_api', 'get_ticker', []);
 
 export const getOrderBook = (limit = 500) =>
-  client.call("condenser_api", "get_order_book", [limit]);
+  client.call('condenser_api', 'get_order_book', [limit]);
 
 export const getFeedHistory = async () => {
   try {
diff --git a/src/providers/queries/walletQueries/walletQueries.ts b/src/providers/queries/walletQueries/walletQueries.ts
index c2683be54..0ad9a6d19 100644
--- a/src/providers/queries/walletQueries/walletQueries.ts
+++ b/src/providers/queries/walletQueries/walletQueries.ts
@@ -254,9 +254,6 @@ export const useClaimRewardsMutation = () => {
   };
 };
 
-
-
-
 export const useActivitiesQuery = (assetId: string) => {
   const currentAccount = useAppSelector((state) => state.account.currentAccount);
   const globalProps = useAppSelector((state) => state.account.globalProps);
@@ -278,7 +275,7 @@ export const useActivitiesQuery = (assetId: string) => {
       globalProps,
       startIndex: pageParam,
       limit: ACTIVITIES_FETCH_LIMIT,
-      isEngine: assetData.isEngine
+      isEngine: assetData.isEngine,
     });
 
     console.log('new page fetched', _activites);
@@ -320,7 +317,7 @@ export const useActivitiesQuery = (assetId: string) => {
       return;
     }
 
-    if (assetData.isEngine) { 
+    if (assetData.isEngine) {
       pageParams.push(pageParams.length);
       setPageParams([...pageParams]);
     } else {
@@ -330,7 +327,6 @@ export const useActivitiesQuery = (assetId: string) => {
         setPageParams([...pageParams]);
       }
     }
-
   };
 
   const _data = useMemo(() => {
@@ -347,9 +343,6 @@ export const useActivitiesQuery = (assetId: string) => {
   };
 };
 
-
-
-
 export const usePendingRequestsQuery = (assetId: string) => {
   const currentAccount = useAppSelector((state) => state.account.currentAccount);
   const selectedCoins = useAppSelector((state) => state.wallet.selectedCoins);
diff --git a/src/redux/actions/applicationActions.ts b/src/redux/actions/applicationActions.ts
index a8cac4272..a78bade90 100644
--- a/src/redux/actions/applicationActions.ts
+++ b/src/redux/actions/applicationActions.ts
@@ -165,14 +165,13 @@ export const isDefaultFooter = (payload) => ({
  */
 export const setCurrency = (currency) => async (dispatch) => {
   const currencySymbol = getSymbolFromCurrency(currency);
-  
+
   let currencyRate = 1;
-  if(currency !== 'usd'){
-    const _usdRate = await getFiatHbdRate('usd')
+  if (currency !== 'usd') {
+    const _usdRate = await getFiatHbdRate('usd');
     const _fiatRate = await getFiatHbdRate(currency);
     currencyRate = _fiatRate / _usdRate;
   }
-  
 
   dispatch({
     type: SET_CURRENCY,
@@ -180,7 +179,6 @@ export const setCurrency = (currency) => async (dispatch) => {
   });
 };
 
-
 export const setPinCode = (data) => ({
   type: SET_PIN_CODE,
   payload: data,
diff --git a/src/screens/application/hook/useInitApplication.tsx b/src/screens/application/hook/useInitApplication.tsx
index c9caf8f4b..f9d5145f1 100644
--- a/src/screens/application/hook/useInitApplication.tsx
+++ b/src/screens/application/hook/useInitApplication.tsx
@@ -13,6 +13,7 @@ import notifee, { EventType } from '@notifee/react-native';
 import { isEmpty, some, get } from 'lodash';
 import messaging from '@react-native-firebase/messaging';
 import BackgroundTimer from 'react-native-background-timer';
+import FastImage from 'react-native-fast-image';
 import { useAppDispatch, useAppSelector } from '../../../hooks';
 import { setDeviceOrientation, setLockedOrientation } from '../../../redux/actions/uiAction';
 import { orientations } from '../../../redux/constants/orientationsConstants';
@@ -26,11 +27,12 @@ import { markNotifications } from '../../../providers/ecency/ecency';
 import { updateUnreadActivityCount } from '../../../redux/actions/accountAction';
 import RootNavigation from '../../../navigation/rootNavigation';
 import ROUTES from '../../../constants/routeNames';
-import FastImage from 'react-native-fast-image';
 
 export const useInitApplication = () => {
   const dispatch = useAppDispatch();
-  const { isDarkTheme, colorTheme, isPinCodeOpen, currency } = useAppSelector((state) => state.application);
+  const { isDarkTheme, colorTheme, isPinCodeOpen, currency } = useAppSelector(
+    (state) => state.application,
+  );
 
   const systemColorScheme = useColorScheme();
 
@@ -74,7 +76,7 @@ export const useInitApplication = () => {
 
     userActivityMutation.lazyMutatePendingActivities();
 
-    //update fiat currency rate usd:fiat
+    // update fiat currency rate usd:fiat
     dispatch(setCurrency(currency.currency));
 
     _initPushListener();
diff --git a/src/screens/assetDetails/screen/assetDetailsScreen.tsx b/src/screens/assetDetails/screen/assetDetailsScreen.tsx
index 2e2e1b0c1..ed24e6409 100644
--- a/src/screens/assetDetails/screen/assetDetailsScreen.tsx
+++ b/src/screens/assetDetails/screen/assetDetailsScreen.tsx
@@ -114,10 +114,7 @@ const AssetDetailsScreen = ({ navigation, route }: AssetDetailsScreenProps) => {
         balance: coinData.balance,
         redeemType: transferType === 'dropdown_promote' ? 'promote' : 'boost',
       };
-    } 
-    
-    
-    else {
+    } else {
       let { balance } = coinData;
 
       switch (transferType) {
@@ -142,7 +139,6 @@ const AssetDetailsScreen = ({ navigation, route }: AssetDetailsScreenProps) => {
         case TransferTypes.SWAP_TOKEN:
           navigateTo = ROUTES.SCREENS.TRADE;
           break;
-
       }
 
       navigateParams = {
diff --git a/src/screens/trade/children/assetChangeBtn.tsx b/src/screens/trade/children/assetChangeBtn.tsx
index 1c3a3677c..85f2b9b9f 100644
--- a/src/screens/trade/children/assetChangeBtn.tsx
+++ b/src/screens/trade/children/assetChangeBtn.tsx
@@ -1,30 +1,27 @@
 import React from 'react';
-import { View } from "react-native";
+import { View } from 'react-native';
+import EStyleSheet from 'react-native-extended-stylesheet';
 import styles from '../styles/assetChangeBtn.styles';
 import { IconButton } from '../../../components';
-import EStyleSheet from 'react-native-extended-stylesheet';
-
 
 interface Props {
-    onPress:()=>void;
+  onPress: () => void;
 }
 
 // Reusable component for label, text input, and bottom text
-export const AssetChangeBtn = ({onPress}:Props) => {
-
-    return (
-        <View style={styles.changeBtnContainer} pointerEvents='box-none'>
-        <View style={styles.changeBtn}>
-          <IconButton
-            style={styles.changeBtnSize}
-            color={EStyleSheet.value('$primaryBlue')}
-            iconType="MaterialIcons"
-            name="swap-vert"
-            onPress={onPress}
-            size={44}
-          />
-        </View>
+export const AssetChangeBtn = ({ onPress }: Props) => {
+  return (
+    <View style={styles.changeBtnContainer} pointerEvents="box-none">
+      <View style={styles.changeBtn}>
+        <IconButton
+          style={styles.changeBtnSize}
+          color={EStyleSheet.value('$primaryBlue')}
+          iconType="MaterialIcons"
+          name="swap-vert"
+          onPress={onPress}
+          size={44}
+        />
       </View>
-  
-    );
-};
\ No newline at end of file
+    </View>
+  );
+};
diff --git a/src/screens/trade/children/errorSection.tsx b/src/screens/trade/children/errorSection.tsx
index 8c9ee1419..36f683611 100644
--- a/src/screens/trade/children/errorSection.tsx
+++ b/src/screens/trade/children/errorSection.tsx
@@ -1,30 +1,28 @@
 import React from 'react';
-import { View, Text } from "react-native";
+import { View, Text } from 'react-native';
+import EStyleSheet from 'react-native-extended-stylesheet';
 import styles from '../styles/errorSection.styles';
 import { Icon } from '../../../components';
-import EStyleSheet from 'react-native-extended-stylesheet';
-
 
 interface Props {
-    message:string|null;
+  message: string | null;
 }
 
 // Reusable component for label, text input, and bottom text
-export const ErrorSection = ({message}:Props) => {
+export const ErrorSection = ({ message }: Props) => {
+  if (!message) {
+    return null;
+  }
 
-    if(!message){
-        return null;
-    }
-
-    return (
-        <View style={styles.container} >
-            <Text style={styles.label}>{message}</Text>
-            <Icon
-             iconType="MaterialIcons"
-             name={'error'}
-             color={EStyleSheet.value('$pureWhite')}
-             size={24}
-            />
-        </View>
-    );
-};
\ No newline at end of file
+  return (
+    <View style={styles.container}>
+      <Text style={styles.label}>{message}</Text>
+      <Icon
+        iconType="MaterialIcons"
+        name="error"
+        color={EStyleSheet.value('$pureWhite')}
+        size={24}
+      />
+    </View>
+  );
+};
diff --git a/src/screens/trade/children/index.ts b/src/screens/trade/children/index.ts
index 3fb1ce428..8de589d0b 100644
--- a/src/screens/trade/children/index.ts
+++ b/src/screens/trade/children/index.ts
@@ -1,5 +1,5 @@
-export * from './swapTokenContent'
+export * from './swapTokenContent';
 export * from './swapAmountInput';
 export * from './swapFeeSection';
 export * from './errorSection';
-export * from './assetChangeBtn';
\ No newline at end of file
+export * from './assetChangeBtn';
diff --git a/src/screens/trade/children/swapAmountInput.tsx b/src/screens/trade/children/swapAmountInput.tsx
index 051bd682c..677b55565 100644
--- a/src/screens/trade/children/swapAmountInput.tsx
+++ b/src/screens/trade/children/swapAmountInput.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { View, TextInput, Text } from "react-native";
+import { View, TextInput, Text } from 'react-native';
 import styles from '../styles/swapAmountInput.styles';
 import { useAppSelector } from '../../../hooks';
 import { formatNumberInputStr } from '../../../utils/number';
@@ -13,32 +13,33 @@ interface SwapInputProps {
   disabled?: boolean;
 }
 
-
-
 // Reusable component for label, text input, and bottom text
-export const SwapAmountInput = ({ label, onChangeText, value, fiatPrice, symbol }: SwapInputProps) => {
-
+export const SwapAmountInput = ({
+  label,
+  onChangeText,
+  value,
+  fiatPrice,
+  symbol,
+}: SwapInputProps) => {
   const currency = useAppSelector((state) => state.application.currency);
 
   const _fiatValue = ((Number(value) || 0) * fiatPrice).toFixed(3);
 
   const _onChangeText = (text: string) => {
-    if(onChangeText){
-      onChangeText(formatNumberInputStr(text, 3))
+    if (onChangeText) {
+      onChangeText(formatNumberInputStr(text, 3));
     }
-    
-  }
-
+  };
 
   return (
-    <View style={styles.container} >
+    <View style={styles.container}>
       <Text style={styles.label}>{label}</Text>
       <View style={styles.inputContainer}>
         <TextInput
           editable={!!onChangeText}
           onChangeText={_onChangeText}
           value={value}
-          keyboardType='numeric'
+          keyboardType="numeric"
           style={styles.input}
           autoFocus={true}
         />
@@ -49,4 +50,4 @@ export const SwapAmountInput = ({ label, onChangeText, value, fiatPrice, symbol
       <Text style={styles.fiat}>{currency.currencySymbol + _fiatValue}</Text>
     </View>
   );
-};
\ No newline at end of file
+};
diff --git a/src/screens/trade/children/swapFeeSection.tsx b/src/screens/trade/children/swapFeeSection.tsx
index c2404dbdc..073b00c05 100644
--- a/src/screens/trade/children/swapFeeSection.tsx
+++ b/src/screens/trade/children/swapFeeSection.tsx
@@ -1,21 +1,18 @@
 import React from 'react';
-import { View, Text } from "react-native";
-import styles from '../styles/sawpFeeSection.styles';
+import { View, Text } from 'react-native';
 import { useIntl } from 'react-intl';
-
+import styles from '../styles/sawpFeeSection.styles';
 
 // Reusable component for label, text input, and bottom text
 export const SwapFeeSection = () => {
+  const intl = useIntl();
 
-    const intl = useIntl();
-
-    return (
-        <View style={styles.container} >
-            <Text style={styles.label}>{intl.formatMessage({id:'trade.fee'})}</Text>
-            <View style={styles.freeContainer}>
-                <Text style={styles.free}>{intl.formatMessage({id:'trade.free'})}</Text>
-            </View>
-
-        </View>
-    );
-};
\ No newline at end of file
+  return (
+    <View style={styles.container}>
+      <Text style={styles.label}>{intl.formatMessage({ id: 'trade.fee' })}</Text>
+      <View style={styles.freeContainer}>
+        <Text style={styles.free}>{intl.formatMessage({ id: 'trade.free' })}</Text>
+      </View>
+    </View>
+  );
+};
diff --git a/src/screens/trade/children/swapTokenContent.tsx b/src/screens/trade/children/swapTokenContent.tsx
index 8b997660b..078814d31 100644
--- a/src/screens/trade/children/swapTokenContent.tsx
+++ b/src/screens/trade/children/swapTokenContent.tsx
@@ -1,318 +1,303 @@
 import React, { useEffect, useMemo, useState } from 'react';
 import { View, Text, Alert, RefreshControl } from 'react-native';
-import styles from '../styles/tradeScreen.styles';
-import { AssetChangeBtn, ErrorSection, SwapAmountInput, SwapFeeSection } from '../children';
-import { Icon, MainButton } from '../../../components';
 import { useIntl } from 'react-intl';
-import { fetchHiveMarketRate, generateHsSwapTokenPath, swapToken } from '../../../providers/hive-trade/hiveTrade';
+import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
+import EStyleSheet from 'react-native-extended-stylesheet';
+import { useNavigation } from '@react-navigation/native';
+import styles from '../styles/tradeScreen.styles';
+import { AssetChangeBtn, ErrorSection, SwapAmountInput, SwapFeeSection } from '.';
+import { Icon, MainButton } from '../../../components';
+import {
+  fetchHiveMarketRate,
+  generateHsSwapTokenPath,
+  swapToken,
+} from '../../../providers/hive-trade/hiveTrade';
 import { useAppDispatch, useAppSelector } from '../../../hooks';
 import { MarketAsset, SwapOptions } from '../../../providers/hive-trade/hiveTrade.types';
 import { ASSET_IDS } from '../../../constants/defaultAssets';
 import { showActionModal } from '../../../redux/actions/uiAction';
 import { walletQueries } from '../../../providers/queries';
-import { useSwapCalculator } from '../children/useSwapCalculator';
-import { KeyboardAwareScrollView } from 'react-native-keyboard-aware-scroll-view';
-import EStyleSheet from 'react-native-extended-stylesheet';
-import { useNavigation } from '@react-navigation/native';
+import { useSwapCalculator } from './useSwapCalculator';
 import AUTH_TYPE from '../../../constants/authType';
 import { delay } from '../../../utils/editor';
 
-
 interface Props {
-    initialSymbol: MarketAsset,
-    handleHsTransfer: (hsSignPath: string) => void,
-    onSuccess: () => void
+  initialSymbol: MarketAsset;
+  handleHsTransfer: (hsSignPath: string) => void;
+  onSuccess: () => void;
 }
 
-
 export const SwapTokenContent = ({ initialSymbol, handleHsTransfer, onSuccess }: Props) => {
+  const intl = useIntl();
+  const dispatch = useAppDispatch();
+  const navigation = useNavigation();
 
-    const intl = useIntl();
-    const dispatch = useAppDispatch();
-    const navigation = useNavigation();
+  // queres
+  const assetsQuery = walletQueries.useAssetsQuery();
 
-    //queres
-    const assetsQuery = walletQueries.useAssetsQuery();
+  const currentAccount = useAppSelector((state) => state.account.currentAccount);
+  const currency = useAppSelector((state) => state.application.currency);
 
-    const currentAccount = useAppSelector(state => state.account.currentAccount)
-    const currency = useAppSelector((state) => state.application.currency);
+  const assetsData = useAppSelector((state) => state.wallet.coinsData);
+  const pinHash = useAppSelector((state) => state.application.pin);
+  const isDarkTheme = useAppSelector((state) => state.application.isDarkTheme);
 
-    const assetsData = useAppSelector(state => state.wallet.coinsData);
-    const pinHash = useAppSelector(state => state.application.pin);
-    const isDarkTheme = useAppSelector(state => state.application.isDarkTheme);
+  const [fromAssetSymbol, setFromAssetSymbol] = useState(initialSymbol || MarketAsset.HIVE);
+  const [marketPrice, setMarketPrice] = useState(0);
+  const [isMoreThanBalance, setIsMoreThanBalance] = useState(false);
 
+  const [loading, setLoading] = useState(false);
+  const [swapping, setSwapping] = useState(false);
+  const [fromAmount, setFromAmount] = useState('0');
 
-    const [fromAssetSymbol, setFromAssetSymbol] = useState(initialSymbol || MarketAsset.HIVE);
-    const [marketPrice, setMarketPrice] = useState(0);
-    const [isMoreThanBalance, setIsMoreThanBalance] = useState(false);
+  const _toAssetSymbol = useMemo(
+    () => (fromAssetSymbol === MarketAsset.HBD ? MarketAsset.HIVE : MarketAsset.HBD),
+    [fromAssetSymbol],
+  );
 
-    const [loading, setLoading] = useState(false);
-    const [swapping, setSwapping] = useState(false);
-    const [fromAmount, setFromAmount] = useState('0');
+  // this method makes sure amount is only updated when new order book is fetched after asset change
+  // this avoid wrong from and to swap value on changing source asset
+  const _onAssetChangeComplete = () => {
+    setFromAmount(_toAmountStr);
+  };
 
-    const _toAssetSymbol = useMemo(() => fromAssetSymbol === MarketAsset.HBD ? MarketAsset.HIVE : MarketAsset.HBD, [fromAssetSymbol])
+  const {
+    toAmount,
+    offerUnavailable,
+    tooMuchSlippage,
+    isLoading: _isFetchingOrders,
+  } = useSwapCalculator(fromAssetSymbol, Number(fromAmount) || 0, _onAssetChangeComplete);
 
-
-    //this method makes sure amount is only updated when new order book is fetched after asset change
-    //this avoid wrong from and to swap value on changing source asset
-    const _onAssetChangeComplete = () => {
-        setFromAmount(_toAmountStr);
+  const _errorMessage = useMemo(() => {
+    let msg = '';
+    if (isMoreThanBalance) {
+      msg += `${intl.formatMessage({ id: 'trade.more-than-balance' })}\n`;
     }
-
-    const {
-        toAmount,
-        offerUnavailable,
-        tooMuchSlippage,
-        isLoading: _isFetchingOrders
-    } = useSwapCalculator(fromAssetSymbol, Number(fromAmount) || 0, _onAssetChangeComplete);
-
-
-    const _errorMessage = useMemo(() => {
-        let msg = '';
-        if (isMoreThanBalance) {
-            msg += intl.formatMessage({ id: 'trade.more-than-balance' }) + '\n';
-        }
-        if (offerUnavailable) {
-            msg += intl.formatMessage({ id: 'trade.offer-unavailable' }) + '\n';
-        }
-        if (tooMuchSlippage) {
-            msg += intl.formatMessage({ id: 'trade.too-much-slippage' }) + '\n';
-        }
-        return msg.trim();
-    }, [tooMuchSlippage, offerUnavailable, isMoreThanBalance])
-
-
-    //accumulate asset data properties
-    const _fromAssetData = assetsData[fromAssetSymbol === MarketAsset.HBD ? ASSET_IDS.HBD : ASSET_IDS.HIVE];
-    const _balance = _fromAssetData.balance;
-    const _fromFiatPrice = _fromAssetData.currentPrice;
-    const _toFiatPrice = assetsData[_toAssetSymbol === MarketAsset.HBD ? ASSET_IDS.HBD : ASSET_IDS.HIVE].currentPrice
-    const _marketFiatPrice = marketPrice * _toFiatPrice;
-
-    const _toAmountStr = toAmount.toFixed(3);
-
-
-
-    //initialize market data
-    useEffect(() => {
-        _fetchMarketRate();
-    }, [fromAssetSymbol])
-
-
-    //post process updated amount value
-    useEffect(() => {
-        const _value = Number(fromAmount);
-        //check for amount validity
-        setIsMoreThanBalance(_value > _balance)
-    }, [fromAmount])
-
-
-    //fetches and sets market rate based on selected assetew
-    const _fetchMarketRate = async () => {
-        try {
-            setLoading(true)
-
-            //TODO: update marketPrice
-            const _marketPrice = await fetchHiveMarketRate(fromAssetSymbol)
-            setMarketPrice(_marketPrice);
-
-            setLoading(false)
-        } catch (err) {
-            Alert.alert("fail", err.message)
-        }
-
+    if (offerUnavailable) {
+      msg += `${intl.formatMessage({ id: 'trade.offer-unavailable' })}\n`;
     }
-
-
-    const _reset = () => {
-        setFromAmount('0');
+    if (tooMuchSlippage) {
+      msg += `${intl.formatMessage({ id: 'trade.too-much-slippage' })}\n`;
     }
+    return msg.trim();
+  }, [tooMuchSlippage, offerUnavailable, isMoreThanBalance]);
 
+  // accumulate asset data properties
+  const _fromAssetData =
+    assetsData[fromAssetSymbol === MarketAsset.HBD ? ASSET_IDS.HBD : ASSET_IDS.HIVE];
+  const _balance = _fromAssetData.balance;
+  const _fromFiatPrice = _fromAssetData.currentPrice;
+  const _toFiatPrice =
+    assetsData[_toAssetSymbol === MarketAsset.HBD ? ASSET_IDS.HBD : ASSET_IDS.HIVE].currentPrice;
+  const _marketFiatPrice = marketPrice * _toFiatPrice;
 
-    const _onSwapSuccess = () => {
+  const _toAmountStr = toAmount.toFixed(3);
 
-        const headerContent = (
-            <View style={{ backgroundColor: EStyleSheet.value('$primaryGreen'), borderRadius: 56, padding: 8 }} >
-                <Icon
-                    style={{ borderWidth: 0 }}
-                    size={64}
-                    color={EStyleSheet.value('$pureWhite')}
-                    name="check"
-                    iconType="MaterialIcons"
-                />
-            </View>
-        )
-        dispatch(showActionModal({
-            headerContent,
-            title: intl.formatMessage({ id: 'trade.swap_successful' }),
-            buttons: [
-                { textId: 'trade.new_swap', onPress: _reset },
-                { textId: 'alert.okay', onPress: () => navigation.goBack() }
-            ]
-        }))
+  // initialize market data
+  useEffect(() => {
+    _fetchMarketRate();
+  }, [fromAssetSymbol]);
+
+  // post process updated amount value
+  useEffect(() => {
+    const _value = Number(fromAmount);
+    // check for amount validity
+    setIsMoreThanBalance(_value > _balance);
+  }, [fromAmount]);
+
+  // fetches and sets market rate based on selected assetew
+  const _fetchMarketRate = async () => {
+    try {
+      setLoading(true);
+
+      // TODO: update marketPrice
+      const _marketPrice = await fetchHiveMarketRate(fromAssetSymbol);
+      setMarketPrice(_marketPrice);
+
+      setLoading(false);
+    } catch (err) {
+      Alert.alert('fail', err.message);
     }
+  };
 
+  const _reset = () => {
+    setFromAmount('0');
+  };
 
-    //initiates swaping action on confirmation
-    const _confirmSwap = async () => {
+  const _onSwapSuccess = () => {
+    const headerContent = (
+      <View
+        style={{
+          backgroundColor: EStyleSheet.value('$primaryGreen'),
+          borderRadius: 56,
+          padding: 8,
+        }}
+      >
+        <Icon
+          style={{ borderWidth: 0 }}
+          size={64}
+          color={EStyleSheet.value('$pureWhite')}
+          name="check"
+          iconType="MaterialIcons"
+        />
+      </View>
+    );
+    dispatch(
+      showActionModal({
+        headerContent,
+        title: intl.formatMessage({ id: 'trade.swap_successful' }),
+        buttons: [
+          { textId: 'trade.new_swap', onPress: _reset },
+          { textId: 'alert.okay', onPress: () => navigation.goBack() },
+        ],
+      }),
+    );
+  };
 
-        const _fromAmount = Number(fromAmount)
-
-        const data: SwapOptions = {
-            fromAsset: fromAssetSymbol,
-            fromAmount: _fromAmount,
-            toAmount: toAmount
-        }
-
-
-        if (currentAccount.local.authType === AUTH_TYPE.STEEM_CONNECT) {
-            await delay(500); //NOTE: it's required to avoid modal mis fire
-            handleHsTransfer(generateHsSwapTokenPath(
-                currentAccount,
-                data
-            ))
-
-        } else {
-            try {
-
-                setSwapping(true)
-
-                await swapToken(
-                    currentAccount,
-                    pinHash,
-                    data
-                )
-
-                onSuccess();
-                setSwapping(false)
-                _onSwapSuccess();
-
-            } catch (err) {
-                Alert.alert('fail', err.message)
-                setSwapping(false)
-            }
-        }
-
-    }
-
-
-    //prompts user to verify swap action;
-    const handleContinue = () => {
-
-        dispatch(showActionModal({
-            title: intl.formatMessage({ id: 'trade.confirm_swap' }),
-            body: intl.formatMessage(
-                { id: 'trade.swap_for' },
-                { fromAmount: `${fromAmount} ${fromAssetSymbol}`, toAmount: `${_toAmountStr} ${_toAssetSymbol}` }),
-            buttons: [
-                { textId: 'alert.cancel', onPress: () => { } },
-                { textId: 'alert.continue', onPress: _confirmSwap }
-            ]
-        }))
+  // initiates swaping action on confirmation
+  const _confirmSwap = async () => {
+    const _fromAmount = Number(fromAmount);
 
+    const data: SwapOptions = {
+      fromAsset: fromAssetSymbol,
+      fromAmount: _fromAmount,
+      toAmount,
     };
 
+    if (currentAccount.local.authType === AUTH_TYPE.STEEM_CONNECT) {
+      await delay(500); // NOTE: it's required to avoid modal mis fire
+      handleHsTransfer(generateHsSwapTokenPath(currentAccount, data));
+    } else {
+      try {
+        setSwapping(true);
 
-    //refreshes wallet data and market rate
-    const _refresh = async () => {
-        setLoading(true);
-        assetsQuery.refetch();
-        _fetchMarketRate();
+        await swapToken(currentAccount, pinHash, data);
+
+        onSuccess();
+        setSwapping(false);
+        _onSwapSuccess();
+      } catch (err) {
+        Alert.alert('fail', err.message);
+        setSwapping(false);
+      }
     }
+  };
 
+  // prompts user to verify swap action;
+  const handleContinue = () => {
+    dispatch(
+      showActionModal({
+        title: intl.formatMessage({ id: 'trade.confirm_swap' }),
+        body: intl.formatMessage(
+          { id: 'trade.swap_for' },
+          {
+            fromAmount: `${fromAmount} ${fromAssetSymbol}`,
+            toAmount: `${_toAmountStr} ${_toAssetSymbol}`,
+          },
+        ),
+        buttons: [
+          { textId: 'alert.cancel', onPress: () => {} },
+          { textId: 'alert.continue', onPress: _confirmSwap },
+        ],
+      }),
+    );
+  };
 
+  // refreshes wallet data and market rate
+  const _refresh = async () => {
+    setLoading(true);
+    assetsQuery.refetch();
+    _fetchMarketRate();
+  };
 
-    const handleAssetChange = () => {
-        setFromAssetSymbol(_toAssetSymbol)
-    }
+  const handleAssetChange = () => {
+    setFromAssetSymbol(_toAssetSymbol);
+  };
 
-    const _disabledContinue = _isFetchingOrders || loading || isMoreThanBalance || offerUnavailable || !Number(fromAmount) || !Number(toAmount)
+  const _disabledContinue =
+    _isFetchingOrders ||
+    loading ||
+    isMoreThanBalance ||
+    offerUnavailable ||
+    !Number(fromAmount) ||
+    !Number(toAmount);
 
+  const _renderBalance = () => (
+    <Text style={styles.balance}>
+      {'Balance: '}
+      <Text
+        style={{ color: EStyleSheet.value('$primaryBlue') }}
+        onPress={() => {
+          setFromAmount(`${_balance}`);
+        }}
+      >
+        {`${_balance} ${fromAssetSymbol}`}
+      </Text>
+    </Text>
+  );
 
-    const _renderBalance = () => (
-        <Text style={styles.balance}>
-            {`Balance: `}
-            <Text
-                style={{ color: EStyleSheet.value('$primaryBlue') }}
-                onPress={() => { setFromAmount(_balance + '') }}>
-                {`${_balance} ${fromAssetSymbol}`}
-            </Text>
-        </Text>
-    )
+  const _renderInputs = () => (
+    <View style={{ flex: 1 }}>
+      <SwapAmountInput
+        label={intl.formatMessage({ id: 'transfer.from' })}
+        onChangeText={setFromAmount}
+        value={fromAmount}
+        symbol={fromAssetSymbol}
+        fiatPrice={_fromFiatPrice}
+      />
 
-    const _renderInputs = () => (
-        <View style={{ flex: 1 }}>
+      <SwapAmountInput
+        label={intl.formatMessage({ id: 'transfer.to' })}
+        value={_toAmountStr}
+        symbol={_toAssetSymbol}
+        fiatPrice={_toFiatPrice}
+      />
+      <AssetChangeBtn onPress={handleAssetChange} />
+    </View>
+  );
 
-            <SwapAmountInput
-                label={intl.formatMessage({ id: 'transfer.from' })}
-                onChangeText={setFromAmount}
-                value={fromAmount}
-                symbol={fromAssetSymbol}
-                fiatPrice={_fromFiatPrice}
-            />
+  const _renderMainBtn = () => (
+    <View style={styles.mainBtnContainer}>
+      <MainButton
+        style={styles.mainBtn}
+        isDisable={_disabledContinue}
+        onPress={handleContinue}
+        isLoading={swapping}
+      >
+        <Text style={styles.buttonText}>{intl.formatMessage({ id: 'transfer.next' })}</Text>
+      </MainButton>
+    </View>
+  );
 
-            <SwapAmountInput
-                label={intl.formatMessage({ id: 'transfer.to' })}
-                value={_toAmountStr}
-                symbol={_toAssetSymbol}
-                fiatPrice={_toFiatPrice}
-            />
-            <AssetChangeBtn onPress={handleAssetChange} />
+  const _renderMarketPrice = () => (
+    <Text style={styles.marketRate}>
+      {`1 ${fromAssetSymbol} = ${marketPrice.toFixed(3)} ` +
+        `${_toAssetSymbol} (${currency.currencySymbol + _marketFiatPrice.toFixed(3)})`}
+    </Text>
+  );
 
-        </View>
-    )
-
-
-    const _renderMainBtn = () => (
-        <View style={styles.mainBtnContainer}>
-            <MainButton
-                style={styles.mainBtn}
-                isDisable={_disabledContinue}
-                onPress={handleContinue}
-                isLoading={swapping}
-            >
-                <Text style={styles.buttonText}>{intl.formatMessage({ id: 'transfer.next' })}</Text>
-            </MainButton>
-        </View>
-    )
-
-
-    const _renderMarketPrice = () => (
-        <Text style={styles.marketRate}>
-            {
-                `1 ${fromAssetSymbol} = ${marketPrice.toFixed(3)} `
-                + `${_toAssetSymbol} (${currency.currencySymbol + _marketFiatPrice.toFixed(3)})`
-            }
-        </Text>
-    )
-
-
-
-    return (
-        <KeyboardAwareScrollView style={styles.container} refreshControl={
-            <RefreshControl
-                refreshing={loading}
-                onRefresh={_refresh}
-                progressBackgroundColor="#357CE6"
-                tintColor={!isDarkTheme ? '#357ce6' : '#96c0ff'}
-                titleColor="#fff"
-                colors={['#fff']}
-            />
-        }>
-
-            {_renderBalance()}
-            {_renderInputs()}
-            {_renderMarketPrice()}
-
-            <SwapFeeSection />
-            <ErrorSection message={_errorMessage} />
-
-            {_renderMainBtn()}
-
-
-        </KeyboardAwareScrollView>
-
-    )
+  return (
+    <KeyboardAwareScrollView
+      style={styles.container}
+      refreshControl={
+        <RefreshControl
+          refreshing={loading}
+          onRefresh={_refresh}
+          progressBackgroundColor="#357CE6"
+          tintColor={!isDarkTheme ? '#357ce6' : '#96c0ff'}
+          titleColor="#fff"
+          colors={['#fff']}
+        />
+      }
+    >
+      {_renderBalance()}
+      {_renderInputs()}
+      {_renderMarketPrice()}
 
+      <SwapFeeSection />
+      <ErrorSection message={_errorMessage} />
 
+      {_renderMainBtn()}
+    </KeyboardAwareScrollView>
+  );
 };
diff --git a/src/screens/trade/screen/tradeScreen.tsx b/src/screens/trade/screen/tradeScreen.tsx
index 559968c55..992d1e220 100644
--- a/src/screens/trade/screen/tradeScreen.tsx
+++ b/src/screens/trade/screen/tradeScreen.tsx
@@ -1,18 +1,17 @@
 import React, { useState } from 'react';
 import { View } from 'react-native';
+import { useIntl } from 'react-intl';
+import WebView from 'react-native-webview';
+import { useDispatch } from 'react-redux';
 import styles from '../styles/tradeScreen.styles';
-import {SwapTokenContent } from '../children';
+import { SwapTokenContent } from '../children';
 import { BasicHeader, Modal } from '../../../components';
 
 import TransferTypes from '../../../constants/transferTypes';
-import { useIntl } from 'react-intl';
 import { hsOptions } from '../../../constants/hsOptions';
-import WebView from 'react-native-webview';
-import { useDispatch } from 'react-redux';
 import { walletQueries } from '../../../providers/queries';
 import { delay } from '../../../utils/editor';
 
-
 const TradeScreen = ({ route, navigation }) => {
   const intl = useIntl();
 
@@ -24,7 +23,6 @@ const TradeScreen = ({ route, navigation }) => {
   const [showHsModal, setShowHsModal] = useState(false);
   const [hsSignPath, setHsSignPath] = useState('');
 
-
   const _delayedRefreshCoinsData = () => {
     setTimeout(() => {
       assetsQuery.refetch();
@@ -35,30 +33,34 @@ const TradeScreen = ({ route, navigation }) => {
     setShowHsModal(false);
     setHsSignPath('');
 
-    await delay(300)
+    await delay(300);
     navigation.goBack();
-  }
+  };
 
   const _onSuccess = () => {
-    _delayedRefreshCoinsData()
-  }
+    _delayedRefreshCoinsData();
+  };
 
+  const _handleHsTransfer = (_hsSignPath: string) => {
+    setHsSignPath(_hsSignPath);
+    setShowHsModal(true);
+  };
 
-  const _handleHsTransfer = (_hsSignPath:string) => {
-    setHsSignPath(_hsSignPath)
-    setShowHsModal(true)
-  }
-
-  let _content:any = null;
-  switch(transferType){
+  let _content: any = null;
+  switch (transferType) {
     case TransferTypes.SWAP_TOKEN:
-      _content = <SwapTokenContent initialSymbol={fundType} handleHsTransfer={_handleHsTransfer} onSuccess={_onSuccess} />
+      _content = (
+        <SwapTokenContent
+          initialSymbol={fundType}
+          handleHsTransfer={_handleHsTransfer}
+          onSuccess={_onSuccess}
+        />
+      );
       break;
 
-    //NOTE: when we add support for different modes of trade, those section will separatly rendered from here.
+    // NOTE: when we add support for different modes of trade, those section will separatly rendered from here.
   }
 
-
   return (
     <View style={styles.container}>
       <BasicHeader title={intl.formatMessage({ id: `trade.${transferType}` })} />
@@ -79,4 +81,4 @@ const TradeScreen = ({ route, navigation }) => {
   );
 };
 
-export default TradeScreen;
\ No newline at end of file
+export default TradeScreen;
diff --git a/src/screens/webBrowser/screen/webBrowserStyles.ts b/src/screens/webBrowser/screen/webBrowserStyles.ts
index d9e6ae154..44af59ea6 100644
--- a/src/screens/webBrowser/screen/webBrowserStyles.ts
+++ b/src/screens/webBrowser/screen/webBrowserStyles.ts
@@ -16,7 +16,7 @@ export default EStyleSheet.create({
     right: 0,
     alignItems: 'center',
   },
-  rightIconContainer:{
-    marginHorizontal:8
-  }
+  rightIconContainer: {
+    marginHorizontal: 8,
+  },
 });
diff --git a/src/utils/number.ts b/src/utils/number.ts
index 50c399ec4..6c8077284 100644
--- a/src/utils/number.ts
+++ b/src/utils/number.ts
@@ -10,22 +10,21 @@ export const countDecimals = (value) => {
   return value.toString().split('.')[1].length || 0;
 };
 
-
 export const stripDecimalPlaces = (value: number, precision: number = 3) => {
   if (!Number(value)) {
     return 0;
   }
 
-  const power = Math.pow(10, precision)
+  const power = Math.pow(10, precision);
 
   return Math.floor(value * power) / power;
-}
+};
 
 export const getDecimalPlaces = (value: number) => {
   const regex = /(?<=\.)\d+/;
   const match = value.toString().match(regex);
   return match ? match[0].length : 0;
-}
+};
 
 export const formatNumberInputStr = (text: string, precision: number = 10) => {
   const _num = parseFloat(text);
@@ -33,17 +32,16 @@ export const formatNumberInputStr = (text: string, precision: number = 10) => {
   if (_num) {
     let _retVal = text;
     if ((text.startsWith('0') && _num >= 1) || text.startsWith('.')) {
-      _retVal = '' + _num;
+      _retVal = `${_num}`;
     }
 
     if (getDecimalPlaces(_num) > precision) {
-      _retVal = '' + stripDecimalPlaces(_num, precision)
+      _retVal = `${stripDecimalPlaces(_num, precision)}`;
     }
     return _retVal;
-  } else if(text === ''){
-    return '0'
+  } else if (text === '') {
+    return '0';
   } else {
     return text;
   }
-
-}
+};
diff --git a/src/utils/strings.ts b/src/utils/strings.ts
index cb69031ff..565f0adbc 100644
--- a/src/utils/strings.ts
+++ b/src/utils/strings.ts
@@ -4,12 +4,12 @@
  * @returns formated human readable string
  */
 
-export const getHumanReadableKeyString = (intlKey:string) => {
-    const words = intlKey.split('_');
-        const capitalizedWords = words.map(word => {
-          const firstLetter = word.charAt(0).toUpperCase();
-          const remainingLetters = word.slice(1).replace(/([A-Z])/g, ' $1');
-          return firstLetter + remainingLetters;
-        })
-        return capitalizedWords.join(' ');
-}
\ No newline at end of file
+export const getHumanReadableKeyString = (intlKey: string) => {
+  const words = intlKey.split('_');
+  const capitalizedWords = words.map((word) => {
+    const firstLetter = word.charAt(0).toUpperCase();
+    const remainingLetters = word.slice(1).replace(/([A-Z])/g, ' $1');
+    return firstLetter + remainingLetters;
+  });
+  return capitalizedWords.join(' ');
+};

From 81fcf14558969bbd8d08c7f5e3f9e54c60be0315 Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Fri, 21 Jul 2023 15:54:03 +0500
Subject: [PATCH 32/37] comma to dot conversion

---
 src/utils/number.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/utils/number.ts b/src/utils/number.ts
index 6c8077284..156229c6f 100644
--- a/src/utils/number.ts
+++ b/src/utils/number.ts
@@ -27,6 +27,10 @@ export const getDecimalPlaces = (value: number) => {
 };
 
 export const formatNumberInputStr = (text: string, precision: number = 10) => {
+  if (text.includes(',')) {
+    text = text.replace(',', '.');
+  }
+  
   const _num = parseFloat(text);
 
   if (_num) {

From 3f6db907582a871eaa16df2d114dcb67d7799cb9 Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Fri, 21 Jul 2023 16:52:07 +0500
Subject: [PATCH 33/37] upated intl strings

---
 src/config/locales/en-US.json                   | 5 +++--
 src/screens/trade/children/swapTokenContent.tsx | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/config/locales/en-US.json b/src/config/locales/en-US.json
index b1f091ad9..528d160a1 100644
--- a/src/config/locales/en-US.json
+++ b/src/config/locales/en-US.json
@@ -576,6 +576,7 @@
     "move": "Move",
     "continue": "Continue",
     "okay":"Okay",
+    "done":"Done",
     "move_question": "Are you sure to move to drafts?",
     "success_shared": "Success! Content submitted!",
     "success_moved": "Moved to draft",
@@ -843,8 +844,8 @@
     "too-much-slippage": "We highly recommend you to reduce amount for better pricing",
     "fee":"Fee",
     "free":"Free",
-    "confirm_swap":"Swap Confirmation!",
-    "swap_for" :"{fromAmount} for {toAmount}",
+    "confirm_swap":"Confirm Swap",
+    "swap_for" :"Swapping {fromAmount} for {toAmount}",
     "swap_successful":"Successfully Swapped!",
     "new_swap":"New Swap"
   },
diff --git a/src/screens/trade/children/swapTokenContent.tsx b/src/screens/trade/children/swapTokenContent.tsx
index 078814d31..a400abebf 100644
--- a/src/screens/trade/children/swapTokenContent.tsx
+++ b/src/screens/trade/children/swapTokenContent.tsx
@@ -148,7 +148,7 @@ export const SwapTokenContent = ({ initialSymbol, handleHsTransfer, onSuccess }:
         title: intl.formatMessage({ id: 'trade.swap_successful' }),
         buttons: [
           { textId: 'trade.new_swap', onPress: _reset },
-          { textId: 'alert.okay', onPress: () => navigation.goBack() },
+          { textId: 'alert.done', onPress: () => navigation.goBack() },
         ],
       }),
     );
@@ -197,7 +197,7 @@ export const SwapTokenContent = ({ initialSymbol, handleHsTransfer, onSuccess }:
         ),
         buttons: [
           { textId: 'alert.cancel', onPress: () => {} },
-          { textId: 'alert.continue', onPress: _confirmSwap },
+          { textId: 'alert.confirm', onPress: _confirmSwap },
         ],
       }),
     );

From fb40a074a5ceb871bdf41ef6e81828d00dc51aa5 Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Fri, 21 Jul 2023 17:35:20 +0500
Subject: [PATCH 34/37] file typo fix

---
 src/screens/trade/children/swapFeeSection.tsx                   | 2 +-
 .../{sawpFeeSection.styles.ts => swapFeeSection.styles.ts}      | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename src/screens/trade/styles/{sawpFeeSection.styles.ts => swapFeeSection.styles.ts} (100%)

diff --git a/src/screens/trade/children/swapFeeSection.tsx b/src/screens/trade/children/swapFeeSection.tsx
index 073b00c05..913fe507f 100644
--- a/src/screens/trade/children/swapFeeSection.tsx
+++ b/src/screens/trade/children/swapFeeSection.tsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { View, Text } from 'react-native';
 import { useIntl } from 'react-intl';
-import styles from '../styles/sawpFeeSection.styles';
+import styles from '../styles/swapFeeSection.styles';
 
 // Reusable component for label, text input, and bottom text
 export const SwapFeeSection = () => {
diff --git a/src/screens/trade/styles/sawpFeeSection.styles.ts b/src/screens/trade/styles/swapFeeSection.styles.ts
similarity index 100%
rename from src/screens/trade/styles/sawpFeeSection.styles.ts
rename to src/screens/trade/styles/swapFeeSection.styles.ts

From f4641e42ccdeb9b31a7f172967fbe93ed24e7d29 Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Fri, 21 Jul 2023 17:43:09 +0500
Subject: [PATCH 35/37] removed fixed param

---
 src/providers/ecency/ecency.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/providers/ecency/ecency.ts b/src/providers/ecency/ecency.ts
index 6fb3436ae..26a0ddc0b 100644
--- a/src/providers/ecency/ecency.ts
+++ b/src/providers/ecency/ecency.ts
@@ -33,7 +33,7 @@ import {
 
 export const getFiatHbdRate = (fiatCode:string) =>
   ecencyApi
-    .get(`/private-api/market-data/${fiatCode}/hbd?fixed=1`)
+    .get(`/private-api/market-data/${fiatCode}/hbd`)
     .then((resp) => resp.data)
     .catch((err) => {
       bugsnagInstance.notify(err);

From d621c774d3773a8c4e81fffcd3746b0e481de42f Mon Sep 17 00:00:00 2001
From: Syed Moazzam Ali <moazzambukhari52@gmail.com>
Date: Tue, 25 Jul 2023 17:20:17 +0500
Subject: [PATCH 36/37] set the value of slider manually

---
 src/components/upvotePopover/container/upvotePopover.tsx | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/components/upvotePopover/container/upvotePopover.tsx b/src/components/upvotePopover/container/upvotePopover.tsx
index 1d66e7548..cf65f2e3e 100644
--- a/src/components/upvotePopover/container/upvotePopover.tsx
+++ b/src/components/upvotePopover/container/upvotePopover.tsx
@@ -50,7 +50,7 @@ import { CacheStatus } from '../../../redux/reducers/cacheReducer';
 import showLoginAlert from '../../../utils/showLoginAlert';
 import { delay } from '../../../utils/editor';
 
-interface Props {}
+interface Props { }
 interface PopoverOptions {
   anchorRect: Rect;
   content: any;
@@ -65,7 +65,7 @@ interface PopoverOptions {
  *
  */
 
-const UpvotePopover = forwardRef(({}: Props, ref) => {
+const UpvotePopover = forwardRef(({ }: Props, ref) => {
   const intl = useIntl();
   const dispatch = useAppDispatch();
 
@@ -237,7 +237,6 @@ const UpvotePopover = forwardRef(({}: Props, ref) => {
           }
         });
     } else {
-      setSliderValue(1);
       setIsDownVoted(false);
     }
   };
@@ -280,7 +279,6 @@ const UpvotePopover = forwardRef(({}: Props, ref) => {
           _onVotingStart ? _onVotingStart(0) : null;
         });
     } else {
-      setSliderValue(1);
       setIsDownVoted(true);
     }
   };

From 5dfdbc63aab046d054bdbd2e2fc105665f8f9d7c Mon Sep 17 00:00:00 2001
From: Nouman Tahir <nouman.hawkdev@gmail.com>
Date: Wed, 9 Aug 2023 12:33:12 +0500
Subject: [PATCH 37/37] react native config package update

---
 ios/Ecency.xcodeproj/project.pbxproj | 388 +++++++++++++--------------
 ios/Podfile.lock                     |  12 +-
 package.json                         |   2 +-
 yarn.lock                            |  15 +-
 4 files changed, 209 insertions(+), 208 deletions(-)

diff --git a/ios/Ecency.xcodeproj/project.pbxproj b/ios/Ecency.xcodeproj/project.pbxproj
index 459ec0316..d775ced01 100644
--- a/ios/Ecency.xcodeproj/project.pbxproj
+++ b/ios/Ecency.xcodeproj/project.pbxproj
@@ -26,12 +26,12 @@
 		2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
 		2DCD954D1E0B4F2C00145EB5 /* EcencyTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* EcencyTests.m */; };
 		2E340255E74B48D8AF5B650C /* Sansation_Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5ADE4B4B75DF437495E202D4 /* Sansation_Regular.ttf */; };
+		31159F09A2AEC018F2A3DBA4 /* libPods-Ecency-EcencyTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2AEEE72F26D37DC0AC8A99C2 /* libPods-Ecency-EcencyTests.a */; };
 		58F9BCC624793C61004F0790 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 58F9BCC224793C61004F0790 /* GoogleService-Info.plist */; };
 		58F9BCC724793C61004F0790 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 58F9BCC224793C61004F0790 /* GoogleService-Info.plist */; };
 		58F9BCC824793C61004F0790 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 58F9BCC224793C61004F0790 /* GoogleService-Info.plist */; };
-		772749BE6C8ACDB061E94A99 /* libPods-Ecency.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 124910ABAAE6F830F25B58F1 /* libPods-Ecency.a */; };
 		7C8D083700274C80BADEB3D6 /* Sansation_Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F1D77AE9F7B24CF19834052B /* Sansation_Bold.ttf */; };
-		876EF5E1E66DB51CA99B2278 /* libPods-Ecency-EcencyTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B9465F160B10629BBA046AFF /* libPods-Ecency-EcencyTests.a */; };
+		872EB06D13C728B5C4C733E4 /* libPods-Ecency.a in Frameworks */ = {isa = PBXBuildFile; fileRef = A897E6535C5B45DDED43406D /* libPods-Ecency.a */; };
 		89D99F65314A416290F8D921 /* Roboto.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 64F2A611E6EF486C8D3FB82C /* Roboto.ttf */; };
 		92082305364D41A4A673F950 /* RobotoMono-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5795D1B1C55E46FF96CC4AED /* RobotoMono-Regular.ttf */; };
 		A57EE8B63D4948F0A05218E3 /* rubicon-icon-font.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 65F56948860941D6BA55779F /* rubicon-icon-font.ttf */; };
@@ -103,19 +103,19 @@
 		06F72CA5290B2D7F003392F3 /* hermes.xcframework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcframework; name = hermes.xcframework; path = "Pods/hermes-engine/destroot/Library/Frameworks/universal/hermes.xcframework"; sourceTree = "<group>"; };
 		112758B0BBF9458381CE41FD /* FontAwesome.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = "<group>"; };
 		11CAB2F9B4B7425ABCAB4007 /* Foundation.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Foundation.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = "<group>"; };
-		124910ABAAE6F830F25B58F1 /* libPods-Ecency.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Ecency.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Ecency/AppDelegate.h; sourceTree = "<group>"; };
 		13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Ecency/Images.xcassets; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Ecency/Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Ecency/main.m; sourceTree = "<group>"; };
-		169CD182E971B691794D7D62 /* Pods-Ecency.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Ecency.debug.xcconfig"; path = "Target Support Files/Pods-Ecency/Pods-Ecency.debug.xcconfig"; sourceTree = "<group>"; };
+		17B14A55DE011F4183CA4FA1 /* Pods-Ecency-EcencyTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Ecency-EcencyTests.release.xcconfig"; path = "Target Support Files/Pods-Ecency-EcencyTests/Pods-Ecency-EcencyTests.release.xcconfig"; sourceTree = "<group>"; };
 		1CD0B89B258019B600A7D78E /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
 		22F5F05A06E142C2B41A4D38 /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialCommunityIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf"; sourceTree = "<group>"; };
+		25630E9BE79833145F3E34B9 /* Pods-Ecency.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Ecency.release.xcconfig"; path = "Target Support Files/Pods-Ecency/Pods-Ecency.release.xcconfig"; sourceTree = "<group>"; };
 		263FA8C0EF21473FAAAD3EDD /* MaterialIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = "<group>"; };
+		2AEEE72F26D37DC0AC8A99C2 /* libPods-Ecency-EcencyTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Ecency-EcencyTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		2D02E47B1E0B4A5D006451C7 /* Ecency-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Ecency-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		2D02E4901E0B4A5D006451C7 /* Ecency-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Ecency-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
 		34E88D888DD444F8B285363C /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = SimpleLineIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = "<group>"; };
-		356744069A505ACFDA07B57E /* Pods-Ecency-EcencyTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Ecency-EcencyTests.debug.xcconfig"; path = "Target Support Files/Pods-Ecency-EcencyTests/Pods-Ecency-EcencyTests.debug.xcconfig"; sourceTree = "<group>"; };
 		420ABF9795564845A0963C27 /* Feather.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Feather.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Feather.ttf"; sourceTree = "<group>"; };
 		4EB466C53BAE4EDC904357B3 /* FontAwesome5_Solid.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Solid.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf"; sourceTree = "<group>"; };
 		5795D1B1C55E46FF96CC4AED /* RobotoMono-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "RobotoMono-Regular.ttf"; path = "../src/assets/fonts/RobotoMono-Regular.ttf"; sourceTree = "<group>"; };
@@ -131,6 +131,7 @@
 		64F2A611E6EF486C8D3FB82C /* Roboto.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Roboto.ttf; path = ../src/assets/fonts/Roboto.ttf; sourceTree = "<group>"; };
 		65F56948860941D6BA55779F /* rubicon-icon-font.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "rubicon-icon-font.ttf"; path = "../src/assets/fonts/rubicon-icon-font.ttf"; sourceTree = "<group>"; };
 		6D935B44FB5A4CF3BF4D01DF /* Ionicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Ionicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = "<group>"; };
+		7246575DADCA4488EC9D462A /* Pods-Ecency-EcencyTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Ecency-EcencyTests.debug.xcconfig"; path = "Target Support Files/Pods-Ecency-EcencyTests/Pods-Ecency-EcencyTests.debug.xcconfig"; sourceTree = "<group>"; };
 		7900A87FFF214846B5FE0430 /* Roboto-medium.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-medium.ttf"; path = "../src/assets/fonts/Roboto-medium.ttf"; sourceTree = "<group>"; };
 		93B182C6FFA44610AB188D7C /* Entypo.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Entypo.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = "<group>"; };
 		9464AFB033664B4F8E9F0BED /* AntDesign.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = AntDesign.ttf; path = "../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf"; sourceTree = "<group>"; };
@@ -138,10 +139,9 @@
 		98D3D7C3AF354BF0987A2BFA /* Fontisto.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Fontisto.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf"; sourceTree = "<group>"; };
 		9BC08A790166415B9BB3F5CF /* FontAwesome5_Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Regular.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf"; sourceTree = "<group>"; };
 		A239FC84622A4A9CA7950ED9 /* EvilIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = EvilIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = "<group>"; };
-		B9465F160B10629BBA046AFF /* libPods-Ecency-EcencyTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Ecency-EcencyTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		A897E6535C5B45DDED43406D /* libPods-Ecency.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Ecency.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		AEF4CD0A8BA6A1EC68545063 /* Pods-Ecency.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Ecency.debug.xcconfig"; path = "Target Support Files/Pods-Ecency/Pods-Ecency.debug.xcconfig"; sourceTree = "<group>"; };
 		BB1093ACCD904E2883413214 /* FontAwesome5_Brands.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome5_Brands.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf"; sourceTree = "<group>"; };
-		C9BE41D6E0C957C7BDD825DB /* Pods-Ecency-EcencyTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Ecency-EcencyTests.release.xcconfig"; path = "Target Support Files/Pods-Ecency-EcencyTests/Pods-Ecency-EcencyTests.release.xcconfig"; sourceTree = "<group>"; };
-		C9C2A13EFFF45C3778A090DA /* Pods-Ecency.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Ecency.release.xcconfig"; path = "Target Support Files/Pods-Ecency/Pods-Ecency.release.xcconfig"; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 		ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; };
 		F1D77AE9F7B24CF19834052B /* Sansation_Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Sansation_Bold.ttf; path = ../src/assets/fonts/Sansation_Bold.ttf; sourceTree = "<group>"; };
@@ -152,7 +152,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				876EF5E1E66DB51CA99B2278 /* libPods-Ecency-EcencyTests.a in Frameworks */,
+				31159F09A2AEC018F2A3DBA4 /* libPods-Ecency-EcencyTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -169,7 +169,7 @@
 			files = (
 				05B6C49424C306CE00B7FA60 /* StoreKit.framework in Frameworks */,
 				065B9DDE2930E42A004310E4 /* hermes.xcframework in Frameworks */,
-				772749BE6C8ACDB061E94A99 /* libPods-Ecency.a in Frameworks */,
+				872EB06D13C728B5C4C733E4 /* libPods-Ecency.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -242,10 +242,10 @@
 		258E34A3BDFFFBF80D598187 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				169CD182E971B691794D7D62 /* Pods-Ecency.debug.xcconfig */,
-				C9C2A13EFFF45C3778A090DA /* Pods-Ecency.release.xcconfig */,
-				356744069A505ACFDA07B57E /* Pods-Ecency-EcencyTests.debug.xcconfig */,
-				C9BE41D6E0C957C7BDD825DB /* Pods-Ecency-EcencyTests.release.xcconfig */,
+				AEF4CD0A8BA6A1EC68545063 /* Pods-Ecency.debug.xcconfig */,
+				25630E9BE79833145F3E34B9 /* Pods-Ecency.release.xcconfig */,
+				7246575DADCA4488EC9D462A /* Pods-Ecency-EcencyTests.debug.xcconfig */,
+				17B14A55DE011F4183CA4FA1 /* Pods-Ecency-EcencyTests.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -259,8 +259,8 @@
 				58190B3B23294814000EA0E1 /* StoreKit.framework */,
 				ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
 				ED2971642150620600B7C4FE /* JavaScriptCore.framework */,
-				124910ABAAE6F830F25B58F1 /* libPods-Ecency.a */,
-				B9465F160B10629BBA046AFF /* libPods-Ecency-EcencyTests.a */,
+				A897E6535C5B45DDED43406D /* libPods-Ecency.a */,
+				2AEEE72F26D37DC0AC8A99C2 /* libPods-Ecency-EcencyTests.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -357,12 +357,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "EcencyTests" */;
 			buildPhases = (
-				D20882C6C7967CEB711832FF /* [CP] Check Pods Manifest.lock */,
+				9A48C94417EBFC0599466A7A /* [CP] Check Pods Manifest.lock */,
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
-				32AFABCE84C6A04F59FCB9EB /* [CP] Embed Pods Frameworks */,
-				1BB69C1604DFDB0A23F350CA /* [CP] Copy Pods Resources */,
+				971975A45C595703A4946EE4 /* [CP] Embed Pods Frameworks */,
+				FBC6B780B4B7B61887A3D272 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -394,7 +394,7 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 05B6C4B424C306CE00B7FA60 /* Build configuration list for PBXNativeTarget "Ecency" */;
 			buildPhases = (
-				568AF1F98F99B36E825487AC /* [CP] Check Pods Manifest.lock */,
+				7C134BDD9485660D3DDEF43A /* [CP] Check Pods Manifest.lock */,
 				05B6C48E24C306CE00B7FA60 /* Start Packager */,
 				05B6C48F24C306CE00B7FA60 /* Sources */,
 				05B6C49324C306CE00B7FA60 /* Frameworks */,
@@ -403,9 +403,9 @@
 				58C9F50524CE017800A026DD /* Embed App Extensions */,
 				05BAAAEE25BF43F80072EA01 /* ShellScript */,
 				3D1F6693773C4541A695BB3C /* Upload source maps to Bugsnag */,
-				54FF29B40A229C6857DB939A /* [CP] Embed Pods Frameworks */,
-				C47CF4407D2ABBBDA836FA64 /* [CP] Copy Pods Resources */,
-				17A1D8C2F7AF49C6C52EEBF4 /* [CP-User] [RNFB] Core Configuration */,
+				2C87F1D159FEC7C0B7E3D88E /* [CP] Embed Pods Frameworks */,
+				11982F6ABD16AEDAC94D6CFD /* [CP] Copy Pods Resources */,
+				F23609443C931B20A3F7BDA1 /* [CP-User] [RNFB] Core Configuration */,
 			);
 			buildRules = (
 			);
@@ -642,172 +642,7 @@
 			shellPath = /bin/sh;
 			shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n";
 		};
-		17A1D8C2F7AF49C6C52EEBF4 /* [CP-User] [RNFB] Core Configuration */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"$(BUILT_PRODUCTS_DIR)/$(INFOPLIST_PATH)",
-			);
-			name = "[CP-User] [RNFB] Core Configuration";
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "#!/usr/bin/env bash\n#\n# Copyright (c) 2016-present Invertase Limited & Contributors\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this library except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#   http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n#\nset -e\n\n_MAX_LOOKUPS=2;\n_SEARCH_RESULT=''\n_RN_ROOT_EXISTS=''\n_CURRENT_LOOKUPS=1\n_JSON_ROOT=\"'react-native'\"\n_JSON_FILE_NAME='firebase.json'\n_JSON_OUTPUT_BASE64='e30=' # { }\n_CURRENT_SEARCH_DIR=${PROJECT_DIR}\n_PLIST_BUDDY=/usr/libexec/PlistBuddy\n_TARGET_PLIST=\"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}\"\n_DSYM_PLIST=\"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Info.plist\"\n\n# plist arrays\n_PLIST_ENTRY_KEYS=()\n_PLIST_ENTRY_TYPES=()\n_PLIST_ENTRY_VALUES=()\n\nfunction setPlistValue {\n  echo \"info:      setting plist entry '$1' of type '$2' in file '$4'\"\n  ${_PLIST_BUDDY} -c \"Add :$1 $2 '$3'\" $4 || echo \"info:      '$1' already exists\"\n}\n\nfunction getFirebaseJsonKeyValue () {\n  if [[ ${_RN_ROOT_EXISTS} ]]; then\n    ruby -e \"require 'rubygems';require 'json'; output=JSON.parse('$1'); puts output[$_JSON_ROOT]['$2']\"\n  else\n    echo \"\"\n  fi;\n}\n\nfunction jsonBoolToYesNo () {\n  if [[ $1 == \"false\" ]]; then\n    echo \"NO\"\n  elif [[ $1 == \"true\" ]]; then\n    echo \"YES\"\n  else echo \"NO\"\n  fi\n}\n\necho \"info: -> RNFB build script started\"\necho \"info: 1) Locating ${_JSON_FILE_NAME} file:\"\n\nif [[ -z ${_CURRENT_SEARCH_DIR} ]]; then\n  _CURRENT_SEARCH_DIR=$(pwd)\nfi;\n\nwhile true; do\n  _CURRENT_SEARCH_DIR=$(dirname \"$_CURRENT_SEARCH_DIR\")\n  if [[ \"$_CURRENT_SEARCH_DIR\" == \"/\" ]] || [[ ${_CURRENT_LOOKUPS} -gt ${_MAX_LOOKUPS} ]]; then break; fi;\n  echo \"info:      ($_CURRENT_LOOKUPS of $_MAX_LOOKUPS) Searching in '$_CURRENT_SEARCH_DIR' for a ${_JSON_FILE_NAME} file.\"\n  _SEARCH_RESULT=$(find \"$_CURRENT_SEARCH_DIR\" -maxdepth 2 -name ${_JSON_FILE_NAME} -print | /usr/bin/head -n 1)\n  if [[ ${_SEARCH_RESULT} ]]; then\n    echo \"info:      ${_JSON_FILE_NAME} found at $_SEARCH_RESULT\"\n    break;\n  fi;\n  _CURRENT_LOOKUPS=$((_CURRENT_LOOKUPS+1))\ndone\n\nif [[ ${_SEARCH_RESULT} ]]; then\n  _JSON_OUTPUT_RAW=$(cat \"${_SEARCH_RESULT}\")\n  _RN_ROOT_EXISTS=$(ruby -e \"require 'rubygems';require 'json'; output=JSON.parse('$_JSON_OUTPUT_RAW'); puts output[$_JSON_ROOT]\" || echo '')\n\n  if [[ ${_RN_ROOT_EXISTS} ]]; then\n    if ! python3 --version >/dev/null 2>&1; then echo \"python3 not found, firebase.json file processing error.\" && exit 1; fi\n    _JSON_OUTPUT_BASE64=$(python3 -c 'import json,sys,base64;print(base64.b64encode(bytes(json.dumps(json.loads(open('\"'${_SEARCH_RESULT}'\"', '\"'rb'\"').read())['${_JSON_ROOT}']), '\"'utf-8'\"')).decode())' || echo \"e30=\")\n  fi\n\n  _PLIST_ENTRY_KEYS+=(\"firebase_json_raw\")\n  _PLIST_ENTRY_TYPES+=(\"string\")\n  _PLIST_ENTRY_VALUES+=(\"$_JSON_OUTPUT_BASE64\")\n\n  # config.app_data_collection_default_enabled\n  _APP_DATA_COLLECTION_ENABLED=$(getFirebaseJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"app_data_collection_default_enabled\")\n  if [[ $_APP_DATA_COLLECTION_ENABLED ]]; then\n    _PLIST_ENTRY_KEYS+=(\"FirebaseDataCollectionDefaultEnabled\")\n    _PLIST_ENTRY_TYPES+=(\"bool\")\n    _PLIST_ENTRY_VALUES+=(\"$(jsonBoolToYesNo \"$_APP_DATA_COLLECTION_ENABLED\")\")\n  fi\n\n  # config.analytics_auto_collection_enabled\n  _ANALYTICS_AUTO_COLLECTION=$(getFirebaseJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"analytics_auto_collection_enabled\")\n  if [[ $_ANALYTICS_AUTO_COLLECTION ]]; then\n    _PLIST_ENTRY_KEYS+=(\"FIREBASE_ANALYTICS_COLLECTION_ENABLED\")\n    _PLIST_ENTRY_TYPES+=(\"bool\")\n    _PLIST_ENTRY_VALUES+=(\"$(jsonBoolToYesNo \"$_ANALYTICS_AUTO_COLLECTION\")\")\n  fi\n\n  # config.analytics_collection_deactivated\n  _ANALYTICS_DEACTIVATED=$(getFirebaseJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"analytics_collection_deactivated\")\n  if [[ $_ANALYTICS_DEACTIVATED ]]; then\n    _PLIST_ENTRY_KEYS+=(\"FIREBASE_ANALYTICS_COLLECTION_DEACTIVATED\")\n    _PLIST_ENTRY_TYPES+=(\"bool\")\n    _PLIST_ENTRY_VALUES+=(\"$(jsonBoolToYesNo \"$_ANALYTICS_DEACTIVATED\")\")\n  fi\n\n  # config.analytics_idfv_collection_enabled\n  _ANALYTICS_IDFV_COLLECTION=$(getFirebaseJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"analytics_idfv_collection_enabled\")\n  if [[ $_ANALYTICS_IDFV_COLLECTION ]]; then\n    _PLIST_ENTRY_KEYS+=(\"GOOGLE_ANALYTICS_IDFV_COLLECTION_ENABLED\")\n    _PLIST_ENTRY_TYPES+=(\"bool\")\n    _PLIST_ENTRY_VALUES+=(\"$(jsonBoolToYesNo \"$_ANALYTICS_IDFV_COLLECTION\")\")\n  fi\n\n  # config.analytics_default_allow_ad_personalization_signals\n  _ANALYTICS_PERSONALIZATION=$(getFirebaseJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"analytics_default_allow_ad_personalization_signals\")\n  if [[ $_ANALYTICS_PERSONALIZATION ]]; then\n    _PLIST_ENTRY_KEYS+=(\"GOOGLE_ANALYTICS_DEFAULT_ALLOW_AD_PERSONALIZATION_SIGNALS\")\n    _PLIST_ENTRY_TYPES+=(\"bool\")\n    _PLIST_ENTRY_VALUES+=(\"$(jsonBoolToYesNo \"$_ANALYTICS_PERSONALIZATION\")\")\n  fi\n\n  # config.google_analytics_automatic_screen_reporting_enabled\n  _ANALYTICS_AUTO_SCREEN_REPORTING=$(getFirebaseJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"google_analytics_automatic_screen_reporting_enabled\")\n  if [[ $_ANALYTICS_AUTO_SCREEN_REPORTING ]]; then\n    _PLIST_ENTRY_KEYS+=(\"FirebaseAutomaticScreenReportingEnabled\")\n    _PLIST_ENTRY_TYPES+=(\"bool\")\n    _PLIST_ENTRY_VALUES+=(\"$(jsonBoolToYesNo \"$_ANALYTICS_AUTO_SCREEN_REPORTING\")\")\n  fi\n\n  # config.perf_auto_collection_enabled\n  _PERF_AUTO_COLLECTION=$(getFirebaseJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"perf_auto_collection_enabled\")\n  if [[ $_PERF_AUTO_COLLECTION ]]; then\n    _PLIST_ENTRY_KEYS+=(\"firebase_performance_collection_enabled\")\n    _PLIST_ENTRY_TYPES+=(\"bool\")\n    _PLIST_ENTRY_VALUES+=(\"$(jsonBoolToYesNo \"$_PERF_AUTO_COLLECTION\")\")\n  fi\n\n  # config.perf_collection_deactivated\n  _PERF_DEACTIVATED=$(getFirebaseJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"perf_collection_deactivated\")\n  if [[ $_PERF_DEACTIVATED ]]; then\n    _PLIST_ENTRY_KEYS+=(\"firebase_performance_collection_deactivated\")\n    _PLIST_ENTRY_TYPES+=(\"bool\")\n    _PLIST_ENTRY_VALUES+=(\"$(jsonBoolToYesNo \"$_PERF_DEACTIVATED\")\")\n  fi\n\n  # config.messaging_auto_init_enabled\n  _MESSAGING_AUTO_INIT=$(getFirebaseJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"messaging_auto_init_enabled\")\n  if [[ $_MESSAGING_AUTO_INIT ]]; then\n    _PLIST_ENTRY_KEYS+=(\"FirebaseMessagingAutoInitEnabled\")\n    _PLIST_ENTRY_TYPES+=(\"bool\")\n    _PLIST_ENTRY_VALUES+=(\"$(jsonBoolToYesNo \"$_MESSAGING_AUTO_INIT\")\")\n  fi\n\n  # config.in_app_messaging_auto_colllection_enabled\n  _FIAM_AUTO_INIT=$(getFirebaseJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"in_app_messaging_auto_collection_enabled\")\n  if [[ $_FIAM_AUTO_INIT ]]; then\n    _PLIST_ENTRY_KEYS+=(\"FirebaseInAppMessagingAutomaticDataCollectionEnabled\")\n    _PLIST_ENTRY_TYPES+=(\"bool\")\n    _PLIST_ENTRY_VALUES+=(\"$(jsonBoolToYesNo \"$_FIAM_AUTO_INIT\")\")\n  fi\n\n  # config.app_check_token_auto_refresh\n  _APP_CHECK_TOKEN_AUTO_REFRESH=$(getFirebaseJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"app_check_token_auto_refresh\")\n  if [[ $_APP_CHECK_TOKEN_AUTO_REFRESH ]]; then\n    _PLIST_ENTRY_KEYS+=(\"FirebaseAppCheckTokenAutoRefreshEnabled\")\n    _PLIST_ENTRY_TYPES+=(\"bool\")\n    _PLIST_ENTRY_VALUES+=(\"$(jsonBoolToYesNo \"$_APP_CHECK_TOKEN_AUTO_REFRESH\")\")\n  fi\n\n  # config.crashlytics_disable_auto_disabler - undocumented for now - mainly for debugging, document if becomes useful\n  _CRASHLYTICS_AUTO_DISABLE_ENABLED=$(getFirebaseJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"crashlytics_disable_auto_disabler\")\n  if [[ $_CRASHLYTICS_AUTO_DISABLE_ENABLED == \"true\" ]]; then\n    echo \"Disabled Crashlytics auto disabler.\" # do nothing\n  else\n    _PLIST_ENTRY_KEYS+=(\"FirebaseCrashlyticsCollectionEnabled\")\n    _PLIST_ENTRY_TYPES+=(\"bool\")\n    _PLIST_ENTRY_VALUES+=(\"NO\")\n  fi\nelse\n  _PLIST_ENTRY_KEYS+=(\"firebase_json_raw\")\n  _PLIST_ENTRY_TYPES+=(\"string\")\n  _PLIST_ENTRY_VALUES+=(\"$_JSON_OUTPUT_BASE64\")\n  echo \"warning:   A firebase.json file was not found, whilst this file is optional it is recommended to include it to configure firebase services in React Native Firebase.\"\nfi;\n\necho \"info: 2) Injecting Info.plist entries: \"\n\n# Log out the keys we're adding\nfor i in \"${!_PLIST_ENTRY_KEYS[@]}\"; do\n  echo \"    ->  $i) ${_PLIST_ENTRY_KEYS[$i]}\" \"${_PLIST_ENTRY_TYPES[$i]}\" \"${_PLIST_ENTRY_VALUES[$i]}\"\ndone\n\nfor plist in \"${_TARGET_PLIST}\" \"${_DSYM_PLIST}\" ; do\n  if [[ -f \"${plist}\" ]]; then\n\n    # paths with spaces break the call to setPlistValue. temporarily modify\n    # the shell internal field separator variable (IFS), which normally\n    # includes spaces, to consist only of line breaks\n    oldifs=$IFS\n    IFS=\"\n\"\n\n    for i in \"${!_PLIST_ENTRY_KEYS[@]}\"; do\n      setPlistValue \"${_PLIST_ENTRY_KEYS[$i]}\" \"${_PLIST_ENTRY_TYPES[$i]}\" \"${_PLIST_ENTRY_VALUES[$i]}\" \"${plist}\"\n    done\n\n    # restore the original internal field separator value\n    IFS=$oldifs\n  else\n    echo \"warning:   A Info.plist build output file was not found (${plist})\"\n  fi\ndone\n\necho \"info: <- RNFB build script finished\"\n";
-		};
-		1BB69C1604DFDB0A23F350CA /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Ecency-EcencyTests/Pods-Ecency-EcencyTests-resources.sh",
-				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Feather.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Foundation.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Octicons.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf",
-				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf",
-				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
-				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EvilIcons.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Feather.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Brands.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Regular.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Solid.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Fontisto.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Foundation.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Ionicons.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialCommunityIcons.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialIcons.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Octicons.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SimpleLineIcons.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
-				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Ecency-EcencyTests/Pods-Ecency-EcencyTests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		32AFABCE84C6A04F59FCB9EB /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Ecency-EcencyTests/Pods-Ecency-EcencyTests-frameworks.sh",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-Glog/glog.framework/glog",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/hermes.framework/hermes",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Ecency-EcencyTests/Pods-Ecency-EcencyTests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		3D1F6693773C4541A695BB3C /* Upload source maps to Bugsnag */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Upload source maps to Bugsnag";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "SOURCE_MAP=\"$TMPDIR/$(md5 -qs \"$CONFIGURATION_BUILD_DIR\")-main.jsbundle.map\" ../node_modules/@bugsnag/react-native/bugsnag-react-native-xcode.sh";
-		};
-		54FF29B40A229C6857DB939A /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-Ecency/Pods-Ecency-frameworks.sh",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-Glog/glog.framework/glog",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
-				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/hermes.framework/hermes",
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Ecency/Pods-Ecency-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		568AF1F98F99B36E825487AC /* [CP] Check Pods Manifest.lock */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputFileListPaths = (
-			);
-			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
-			);
-			name = "[CP] Check Pods Manifest.lock";
-			outputFileListPaths = (
-			);
-			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-Ecency-checkManifestLockResult.txt",
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
-			showEnvVarsInLog = 0;
-		};
-		57F4EECD4004FE3420E6DF92 /* Bundle React Native Code And Images */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Bundle React Native Code And Images";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "export EXTRA_PACKAGER_ARGS=\"--sourcemap-output $TMPDIR/$(md5 -qs \"$CONFIGURATION_BUILD_DIR\")-main.jsbundle.map\"\nexport EXTRA_PACKAGER_ARGS=\"--sourcemap-output $CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/main.jsbundle.map\"\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
-		};
-		C47CF4407D2ABBBDA836FA64 /* [CP] Copy Pods Resources */ = {
+		11982F6ABD16AEDAC94D6CFD /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -861,7 +696,105 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Ecency/Pods-Ecency-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		D20882C6C7967CEB711832FF /* [CP] Check Pods Manifest.lock */ = {
+		2C87F1D159FEC7C0B7E3D88E /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Ecency/Pods-Ecency-frameworks.sh",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-Glog/glog.framework/glog",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/hermes.framework/hermes",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Ecency/Pods-Ecency-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		3D1F6693773C4541A695BB3C /* Upload source maps to Bugsnag */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Upload source maps to Bugsnag";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "SOURCE_MAP=\"$TMPDIR/$(md5 -qs \"$CONFIGURATION_BUILD_DIR\")-main.jsbundle.map\" ../node_modules/@bugsnag/react-native/bugsnag-react-native-xcode.sh";
+		};
+		57F4EECD4004FE3420E6DF92 /* Bundle React Native Code And Images */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "Bundle React Native Code And Images";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "export EXTRA_PACKAGER_ARGS=\"--sourcemap-output $TMPDIR/$(md5 -qs \"$CONFIGURATION_BUILD_DIR\")-main.jsbundle.map\"\nexport EXTRA_PACKAGER_ARGS=\"--sourcemap-output $CONFIGURATION_BUILD_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/main.jsbundle.map\"\nexport NODE_BINARY=node\n../node_modules/react-native/scripts/react-native-xcode.sh";
+		};
+		7C134BDD9485660D3DDEF43A /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Ecency-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		971975A45C595703A4946EE4 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Ecency-EcencyTests/Pods-Ecency-EcencyTests-frameworks.sh",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-DoubleConversion/double-conversion.framework/double-conversion",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/Flipper-Glog/glog.framework/glog",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/OpenSSL-Universal/OpenSSL.framework/OpenSSL",
+				"${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/hermes.framework/hermes",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/double-conversion.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/glog.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OpenSSL.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/hermes.framework",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Ecency-EcencyTests/Pods-Ecency-EcencyTests-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		9A48C94417EBFC0599466A7A /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -883,6 +816,73 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		F23609443C931B20A3F7BDA1 /* [CP-User] [RNFB] Core Configuration */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"$(BUILT_PRODUCTS_DIR)/$(INFOPLIST_PATH)",
+			);
+			name = "[CP-User] [RNFB] Core Configuration";
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "#!/usr/bin/env bash\n#\n# Copyright (c) 2016-present Invertase Limited & Contributors\n#\n# Licensed under the Apache License, Version 2.0 (the \"License\");\n# you may not use this library except in compliance with the License.\n# You may obtain a copy of the License at\n#\n#   http://www.apache.org/licenses/LICENSE-2.0\n#\n# Unless required by applicable law or agreed to in writing, software\n# distributed under the License is distributed on an \"AS IS\" BASIS,\n# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n# See the License for the specific language governing permissions and\n# limitations under the License.\n#\nset -e\n\n_MAX_LOOKUPS=2;\n_SEARCH_RESULT=''\n_RN_ROOT_EXISTS=''\n_CURRENT_LOOKUPS=1\n_JSON_ROOT=\"'react-native'\"\n_JSON_FILE_NAME='firebase.json'\n_JSON_OUTPUT_BASE64='e30=' # { }\n_CURRENT_SEARCH_DIR=${PROJECT_DIR}\n_PLIST_BUDDY=/usr/libexec/PlistBuddy\n_TARGET_PLIST=\"${BUILT_PRODUCTS_DIR}/${INFOPLIST_PATH}\"\n_DSYM_PLIST=\"${DWARF_DSYM_FOLDER_PATH}/${DWARF_DSYM_FILE_NAME}/Contents/Info.plist\"\n\n# plist arrays\n_PLIST_ENTRY_KEYS=()\n_PLIST_ENTRY_TYPES=()\n_PLIST_ENTRY_VALUES=()\n\nfunction setPlistValue {\n  echo \"info:      setting plist entry '$1' of type '$2' in file '$4'\"\n  ${_PLIST_BUDDY} -c \"Add :$1 $2 '$3'\" $4 || echo \"info:      '$1' already exists\"\n}\n\nfunction getFirebaseJsonKeyValue () {\n  if [[ ${_RN_ROOT_EXISTS} ]]; then\n    ruby -e \"require 'rubygems';require 'json'; output=JSON.parse('$1'); puts output[$_JSON_ROOT]['$2']\"\n  else\n    echo \"\"\n  fi;\n}\n\nfunction jsonBoolToYesNo () {\n  if [[ $1 == \"false\" ]]; then\n    echo \"NO\"\n  elif [[ $1 == \"true\" ]]; then\n    echo \"YES\"\n  else echo \"NO\"\n  fi\n}\n\necho \"info: -> RNFB build script started\"\necho \"info: 1) Locating ${_JSON_FILE_NAME} file:\"\n\nif [[ -z ${_CURRENT_SEARCH_DIR} ]]; then\n  _CURRENT_SEARCH_DIR=$(pwd)\nfi;\n\nwhile true; do\n  _CURRENT_SEARCH_DIR=$(dirname \"$_CURRENT_SEARCH_DIR\")\n  if [[ \"$_CURRENT_SEARCH_DIR\" == \"/\" ]] || [[ ${_CURRENT_LOOKUPS} -gt ${_MAX_LOOKUPS} ]]; then break; fi;\n  echo \"info:      ($_CURRENT_LOOKUPS of $_MAX_LOOKUPS) Searching in '$_CURRENT_SEARCH_DIR' for a ${_JSON_FILE_NAME} file.\"\n  _SEARCH_RESULT=$(find \"$_CURRENT_SEARCH_DIR\" -maxdepth 2 -name ${_JSON_FILE_NAME} -print | /usr/bin/head -n 1)\n  if [[ ${_SEARCH_RESULT} ]]; then\n    echo \"info:      ${_JSON_FILE_NAME} found at $_SEARCH_RESULT\"\n    break;\n  fi;\n  _CURRENT_LOOKUPS=$((_CURRENT_LOOKUPS+1))\ndone\n\nif [[ ${_SEARCH_RESULT} ]]; then\n  _JSON_OUTPUT_RAW=$(cat \"${_SEARCH_RESULT}\")\n  _RN_ROOT_EXISTS=$(ruby -e \"require 'rubygems';require 'json'; output=JSON.parse('$_JSON_OUTPUT_RAW'); puts output[$_JSON_ROOT]\" || echo '')\n\n  if [[ ${_RN_ROOT_EXISTS} ]]; then\n    if ! python3 --version >/dev/null 2>&1; then echo \"python3 not found, firebase.json file processing error.\" && exit 1; fi\n    _JSON_OUTPUT_BASE64=$(python3 -c 'import json,sys,base64;print(base64.b64encode(bytes(json.dumps(json.loads(open('\"'${_SEARCH_RESULT}'\"', '\"'rb'\"').read())['${_JSON_ROOT}']), '\"'utf-8'\"')).decode())' || echo \"e30=\")\n  fi\n\n  _PLIST_ENTRY_KEYS+=(\"firebase_json_raw\")\n  _PLIST_ENTRY_TYPES+=(\"string\")\n  _PLIST_ENTRY_VALUES+=(\"$_JSON_OUTPUT_BASE64\")\n\n  # config.app_data_collection_default_enabled\n  _APP_DATA_COLLECTION_ENABLED=$(getFirebaseJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"app_data_collection_default_enabled\")\n  if [[ $_APP_DATA_COLLECTION_ENABLED ]]; then\n    _PLIST_ENTRY_KEYS+=(\"FirebaseDataCollectionDefaultEnabled\")\n    _PLIST_ENTRY_TYPES+=(\"bool\")\n    _PLIST_ENTRY_VALUES+=(\"$(jsonBoolToYesNo \"$_APP_DATA_COLLECTION_ENABLED\")\")\n  fi\n\n  # config.analytics_auto_collection_enabled\n  _ANALYTICS_AUTO_COLLECTION=$(getFirebaseJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"analytics_auto_collection_enabled\")\n  if [[ $_ANALYTICS_AUTO_COLLECTION ]]; then\n    _PLIST_ENTRY_KEYS+=(\"FIREBASE_ANALYTICS_COLLECTION_ENABLED\")\n    _PLIST_ENTRY_TYPES+=(\"bool\")\n    _PLIST_ENTRY_VALUES+=(\"$(jsonBoolToYesNo \"$_ANALYTICS_AUTO_COLLECTION\")\")\n  fi\n\n  # config.analytics_collection_deactivated\n  _ANALYTICS_DEACTIVATED=$(getFirebaseJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"analytics_collection_deactivated\")\n  if [[ $_ANALYTICS_DEACTIVATED ]]; then\n    _PLIST_ENTRY_KEYS+=(\"FIREBASE_ANALYTICS_COLLECTION_DEACTIVATED\")\n    _PLIST_ENTRY_TYPES+=(\"bool\")\n    _PLIST_ENTRY_VALUES+=(\"$(jsonBoolToYesNo \"$_ANALYTICS_DEACTIVATED\")\")\n  fi\n\n  # config.analytics_idfv_collection_enabled\n  _ANALYTICS_IDFV_COLLECTION=$(getFirebaseJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"analytics_idfv_collection_enabled\")\n  if [[ $_ANALYTICS_IDFV_COLLECTION ]]; then\n    _PLIST_ENTRY_KEYS+=(\"GOOGLE_ANALYTICS_IDFV_COLLECTION_ENABLED\")\n    _PLIST_ENTRY_TYPES+=(\"bool\")\n    _PLIST_ENTRY_VALUES+=(\"$(jsonBoolToYesNo \"$_ANALYTICS_IDFV_COLLECTION\")\")\n  fi\n\n  # config.analytics_default_allow_ad_personalization_signals\n  _ANALYTICS_PERSONALIZATION=$(getFirebaseJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"analytics_default_allow_ad_personalization_signals\")\n  if [[ $_ANALYTICS_PERSONALIZATION ]]; then\n    _PLIST_ENTRY_KEYS+=(\"GOOGLE_ANALYTICS_DEFAULT_ALLOW_AD_PERSONALIZATION_SIGNALS\")\n    _PLIST_ENTRY_TYPES+=(\"bool\")\n    _PLIST_ENTRY_VALUES+=(\"$(jsonBoolToYesNo \"$_ANALYTICS_PERSONALIZATION\")\")\n  fi\n\n  # config.google_analytics_automatic_screen_reporting_enabled\n  _ANALYTICS_AUTO_SCREEN_REPORTING=$(getFirebaseJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"google_analytics_automatic_screen_reporting_enabled\")\n  if [[ $_ANALYTICS_AUTO_SCREEN_REPORTING ]]; then\n    _PLIST_ENTRY_KEYS+=(\"FirebaseAutomaticScreenReportingEnabled\")\n    _PLIST_ENTRY_TYPES+=(\"bool\")\n    _PLIST_ENTRY_VALUES+=(\"$(jsonBoolToYesNo \"$_ANALYTICS_AUTO_SCREEN_REPORTING\")\")\n  fi\n\n  # config.perf_auto_collection_enabled\n  _PERF_AUTO_COLLECTION=$(getFirebaseJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"perf_auto_collection_enabled\")\n  if [[ $_PERF_AUTO_COLLECTION ]]; then\n    _PLIST_ENTRY_KEYS+=(\"firebase_performance_collection_enabled\")\n    _PLIST_ENTRY_TYPES+=(\"bool\")\n    _PLIST_ENTRY_VALUES+=(\"$(jsonBoolToYesNo \"$_PERF_AUTO_COLLECTION\")\")\n  fi\n\n  # config.perf_collection_deactivated\n  _PERF_DEACTIVATED=$(getFirebaseJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"perf_collection_deactivated\")\n  if [[ $_PERF_DEACTIVATED ]]; then\n    _PLIST_ENTRY_KEYS+=(\"firebase_performance_collection_deactivated\")\n    _PLIST_ENTRY_TYPES+=(\"bool\")\n    _PLIST_ENTRY_VALUES+=(\"$(jsonBoolToYesNo \"$_PERF_DEACTIVATED\")\")\n  fi\n\n  # config.messaging_auto_init_enabled\n  _MESSAGING_AUTO_INIT=$(getFirebaseJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"messaging_auto_init_enabled\")\n  if [[ $_MESSAGING_AUTO_INIT ]]; then\n    _PLIST_ENTRY_KEYS+=(\"FirebaseMessagingAutoInitEnabled\")\n    _PLIST_ENTRY_TYPES+=(\"bool\")\n    _PLIST_ENTRY_VALUES+=(\"$(jsonBoolToYesNo \"$_MESSAGING_AUTO_INIT\")\")\n  fi\n\n  # config.in_app_messaging_auto_colllection_enabled\n  _FIAM_AUTO_INIT=$(getFirebaseJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"in_app_messaging_auto_collection_enabled\")\n  if [[ $_FIAM_AUTO_INIT ]]; then\n    _PLIST_ENTRY_KEYS+=(\"FirebaseInAppMessagingAutomaticDataCollectionEnabled\")\n    _PLIST_ENTRY_TYPES+=(\"bool\")\n    _PLIST_ENTRY_VALUES+=(\"$(jsonBoolToYesNo \"$_FIAM_AUTO_INIT\")\")\n  fi\n\n  # config.app_check_token_auto_refresh\n  _APP_CHECK_TOKEN_AUTO_REFRESH=$(getFirebaseJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"app_check_token_auto_refresh\")\n  if [[ $_APP_CHECK_TOKEN_AUTO_REFRESH ]]; then\n    _PLIST_ENTRY_KEYS+=(\"FirebaseAppCheckTokenAutoRefreshEnabled\")\n    _PLIST_ENTRY_TYPES+=(\"bool\")\n    _PLIST_ENTRY_VALUES+=(\"$(jsonBoolToYesNo \"$_APP_CHECK_TOKEN_AUTO_REFRESH\")\")\n  fi\n\n  # config.crashlytics_disable_auto_disabler - undocumented for now - mainly for debugging, document if becomes useful\n  _CRASHLYTICS_AUTO_DISABLE_ENABLED=$(getFirebaseJsonKeyValue \"$_JSON_OUTPUT_RAW\" \"crashlytics_disable_auto_disabler\")\n  if [[ $_CRASHLYTICS_AUTO_DISABLE_ENABLED == \"true\" ]]; then\n    echo \"Disabled Crashlytics auto disabler.\" # do nothing\n  else\n    _PLIST_ENTRY_KEYS+=(\"FirebaseCrashlyticsCollectionEnabled\")\n    _PLIST_ENTRY_TYPES+=(\"bool\")\n    _PLIST_ENTRY_VALUES+=(\"NO\")\n  fi\nelse\n  _PLIST_ENTRY_KEYS+=(\"firebase_json_raw\")\n  _PLIST_ENTRY_TYPES+=(\"string\")\n  _PLIST_ENTRY_VALUES+=(\"$_JSON_OUTPUT_BASE64\")\n  echo \"warning:   A firebase.json file was not found, whilst this file is optional it is recommended to include it to configure firebase services in React Native Firebase.\"\nfi;\n\necho \"info: 2) Injecting Info.plist entries: \"\n\n# Log out the keys we're adding\nfor i in \"${!_PLIST_ENTRY_KEYS[@]}\"; do\n  echo \"    ->  $i) ${_PLIST_ENTRY_KEYS[$i]}\" \"${_PLIST_ENTRY_TYPES[$i]}\" \"${_PLIST_ENTRY_VALUES[$i]}\"\ndone\n\nfor plist in \"${_TARGET_PLIST}\" \"${_DSYM_PLIST}\" ; do\n  if [[ -f \"${plist}\" ]]; then\n\n    # paths with spaces break the call to setPlistValue. temporarily modify\n    # the shell internal field separator variable (IFS), which normally\n    # includes spaces, to consist only of line breaks\n    oldifs=$IFS\n    IFS=\"\n\"\n\n    for i in \"${!_PLIST_ENTRY_KEYS[@]}\"; do\n      setPlistValue \"${_PLIST_ENTRY_KEYS[$i]}\" \"${_PLIST_ENTRY_TYPES[$i]}\" \"${_PLIST_ENTRY_VALUES[$i]}\" \"${plist}\"\n    done\n\n    # restore the original internal field separator value\n    IFS=$oldifs\n  else\n    echo \"warning:   A Info.plist build output file was not found (${plist})\"\n  fi\ndone\n\necho \"info: <- RNFB build script finished\"\n";
+		};
+		FBC6B780B4B7B61887A3D272 /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Ecency-EcencyTests/Pods-Ecency-EcencyTests-resources.sh",
+				"${PODS_CONFIGURATION_BUILD_DIR}/RNImageCropPicker/QBImagePicker.bundle",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Feather.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Foundation.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Octicons.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf",
+				"${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf",
+				"${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle",
+				"${PODS_CONFIGURATION_BUILD_DIR}/TOCropViewController/TOCropViewControllerBundle.bundle",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/QBImagePicker.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EvilIcons.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Feather.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Brands.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Regular.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Solid.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Fontisto.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Foundation.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Ionicons.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialCommunityIcons.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialIcons.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Octicons.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SimpleLineIcons.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle",
+				"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TOCropViewControllerBundle.bundle",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Ecency-EcencyTests/Pods-Ecency-EcencyTests-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		FD10A7F122414F3F0027D42C /* Start Packager */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -977,7 +977,7 @@
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 356744069A505ACFDA07B57E /* Pods-Ecency-EcencyTests.debug.xcconfig */;
+			baseConfigurationReference = 7246575DADCA4488EC9D462A /* Pods-Ecency-EcencyTests.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
@@ -1014,7 +1014,7 @@
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = C9BE41D6E0C957C7BDD825DB /* Pods-Ecency-EcencyTests.release.xcconfig */;
+			baseConfigurationReference = 17B14A55DE011F4183CA4FA1 /* Pods-Ecency-EcencyTests.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
@@ -1121,7 +1121,7 @@
 		};
 		05B6C4B524C306CE00B7FA60 /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 169CD182E971B691794D7D62 /* Pods-Ecency.debug.xcconfig */;
+			baseConfigurationReference = AEF4CD0A8BA6A1EC68545063 /* Pods-Ecency.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
@@ -1204,7 +1204,7 @@
 		};
 		05B6C4B624C306CE00B7FA60 /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = C9C2A13EFFF45C3778A090DA /* Pods-Ecency.release.xcconfig */;
+			baseConfigurationReference = 25630E9BE79833145F3E34B9 /* Pods-Ecency.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 6932f5f94..39dd893cb 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -455,9 +455,9 @@ PODS:
     - React-Core
   - react-native-cameraroll (1.8.1):
     - React
-  - react-native-config (1.5.0):
-    - react-native-config/App (= 1.5.0)
-  - react-native-config/App (1.5.0):
+  - react-native-config (1.5.1):
+    - react-native-config/App (= 1.5.1)
+  - react-native-config/App (1.5.1):
     - React-Core
   - react-native-date-picker (4.2.9):
     - React-Core
@@ -573,7 +573,7 @@ PODS:
     - React-Core
   - RNCPushNotificationIOS (1.10.1):
     - React-Core
-  - RNDeviceInfo (10.4.0):
+  - RNDeviceInfo (10.8.0):
     - React-Core
   - RNFastImage (8.6.3):
     - React-Core
@@ -1045,7 +1045,7 @@ SPEC CHECKSUMS:
   react-native-background-timer: 17ea5e06803401a379ebf1f20505b793ac44d0fe
   react-native-camera: 3eae183c1d111103963f3dd913b65d01aef8110f
   react-native-cameraroll: e2917a5e62da9f10c3d525e157e25e694d2d6dfa
-  react-native-config: 5330c8258265c1e5fdb8c009d2cabd6badd96727
+  react-native-config: 86038147314e2e6d10ea9972022aa171e6b1d4d8
   react-native-date-picker: c063a8967058c58a02d7d0e1d655f0453576fb0d
   react-native-fingerprint-scanner: ac6656f18c8e45a7459302b84da41a44ad96dbbe
   react-native-flipper: c33a4995958ef12a2b2f8290d63bed7adeed7634
@@ -1078,7 +1078,7 @@ SPEC CHECKSUMS:
   RNCAsyncStorage: 8616bd5a58af409453ea4e1b246521bb76578d60
   RNCClipboard: 3f0451a8100393908bea5c5c5b16f96d45f30bfc
   RNCPushNotificationIOS: 87b8d16d3ede4532745e05b03c42cff33a36cc45
-  RNDeviceInfo: 749f2e049dcd79e2e44f134f66b73a06951b5066
+  RNDeviceInfo: 5795b418ed3451ebcaf39384e6cf51f60cb931c9
   RNFastImage: 5c9c9fed9c076e521b3f509fe79e790418a544e8
   RNFBAnalytics: ea1421b49a0bf5e5bb7274df4a330713d0e85d2e
   RNFBApp: e4439717c23252458da2b41b81b4b475c86f90c4
diff --git a/package.json b/package.json
index 8710540a3..1f1541866 100644
--- a/package.json
+++ b/package.json
@@ -104,7 +104,7 @@
     "react-native-bootsplash": "^4.3.2",
     "react-native-camera": "^4.2.1",
     "react-native-chart-kit": "^6.11.0",
-    "react-native-config": "luggit/react-native-config#master",
+    "react-native-config": "^1.5.1",
     "react-native-crypto": "^2.2.0",
     "react-native-date-picker": "^4.2.0",
     "react-native-device-info": "^10.7.0",
diff --git a/yarn.lock b/yarn.lock
index 875c7049b..1cc53a6ad 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -8966,9 +8966,10 @@ react-native-codegen@^0.70.6:
     jscodeshift "^0.13.1"
     nullthrows "^1.1.1"
 
-react-native-config@luggit/react-native-config#master:
-  version "1.5.0"
-  resolved "https://codeload.github.com/luggit/react-native-config/tar.gz/4ceb1dc4d05415f352c180469b511714e00cf5bd"
+react-native-config@^1.5.1:
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/react-native-config/-/react-native-config-1.5.1.tgz#73c94f511493e9b7ff9350cdf351d203a1b05acc"
+  integrity sha512-g1xNgt1tV95FCX+iWz6YJonxXkQX0GdD3fB8xQtR1GUBEqweB9zMROW77gi2TygmYmUkBI7LU4pES+zcTyK4HA==
 
 react-native-crypto-js@^1.0.0:
   version "1.0.0"
@@ -8998,10 +8999,10 @@ react-native-date-picker@^4.2.0:
   dependencies:
     prop-types "^15.8.1"
 
-react-native-device-info@^10.2.1:
-  version "10.4.0"
-  resolved "https://registry.yarnpkg.com/react-native-device-info/-/react-native-device-info-10.4.0.tgz#9d90706641941d7da8ab7b316a37d3111eb231e4"
-  integrity sha512-Z37e0HtpBvfkPRgv4xN7lXpvmJyzjwCXSFTXEkw6m2UgnnIsWlOD02Avu4hJXBlIMMazaW3ZLKal3o9h3AYvCw==
+react-native-device-info@^10.7.0:
+  version "10.8.0"
+  resolved "https://registry.yarnpkg.com/react-native-device-info/-/react-native-device-info-10.8.0.tgz#c331c94d65542f86bac197f223ee064c7e10a9ec"
+  integrity sha512-DE4/X82ZVhdcnR1Y21iTP46WSSJA/rHK3lmeqWfGGq1RKLwXTIdxmfbZZnYwryqJ+esrw2l4ND19qlgxDGby8A==
 
 react-native-draggable-flatlist@^4.0.1:
   version "4.0.1"