diff --git a/src/App.tsx b/src/App.tsx
index 031b301..07f5ba4 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -203,6 +203,7 @@ const App = (): React.JSX.Element => {
           name="Laconic"
           component={HomeScreen}
           options={{
+            // eslint-disable-next-line react/no-unstable-nested-components
             headerTitle: () => <Text variant="titleLarge">Laconic Wallet</Text>,
             headerBackVisible: false,
           }}
@@ -211,6 +212,7 @@ const App = (): React.JSX.Element => {
           name="SignMessage"
           component={SignMessage}
           options={{
+            // eslint-disable-next-line react/no-unstable-nested-components
             headerTitle: () => <Text variant="titleLarge">Sign Message</Text>,
           }}
         />
@@ -218,6 +220,7 @@ const App = (): React.JSX.Element => {
           name="SignRequest"
           component={SignRequest}
           options={{
+            // eslint-disable-next-line react/no-unstable-nested-components
             headerTitle: () => <Text variant="titleLarge">Sign Request</Text>,
           }}
         />
@@ -225,6 +228,7 @@ const App = (): React.JSX.Element => {
           name="InvalidPath"
           component={InvalidPath}
           options={{
+            // eslint-disable-next-line react/no-unstable-nested-components
             headerTitle: () => <Text variant="titleLarge">Bad Request</Text>,
             headerBackVisible: false,
           }}
@@ -233,7 +237,9 @@ const App = (): React.JSX.Element => {
           name="WalletConnect"
           component={WalletConnect}
           options={{
+            // eslint-disable-next-line react/no-unstable-nested-components
             headerTitle: () => <Text variant="titleLarge">WalletConnect</Text>,
+            // eslint-disable-next-line react/no-unstable-nested-components
             headerRight: () => (
               <Button
                 onPress={() => {
diff --git a/src/components/Accounts.tsx b/src/components/Accounts.tsx
index e46f346..9149f3d 100644
--- a/src/components/Accounts.tsx
+++ b/src/components/Accounts.tsx
@@ -14,7 +14,6 @@ import AccountDetails from './AccountDetails';
 import { useAccounts } from '../context/AccountsContext';
 import { web3wallet } from '../utils/wallet-connect/WalletConnectUtils';
 import { useNetworks } from '../context/NetworksContext';
-import { EIP155 } from '../utils/constants';
 import ConfirmDialog from './ConfirmDialog';
 import { getNamespaces } from '../utils/wallet-connect/helpers';
 
@@ -145,12 +144,7 @@ const Accounts = ({ currentIndex, updateIndex }: AccountsProps) => {
             mode="contained"
             onPress={() => {
               setHdDialog(true);
-              // TODO: Use coin type while adding from HD path
-              setPathCode(
-                selectedNetwork!.namespace === EIP155
-                  ? "m/44'/60'/"
-                  : "m/44'/118'/",
-              );
+              setPathCode(`m/44'/${selectedNetwork.coinType}'/`);
             }}>
             Add Account from HD path
           </Button>
diff --git a/src/components/NetworkDropdown.tsx b/src/components/NetworkDropdown.tsx
index c1a0a34..9c9fc7c 100644
--- a/src/components/NetworkDropdown.tsx
+++ b/src/components/NetworkDropdown.tsx
@@ -11,9 +11,9 @@ const NetworkDropdown = ({ updateNetwork }: NetworkDropdownProps) => {
 
   const [expanded, setExpanded] = useState<boolean>(false);
 
-  const handleNetworkPress = (networksData: NetworksDataState) => {
-    updateNetwork(networksData);
-    setSelectedNetwork(networksData);
+  const handleNetworkPress = (networkData: NetworksDataState) => {
+    updateNetwork(networkData);
+    setSelectedNetwork(networkData);
     setExpanded(false);
   };
 
diff --git a/src/components/PairingModal.tsx b/src/components/PairingModal.tsx
index a9b0b90..d29bc6a 100644
--- a/src/components/PairingModal.tsx
+++ b/src/components/PairingModal.tsx
@@ -172,7 +172,7 @@ const PairingModal = ({
 
   return (
     <Modal visible={visible} animationType="slide" transparent>
-      <View style={{ flex: 1 }}>
+      <View style={styles.modalOuterContainer}>
         <View style={styles.modalContentContainer}>
           <ScrollView showsVerticalScrollIndicator={true}>
             <View style={styles.container}>
diff --git a/src/screens/AddNetwork.tsx b/src/screens/AddNetwork.tsx
index 3ddb10c..6562d48 100644
--- a/src/screens/AddNetwork.tsx
+++ b/src/screens/AddNetwork.tsx
@@ -156,7 +156,6 @@ const AddNetwork = () => {
   }, [namespace, reset]);
 
   return (
-    // TODO: get form data from json file
     <ScrollView contentContainerStyle={styles.signPage}>
       <SelectNetworkType updateNetworkType={updateNetworkType} />
 
@@ -171,7 +170,7 @@ const AddNetwork = () => {
               value={value}
               label="Chain ID"
               onBlur={onBlur}
-              onChangeText={value => onChange(value)}
+              onChangeText={textValue => onChange(textValue)}
             />
             <HelperText type="error">{errors.chainId?.message}</HelperText>
           </>
@@ -188,7 +187,7 @@ const AddNetwork = () => {
               label="Network Name"
               value={value}
               onBlur={onBlur}
-              onChangeText={value => onChange(value)}
+              onChangeText={textValue => onChange(textValue)}
             />
             <HelperText type="error">{errors.networkName?.message}</HelperText>
           </>
@@ -205,7 +204,7 @@ const AddNetwork = () => {
               label="New RPC URL"
               onBlur={onBlur}
               value={value}
-              onChangeText={value => onChange(value)}
+              onChangeText={textValue => onChange(textValue)}
             />
             <HelperText type="error">{errors.rpcUrl?.message}</HelperText>
           </>
@@ -223,7 +222,7 @@ const AddNetwork = () => {
               value={value}
               label="Block Explorer URL  (Optional)"
               onBlur={onBlur}
-              onChangeText={value => onChange(value)}
+              onChangeText={textValue => onChange(textValue)}
             />
             <HelperText type="error">
               {errors.blockExplorerUrl?.message}
@@ -260,7 +259,7 @@ const AddNetwork = () => {
                 value={value}
                 label="Currency Symbol"
                 onBlur={onBlur}
-                onChangeText={value => onChange(value)}
+                onChangeText={textValue => onChange(textValue)}
               />
               <HelperText type="error">
                 {errors.currencySymbol?.message}
@@ -281,7 +280,7 @@ const AddNetwork = () => {
                   value={value}
                   label="Native Denom"
                   onBlur={onBlur}
-                  onChangeText={value => onChange(value)}
+                  onChangeText={textValue => onChange(textValue)}
                 />
                 <HelperText type="error">
                   {errors.nativeDenom?.message}
@@ -300,7 +299,7 @@ const AddNetwork = () => {
                   value={value}
                   label="Address Prefix"
                   onBlur={onBlur}
-                  onChangeText={value => onChange(value)}
+                  onChangeText={textValue => onChange(textValue)}
                 />
                 <HelperText type="error">
                   {errors.addressPrefix?.message}
diff --git a/src/screens/AddSession.tsx b/src/screens/AddSession.tsx
index 723298e..a54c006 100644
--- a/src/screens/AddSession.tsx
+++ b/src/screens/AddSession.tsx
@@ -102,7 +102,7 @@ const AddSession = () => {
               value={currentWCURI}
               numberOfLines={4}
               multiline={true}
-              style={{ padding: 10 }}
+              style={styles.walletConnectUriText}
             />
 
             <View style={styles.signButton}>
diff --git a/src/screens/ApproveTransaction.tsx b/src/screens/ApproveTransaction.tsx
index d6412dd..b428b2f 100644
--- a/src/screens/ApproveTransaction.tsx
+++ b/src/screens/ApproveTransaction.tsx
@@ -175,7 +175,10 @@ const ApproveTransaction = ({ route }: SignRequestProps) => {
   };
 
   useEffect(() => {
-    const getAccountBalance = async (account: Account) => {
+    const getAccountBalance = async () => {
+      if (!account) {
+        return;
+      }
       if (namespace === EIP155) {
         const fetchedBalance =
           provider && (await provider.getBalance(account.address));
@@ -191,9 +194,7 @@ const ApproveTransaction = ({ route }: SignRequestProps) => {
       }
     };
 
-    if (account) {
-      getAccountBalance(account);
-    }
+    getAccountBalance();
   }, [account, provider, namespace, cosmosStargateClient, requestedChain]);
 
   useEffect(() => {
diff --git a/src/screens/HomeScreen.tsx b/src/screens/HomeScreen.tsx
index b6db8be..453e29b 100644
--- a/src/screens/HomeScreen.tsx
+++ b/src/screens/HomeScreen.tsx
@@ -22,7 +22,7 @@ import { useNetworks } from '../context/NetworksContext';
 const WCLogo = () => {
   return (
     <Image
-      style={{ width: 24, height: 15, margin: 0 }}
+      style={styles.walletConnectLogo}
       source={require('../assets/WalletConnect-Icon-Blueberry.png')}
     />
   );
@@ -40,6 +40,7 @@ const HomeScreen = () => {
   useEffect(() => {
     if (accounts.length > 0) {
       navigation.setOptions({
+        // eslint-disable-next-line react/no-unstable-nested-components
         headerRight: () => (
           <Button onPress={() => navigation.navigate('WalletConnect')}>
             {<WCLogo />}
@@ -107,8 +108,8 @@ const HomeScreen = () => {
     hideResetDialog();
   };
 
-  const updateNetwork = (networksData: NetworksDataState) => {
-    setSelectedNetwork(networksData);
+  const updateNetwork = (networkData: NetworksDataState) => {
+    setSelectedNetwork(networkData);
     setCurrentIndex(0);
   };
 
diff --git a/src/screens/SignRequest.tsx b/src/screens/SignRequest.tsx
index 9357145..861272f 100644
--- a/src/screens/SignRequest.tsx
+++ b/src/screens/SignRequest.tsx
@@ -106,12 +106,12 @@ const SignRequest = ({ route }: SignRequestProps) => {
       const regex = /^\/sign\/(eip155|cosmos)\/(.+)\/(.+)\/(.+)$/;
       const match = path.match(regex);
       if (match) {
-        const [, namespace, chainId, address, message] = match;
+        const [, pathNamespace, pathChainId, pathAddress, pathMessage] = match;
         return {
-          namespace,
-          chainId,
-          address,
-          message,
+          namespace: pathNamespace,
+          chainId: pathChainId,
+          address: pathAddress,
+          message: pathMessage,
         };
       } else {
         navigation.navigate('InvalidPath');
diff --git a/src/screens/WalletConnect.tsx b/src/screens/WalletConnect.tsx
index 3955009..8dc3a0e 100644
--- a/src/screens/WalletConnect.tsx
+++ b/src/screens/WalletConnect.tsx
@@ -31,18 +31,19 @@ export default function WalletConnect() {
     <View>
       {Object.keys(activeSessions).length > 0 ? (
         <>
-          <View style={{ marginLeft: 12, marginTop: 12 }}>
+          <View style={styles.sessionsContainer}>
             <Text variant="titleMedium">Active Sessions</Text>
           </View>
           <List.Section>
             {Object.entries(activeSessions).map(([sessionId, session]) => (
               <List.Item
-                style={{ paddingLeft: 12, borderBottomWidth: 0.5 }}
+                style={styles.sessionItem}
                 key={sessionId}
                 title={`${session.peer.metadata.name}`}
                 descriptionNumberOfLines={7}
-                //TODO: Refactor
                 description={`${sessionId} \n\n${session.peer.metadata.url}\n\n${session.peer.metadata.description}`}
+                // reference: https://github.com/react-navigation/react-navigation/issues/11371#issuecomment-1546543183
+                // eslint-disable-next-line react/no-unstable-nested-components
                 left={() => (
                   <>
                     {session.peer.metadata.icons[0].endsWith('.svg') ? (
@@ -61,10 +62,11 @@ export default function WalletConnect() {
                     )}
                   </>
                 )}
+                // eslint-disable-next-line react/no-unstable-nested-components
                 right={() => (
                   <TouchableOpacity
                     onPress={() => disconnect(sessionId)}
-                    style={{ display: 'flex', justifyContent: 'center' }}>
+                    style={styles.disconnectSession}>
                     <List.Icon icon="close" />
                   </TouchableOpacity>
                 )}
@@ -73,7 +75,7 @@ export default function WalletConnect() {
           </List.Section>
         </>
       ) : (
-        <View style={{ display: 'flex', alignItems: 'center', marginTop: 12 }}>
+        <View style={styles.noActiveSessions}>
           <Text>You have no active sessions</Text>
         </View>
       )}
diff --git a/src/styles/stylesheet.js b/src/styles/stylesheet.js
index d2fa756..9c0f150 100644
--- a/src/styles/stylesheet.js
+++ b/src/styles/stylesheet.js
@@ -178,6 +178,7 @@ const styles = StyleSheet.create({
     backgroundColor: 'white',
     bottom: 0,
   },
+  modalOuterContainer: { flex: 1 },
   dappLogo: {
     width: 50,
     height: 50,
@@ -258,6 +259,12 @@ const styles = StyleSheet.create({
   balancePadding: {
     padding: 8,
   },
+  noActiveSessions: { display: 'flex', alignItems: 'center', marginTop: 12 },
+  disconnectSession: { display: 'flex', justifyContent: 'center' },
+  sessionItem: { paddingLeft: 12, borderBottomWidth: 0.5 },
+  sessionsContainer: { paddingLeft: 12, borderBottomWidth: 0.5 },
+  walletConnectUriText: { padding: 10 },
+  walletConnectLogo: { width: 24, height: 15, margin: 0 },
 });
 
 export default styles;
diff --git a/src/utils/accounts.ts b/src/utils/accounts.ts
index 1f548cb..0eff299 100644
--- a/src/utils/accounts.ts
+++ b/src/utils/accounts.ts
@@ -97,10 +97,7 @@ const addAccountFromHDPath = async (
   networkData: NetworksDataState,
 ): Promise<Account | undefined> => {
   try {
-    const account = await accountInfoFromHDPath(
-      hdPath,
-      networkData.addressPrefix,
-    );
+    const account = await accountInfoFromHDPath(hdPath, networkData);
     if (!account) {
       throw new Error('Error while creating account');
     }
@@ -243,7 +240,7 @@ const resetWallet = async () => {
 
 const accountInfoFromHDPath = async (
   hdPath: string,
-  prefix: string = COSMOS,
+  networkData: NetworksDataState,
 ): Promise<
   { privKey: string; pubKey: string; address: string } | undefined
 > => {
@@ -259,18 +256,16 @@ const accountInfoFromHDPath = async (
   const privKey = node.privateKey;
   const pubKey = node.publicKey;
 
-  const parts = hdPath.split('/');
-  const coinType = parts[2];
-
   let address: string;
 
-  switch (coinType) {
-    case "60'":
+  switch (networkData.namespace) {
+    case EIP155:
       address = node.address;
       break;
-    case "118'":
-      address = (await getCosmosAccounts(mnemonic, hdPath, prefix)).data
-        .address;
+    case COSMOS:
+      address = (
+        await getCosmosAccounts(mnemonic, hdPath, networkData.addressPrefix)
+      ).data.address;
       break;
     default:
       throw new Error('Invalid wallet type');