From f41dca375da1903a2fb524feedf3c0e6a1002091 Mon Sep 17 00:00:00 2001
From: dorianvp <dorianvp@zingolabs.org>
Date: Mon, 13 Apr 2026 16:47:14 +0100
Subject: [PATCH 1/5] fix: correct network

---
 app/LoadingApp/components/ConnectIndexer.tsx |  2 +-
 app/LoadingApp/components/SelectNetwork.tsx  | 24 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/app/LoadingApp/components/ConnectIndexer.tsx b/app/LoadingApp/components/ConnectIndexer.tsx
index c3882f60c..3c880b4af 100644
--- a/app/LoadingApp/components/ConnectIndexer.tsx
+++ b/app/LoadingApp/components/ConnectIndexer.tsx
@@ -317,7 +317,7 @@ const ConnectIndexer: React.FunctionComponent<ConnectIndexerProps> = ({
               }}
             >
               <TextInput
-                placeholder={'e.g. 18232'}
+                placeholder={'e.g. 18234'}
                 placeholderTextColor={colors.placeholder}
                 style={{
                   flexGrow: 1,
diff --git a/app/LoadingApp/components/SelectNetwork.tsx b/app/LoadingApp/components/SelectNetwork.tsx
index bd563c43e..258edf29d 100644
--- a/app/LoadingApp/components/SelectNetwork.tsx
+++ b/app/LoadingApp/components/SelectNetwork.tsx
@@ -22,6 +22,7 @@ import { faChevronRight } from '@fortawesome/free-solid-svg-icons';
 import ComputerBlue from '../../../assets/icons/computer-blue.svg';
 import ComputerWhite from '../../../assets/icons/computer-white.svg';
 import { HeaderTitle } from '../../../components/Header';
+import { serverUris } from '../../uris';
 
 type SelectNetworkProps = {
   actionButtonsDisabled: boolean;
@@ -42,6 +43,7 @@ const SelectNetwork: React.FunctionComponent<SelectNetworkProps> = ({
   fromSettings,
   goConnectIndexer,
   goAvailableServers,
+  setIndexerServer,
 }) => {
   const context = useContext(ContextAppLoading);
   const {
@@ -54,6 +56,16 @@ const SelectNetwork: React.FunctionComponent<SelectNetworkProps> = ({
   const screenName = ScreenEnum.Servers;
 
   const [kbOpen, setKbOpen] = useState(false);
+  const [indexerServerUriLocal, setIndexerServerUriLocal] = useState<string>(
+    indexerServerContext.uri ? indexerServerContext.uri : serverUris()[0].uri,
+  );
+
+  const [indexerServerChainNameLocal, setIndexerServerChainNameLocal] =
+    useState<ChainNameEnum>(
+      indexerServerContext.uri
+        ? indexerServerContext.chainName
+        : serverUris()[0].chainName,
+    );
 
   const insets = useSafeAreaInsets();
 
@@ -231,6 +243,11 @@ const SelectNetwork: React.FunctionComponent<SelectNetworkProps> = ({
             style={{ width: '100%' }}
             disabled={actionButtonsDisabled}
             onPress={() => {
+              setIndexerServerChainNameLocal(ChainNameEnum.testChainName);
+              setIndexerServer(
+                indexerServerUriLocal,
+                ChainNameEnum.testChainName,
+              );
               goConnectIndexer();
             }}
           >
@@ -323,6 +340,13 @@ const SelectNetwork: React.FunctionComponent<SelectNetworkProps> = ({
                 hitSlop={{ top: 10, bottom: 10, left: 10, right: 10 }}
                 disabled={actionButtonsDisabled}
                 onPress={() => {
+                  setIndexerServerChainNameLocal(
+                    ChainNameEnum.regtestChainName,
+                  );
+                  setIndexerServer(
+                    indexerServerUriLocal,
+                    ChainNameEnum.regtestChainName,
+                  );
                   goConnectIndexer();
                 }}
               >

From 68a8877914fd1203ad9e0cae99ed32941c03596d Mon Sep 17 00:00:00 2001
From: dorianvp <dorianvp@zingolabs.org>
Date: Mon, 13 Apr 2026 16:47:30 +0100
Subject: [PATCH 2/5] fix lint errors

---
 app/LoadingApp/components/SelectNetwork.tsx | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/LoadingApp/components/SelectNetwork.tsx b/app/LoadingApp/components/SelectNetwork.tsx
index 258edf29d..c0b3db6ee 100644
--- a/app/LoadingApp/components/SelectNetwork.tsx
+++ b/app/LoadingApp/components/SelectNetwork.tsx
@@ -56,16 +56,15 @@ const SelectNetwork: React.FunctionComponent<SelectNetworkProps> = ({
   const screenName = ScreenEnum.Servers;
 
   const [kbOpen, setKbOpen] = useState(false);
-  const [indexerServerUriLocal, setIndexerServerUriLocal] = useState<string>(
+  const [indexerServerUriLocal] = useState<string>(
     indexerServerContext.uri ? indexerServerContext.uri : serverUris()[0].uri,
   );
 
-  const [indexerServerChainNameLocal, setIndexerServerChainNameLocal] =
-    useState<ChainNameEnum>(
-      indexerServerContext.uri
-        ? indexerServerContext.chainName
-        : serverUris()[0].chainName,
-    );
+  const [, setIndexerServerChainNameLocal] = useState<ChainNameEnum>(
+    indexerServerContext.uri
+      ? indexerServerContext.chainName
+      : serverUris()[0].chainName,
+  );
 
   const insets = useSafeAreaInsets();
 

From 17a064d491efcb81159b4062ca005728ce1d4ae1 Mon Sep 17 00:00:00 2001
From: dorianvp <dorianvp@zingolabs.org>
Date: Mon, 13 Apr 2026 16:57:43 +0100
Subject: [PATCH 3/5] finalizer detail pre-fix

---
 app/LoadingApp/components/ServerListScreen.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/LoadingApp/components/ServerListScreen.tsx b/app/LoadingApp/components/ServerListScreen.tsx
index 5cba12f87..68791a5bc 100644
--- a/app/LoadingApp/components/ServerListScreen.tsx
+++ b/app/LoadingApp/components/ServerListScreen.tsx
@@ -142,7 +142,7 @@ export const ServerListScreen: React.FC<ServerListScreenProps> = ({
       <View
         style={{
           marginHorizontal: 16,
-          borderRadius: 14,
+          borderRadius: 26,
           overflow: 'hidden',
           backgroundColor: IOS_GROUP_BG,
         }}

From 815f0edb43463c297a54c28ea0af9b57cc45fa10 Mon Sep 17 00:00:00 2001
From: dorianvp <dorianvp@zingolabs.org>
Date: Mon, 13 Apr 2026 17:00:28 +0100
Subject: [PATCH 4/5] fix: scrollview

---
 .../Staking/Finalizers/FinalizerDetail.tsx    | 248 +++++++++---------
 1 file changed, 123 insertions(+), 125 deletions(-)

diff --git a/components/Staking/Finalizers/FinalizerDetail.tsx b/components/Staking/Finalizers/FinalizerDetail.tsx
index 19e032822..c711281e6 100644
--- a/components/Staking/Finalizers/FinalizerDetail.tsx
+++ b/components/Staking/Finalizers/FinalizerDetail.tsx
@@ -145,155 +145,153 @@ export function FinalizerDetail({ route }: FinalizerDetailProps) {
   };
 
   return (
-    <TouchableWithoutFeedback onPress={Keyboard.dismiss} accessible={false}>
-      <KeyboardAvoidingView
+    <KeyboardAvoidingView
+      style={{
+        flex: 1,
+        backgroundColor: colors.background,
+        gap: 20,
+      }}
+      behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
+      keyboardVerticalOffset={
+        Platform.OS === 'ios' ? insets.top : kbOpen ? insets.top : 0
+      }
+    >
+      <HeaderTitle
+        title="Finalizer Details"
+        goBack={() => {
+          if (navigation.canGoBack()) {
+            navigation.goBack();
+          }
+        }}
+        ExtraComponent={<StakingDayBubble />}
+      />
+
+      <FinalizerCard
+        containerStyle={{
+          marginHorizontal: 20,
+        }}
+        lifehash={lifehash || ''}
+        finalizerId={finalizer || ''}
+        userStake={totalUserStaked}
+        totalStake={totalStakedFinalizer}
+      />
+
+      {/* Content */}
+      <View
         style={{
           flex: 1,
-          backgroundColor: colors.background,
-          gap: 20,
+          paddingHorizontal: 24,
         }}
-        behavior={Platform.OS === 'ios' ? 'padding' : 'height'}
-        keyboardVerticalOffset={
-          Platform.OS === 'ios' ? insets.top : kbOpen ? insets.top : 0
-        }
       >
-        <HeaderTitle
-          title="Finalizer Details"
-          goBack={() => {
-            if (navigation.canGoBack()) {
-              navigation.goBack();
-            }
-          }}
-          ExtraComponent={<StakingDayBubble />}
-        />
-
-        <FinalizerCard
-          containerStyle={{
-            marginHorizontal: 20,
+        {/* Staked TX list */}
+        <Text
+          style={{
+            fontSize: 16,
+            fontWeight: '600',
+            color: colors.text,
+            marginBottom: 8,
           }}
-          lifehash={lifehash || ''}
-          finalizerId={finalizer || ''}
-          userStake={totalUserStaked}
-          totalStake={totalStakedFinalizer}
-        />
+        >
+          Staking positions
+        </Text>
 
-        {/* Content */}
         <View
           style={{
             flex: 1,
-            paddingHorizontal: 24,
+            marginBottom: 16,
           }}
         >
-          {/* Staked TX list */}
-          <Text
-            style={{
-              fontSize: 16,
-              fontWeight: '600',
-              color: colors.text,
-              marginBottom: 8,
-            }}
-          >
-            Staking positions
-          </Text>
+          <FlatList
+            data={movements}
+            keyExtractor={item => item.txid}
+            renderItem={renderStakedTxItem}
+            ItemSeparatorComponent={renderSeparator}
+            ListEmptyComponent={
+              <Text
+                style={{
+                  color: colors.placeholder,
+                  fontSize: 13,
+                  textAlign: 'center',
+                  marginTop: 16,
+                }}
+              >
+                You don&apos;t have any staking positions that match the
+                currently selected filters.
+              </Text>
+            }
+          />
+        </View>
+      </View>
 
+      {/* Modal */}
+      <Modal
+        visible={modalVisible}
+        transparent
+        animationType="fade"
+        onRequestClose={() => {
+          if (modalState === 'success') {
+            setModalState('idle');
+          }
+        }}
+      >
+        <View style={styles.modalBackdrop}>
           <View
-            style={{
-              flex: 1,
-              marginBottom: 16,
-            }}
+            style={[
+              styles.modalCard,
+              {
+                backgroundColor: colors.background,
+                borderColor: colors.border,
+              },
+            ]}
           >
-            <FlatList
-              data={movements}
-              keyExtractor={item => item.txid}
-              renderItem={renderStakedTxItem}
-              ItemSeparatorComponent={renderSeparator}
-              ListEmptyComponent={
+            {modalState === 'sending' && (
+              <>
+                <ActivityIndicator size="large" color={colors.text} />
                 <Text
                   style={{
-                    color: colors.placeholder,
-                    fontSize: 13,
-                    textAlign: 'center',
                     marginTop: 16,
+                    color: colors.text,
+                    fontSize: 16,
+                    textAlign: 'center',
                   }}
                 >
-                  You don&apos;t have any staking positions that match the
-                  currently selected filters.
+                  Sending unstaking transaction…
                 </Text>
-              }
-            />
-          </View>
-        </View>
+              </>
+            )}
 
-        {/* Modal */}
-        <Modal
-          visible={modalVisible}
-          transparent
-          animationType="fade"
-          onRequestClose={() => {
-            if (modalState === 'success') {
-              setModalState('idle');
-            }
-          }}
-        >
-          <View style={styles.modalBackdrop}>
-            <View
-              style={[
-                styles.modalCard,
-                {
-                  backgroundColor: colors.background,
-                  borderColor: colors.border,
-                },
-              ]}
-            >
-              {modalState === 'sending' && (
-                <>
-                  <ActivityIndicator size="large" color={colors.text} />
-                  <Text
-                    style={{
-                      marginTop: 16,
-                      color: colors.text,
-                      fontSize: 16,
-                      textAlign: 'center',
-                    }}
-                  >
-                    Sending unstaking transaction…
-                  </Text>
-                </>
-              )}
+            {modalState === 'success' && (
+              <>
+                <FontAwesomeIcon
+                  icon={faCheckCircle}
+                  size={40}
+                  color={colors.primary}
+                />
+                <Text
+                  style={{
+                    marginTop: 16,
+                    color: colors.text,
+                    fontSize: 18,
+                    fontWeight: '600',
+                    textAlign: 'center',
+                  }}
+                >
+                  Unstaking request transaction sent!
+                </Text>
 
-              {modalState === 'success' && (
-                <>
-                  <FontAwesomeIcon
-                    icon={faCheckCircle}
-                    size={40}
-                    color={colors.primary}
+                <View style={{ marginTop: 24, alignSelf: 'stretch' }}>
+                  <LiquidPrimaryButton
+                    title="View movements"
+                    onPress={handleViewMovements}
+                    style={{ alignSelf: 'stretch' }}
                   />
-                  <Text
-                    style={{
-                      marginTop: 16,
-                      color: colors.text,
-                      fontSize: 18,
-                      fontWeight: '600',
-                      textAlign: 'center',
-                    }}
-                  >
-                    Unstaking request transaction sent!
-                  </Text>
-
-                  <View style={{ marginTop: 24, alignSelf: 'stretch' }}>
-                    <LiquidPrimaryButton
-                      title="View movements"
-                      onPress={handleViewMovements}
-                      style={{ alignSelf: 'stretch' }}
-                    />
-                  </View>
-                </>
-              )}
-            </View>
+                </View>
+              </>
+            )}
           </View>
-        </Modal>
-      </KeyboardAvoidingView>
-    </TouchableWithoutFeedback>
+        </View>
+      </Modal>
+    </KeyboardAvoidingView>
   );
 }
 

From 551300e51c8f95f50712b57dac3085fb787124cd Mon Sep 17 00:00:00 2001
From: JC <juanky201271@gmail.com>
Date: Mon, 13 Apr 2026 10:22:57 -0600
Subject: [PATCH 5/5] fix: lint format fix

---
 components/Staking/Finalizers/FinalizerDetail.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/components/Staking/Finalizers/FinalizerDetail.tsx b/components/Staking/Finalizers/FinalizerDetail.tsx
index c711281e6..f00fdfb2d 100644
--- a/components/Staking/Finalizers/FinalizerDetail.tsx
+++ b/components/Staking/Finalizers/FinalizerDetail.tsx
@@ -4,7 +4,6 @@ import {
   KeyboardAvoidingView,
   Platform,
   Text,
-  TouchableWithoutFeedback,
   View,
   Modal,
   Keyboard,