From b2d55e59f56e10d96620c8d271b6dba0d075f0ef Mon Sep 17 00:00:00 2001
From: Harsh R <53080940+fullstackninja864@users.noreply.github.com>
Date: Tue, 23 Jan 2024 02:17:28 +0530
Subject: [PATCH] fix(ui-ux): show reset btn on service provider screen without
 edit (#4155)

* fix(ui-ux): fixed address book forgets saved addresses when user switch to custom provider

* fix(ui-ux): show reset btn on service provider screen without edit

* center align convert text in GetDFIScreen

---------

Co-authored-by: Pierre Gee <pierre@cakedefi.com>
---
 .../Portfolio/screens/GetDFIScreen.tsx        |  2 +-
 .../screens/ServiceProviderScreen.tsx         | 73 ++++++++++---------
 2 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/GetDFIScreen.tsx b/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/GetDFIScreen.tsx
index c825eb2c0a..9571e2f3d7 100644
--- a/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/GetDFIScreen.tsx
+++ b/mobile-app/app/screens/AppNavigator/screens/Portfolio/screens/GetDFIScreen.tsx
@@ -252,7 +252,7 @@ function StepThree(): JSX.Element {
               dark={tailwind("bg-mono-dark-v2-00 border-mono-dark-v2-200")}
               light={tailwind("bg-mono-light-v2-00 border-mono-light-v2-200")}
             >
-              <View>
+              <View style={tailwind("flex flex-col items-center")}>
                 <ThemedViewV2
                   style={tailwind(
                     "w-15 h-15 flex flex-row justify-around items-center rounded-full",
diff --git a/mobile-app/app/screens/AppNavigator/screens/Settings/screens/ServiceProviderScreen.tsx b/mobile-app/app/screens/AppNavigator/screens/Settings/screens/ServiceProviderScreen.tsx
index e12fb10b81..0576b041be 100644
--- a/mobile-app/app/screens/AppNavigator/screens/Settings/screens/ServiceProviderScreen.tsx
+++ b/mobile-app/app/screens/AppNavigator/screens/Settings/screens/ServiceProviderScreen.tsx
@@ -46,6 +46,7 @@ export function ServiceProviderScreen({ navigation }: Props): JSX.Element {
     url: dvmUrl,
     defaultUrl: defaultDvmUrl,
     setUrl: setDvmUrl,
+    isCustomUrl,
   } = useServiceProviderContext();
   const { evmUrl, ethRpcUrl, defaultEvmUrl, defaultEthRpcUrl, setCustomUrl } =
     useCustomServiceProviderContext();
@@ -191,41 +192,43 @@ export function ServiceProviderScreen({ navigation }: Props): JSX.Element {
           />
         ))}
       </View>
-      {showActionButtons && (
-        <View
-          style={tailwind("mt-48", {
-            "mt-36": isSmallScreen,
-            "mt-10": customProviders.length > 1,
-          })}
-        >
-          <View style={tailwind("mt-2 px-5 mb-5")}>
-            <Text
-              style={tailwind(
-                "text-orange-v2 font-normal-v2 text-xs text-center",
-              )}
-            >
-              {translate(
-                "screens/ServiceProviderScreen",
-                "Only add URLs that are fully trusted and secured. Adding malicious service providers may result in irrecoverable funds. Proceed at your own risk.",
-              )}
-            </Text>
-          </View>
-          <ButtonV2
-            styleProps="mx-7 mt-2"
-            label={translate("screens/ServiceProviderScreen", "Save changes")}
-            testID="button_submit"
-            onPress={async () => await submitCustomServiceProvider()}
-            disabled={
-              !(
-                urlInputValues.DVM.isValid &&
-                urlInputValues.EVM.isValid &&
-                urlInputValues.ETHRPC.isValid
-              )
-            }
-          />
-          <ResetButton />
-        </View>
-      )}
+      <View
+        style={tailwind("mt-48", {
+          "mt-36": isSmallScreen,
+          "mt-10": customProviders.length > 1,
+        })}
+      >
+        {showActionButtons && (
+          <>
+            <View style={tailwind("mt-2 px-5 mb-5")}>
+              <Text
+                style={tailwind(
+                  "text-orange-v2 font-normal-v2 text-xs text-center",
+                )}
+              >
+                {translate(
+                  "screens/ServiceProviderScreen",
+                  "Only add URLs that are fully trusted and secured. Adding malicious service providers may result in irrecoverable funds. Proceed at your own risk.",
+                )}
+              </Text>
+            </View>
+            <ButtonV2
+              styleProps="mx-7 mt-2"
+              label={translate("screens/ServiceProviderScreen", "Save changes")}
+              testID="button_submit"
+              onPress={async () => await submitCustomServiceProvider()}
+              disabled={
+                !(
+                  urlInputValues.DVM.isValid &&
+                  urlInputValues.EVM.isValid &&
+                  urlInputValues.ETHRPC.isValid
+                )
+              }
+            />
+          </>
+        )}
+        {(showActionButtons || isCustomUrl) && <ResetButton />}
+      </View>
     </ThemedScrollViewV2>
   );
 }