From ad202f46fc47ecebcf10c3dc47634eff708013a0 Mon Sep 17 00:00:00 2001
From: IshaVenikar <145848618+IshaVenikar@users.noreply.github.com>
Date: Mon, 22 Apr 2024 10:53:28 +0530
Subject: [PATCH] Fix Edit network form (#108)

* Make block explorer url optional

* Make review changes

* Remove log
---
 src/screens/AddNetwork.tsx  | 11 ++++-------
 src/screens/EditNetwork.tsx | 15 +++++----------
 src/utils/constants.ts      |  2 ++
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/src/screens/AddNetwork.tsx b/src/screens/AddNetwork.tsx
index c1ab657..0abf8d7 100644
--- a/src/screens/AddNetwork.tsx
+++ b/src/screens/AddNetwork.tsx
@@ -62,14 +62,13 @@ const AddNetwork = () => {
   const { setNetworksData } = useNetworks();
 
   const [namespace, setNamespace] = useState<string>(EIP155);
-  const [isLoading, setIsLoading] = useState(false);
 
   const networksFormDataSchema =
     namespace === EIP155 ? ethNetworkDataSchema : cosmosNetworkDataSchema;
 
   const {
     control,
-    formState: { errors },
+    formState: { errors, isSubmitting },
     handleSubmit,
     setValue,
     reset,
@@ -118,7 +117,6 @@ const AddNetwork = () => {
 
   const submit = useCallback(
     async (data: z.infer<typeof networksFormDataSchema>) => {
-      setIsLoading(true);
       const newNetworkData = {
         ...data,
         namespace,
@@ -181,7 +179,6 @@ const AddNetwork = () => {
         ),
       ]);
 
-      setIsLoading(false);
       navigation.navigate('Laconic');
     },
     [navigation, namespace, setNetworksData],
@@ -366,10 +363,10 @@ const AddNetwork = () => {
       )}
       <Button
         mode="contained"
-        loading={isLoading}
-        disabled={isLoading}
+        loading={isSubmitting}
+        disabled={isSubmitting}
         onPress={handleSubmit(submit)}>
-        {isLoading ? 'Adding' : 'Submit'}
+        {isSubmitting ? 'Adding' : 'Submit'}
       </Button>
     </ScrollView>
   );
diff --git a/src/screens/EditNetwork.tsx b/src/screens/EditNetwork.tsx
index ef787c8..63c48c0 100644
--- a/src/screens/EditNetwork.tsx
+++ b/src/screens/EditNetwork.tsx
@@ -1,4 +1,4 @@
-import React, { useCallback, useState } from 'react';
+import React, { useCallback } from 'react';
 import { ScrollView, View } from 'react-native';
 import { useForm, Controller } from 'react-hook-form';
 import { TextInput, Button, HelperText, Text } from 'react-native-paper';
@@ -30,15 +30,13 @@ const networksFormDataSchema = z.object({
 type EditNetworkProps = NativeStackScreenProps<StackParamsList, 'EditNetwork'>;
 
 const EditNetwork = ({ route }: EditNetworkProps) => {
-  const [isLoading, setIsLoading] = useState(false);
-
   const { setNetworksData } = useNetworks();
   const navigation =
     useNavigation<NativeStackNavigationProp<StackParamsList>>();
 
   const {
     control,
-    formState: { errors },
+    formState: { errors, isSubmitting },
     handleSubmit,
   } = useForm<z.infer<typeof networksFormDataSchema>>({
     mode: 'onChange',
@@ -48,8 +46,6 @@ const EditNetwork = ({ route }: EditNetworkProps) => {
 
   const submit = useCallback(
     async (data: z.infer<typeof networksFormDataSchema>) => {
-      setIsLoading(true);
-
       const retrievedNetworksData = await retrieveNetworksData();
 
       const newNetworkData = { ...networkData, ...data };
@@ -67,7 +63,6 @@ const EditNetwork = ({ route }: EditNetworkProps) => {
 
       setNetworksData(retrievedNetworksData);
 
-      setIsLoading(false);
       navigation.navigate('Laconic');
     },
     [networkData, navigation, setNetworksData],
@@ -136,10 +131,10 @@ const EditNetwork = ({ route }: EditNetworkProps) => {
       />
       <Button
         mode="contained"
-        loading={isLoading}
-        disabled={isLoading}
+        loading={isSubmitting}
+        disabled={isSubmitting}
         onPress={handleSubmit(submit)}>
-        {isLoading ? 'Adding' : 'Submit'}
+        {isSubmitting ? 'Adding' : 'Submit'}
       </Button>
     </ScrollView>
   );
diff --git a/src/utils/constants.ts b/src/utils/constants.ts
index aea8e6a..4170a6c 100644
--- a/src/utils/constants.ts
+++ b/src/utils/constants.ts
@@ -9,6 +9,7 @@ export const DEFAULT_NETWORKS = [
     networkName: EIP155_CHAINS['eip155:1'].name,
     namespace: EIP155,
     rpcUrl: EIP155_CHAINS['eip155:1'].rpc,
+    blockExplorerUrl: '',
     currencySymbol: 'ETH',
     coinType: '60',
     isDefault: true,
@@ -18,6 +19,7 @@ export const DEFAULT_NETWORKS = [
     networkName: COSMOS_TESTNET_CHAINS['cosmos:theta-testnet-001'].name,
     namespace: COSMOS,
     rpcUrl: COSMOS_TESTNET_CHAINS['cosmos:theta-testnet-001'].rpc,
+    blockExplorerUrl: '',
     nativeDenom: 'uatom',
     addressPrefix: 'cosmos',
     coinType: '118',