wip: fixes & server list

app/LoadingApp/LoadingApp.tsx

@@ -1661,6 +1661,7 @@ export class LoadingAppClass extends Component<
               setIndexerServer={this.setIndexerServer}
               checkIndexerServer={this.checkIndexerServer}
               closeServers={this.closeServers}
+              previousServer={this.state.indexerServer.uri}
             />
           )}
           {screen === 1 && (

app/LoadingApp/components/ConnectIndexer.tsx

@@ -82,7 +82,14 @@ const ConnectIndexer: React.FunctionComponent<ConnectIndexerProps> = ({
 
   const custom: boolean =
     serverUris().filter(s => s.uri === indexerServerContext.uri).length === 0;
-  const { base, port } = parseUri(indexerServerContext.uri);
+  const { base, port } = parseUri(
+    `${
+      !indexerServerContext.uri.toLowerCase().startsWith(GlobalConst.http) &&
+      !indexerServerContext.uri.toLowerCase().startsWith(GlobalConst.https)
+        ? GlobalConst.http + '//' + indexerServerContext.uri
+        : indexerServerContext.uri
+    }`,
+  );
 
   const [indexerServerUriLocal, setIndexerServerUriLocal] = useState<string>(
     custom ? base : '',
@@ -116,7 +123,13 @@ const ConnectIndexer: React.FunctionComponent<ConnectIndexerProps> = ({
             : (translate('info.unknown') as string) + ' (' + chain + ')';
   };
 
-  //console.log('Render Servers', insets);
+  console.log(
+    'Render Servers',
+    indexerServerContext,
+    indexerServerUriLocal,
+    indexerServerPortLocal,
+    indexerServerChainNameLocal,
+  );
 
   return (
     <ToastProvider>
@@ -523,12 +536,6 @@ const ConnectIndexer: React.FunctionComponent<ConnectIndexerProps> = ({
                 setConnected(null);
                 setBorderColor('transparent');
                 // add http if it not have it
-                if (
-                  !indexerServerUriLocal
-                    .toLowerCase()
-                    .startsWith(GlobalConst.http)
-                ) {
-                }
                 const {
                   result: _connected,
                   indexerServerUriParsed: _indexerServerUri,

app/LoadingApp/components/SelectNetwork.tsx

@@ -77,7 +77,7 @@ const SelectNetwork: React.FunctionComponent<SelectNetworkProps> = ({
     };
   }, []);
 
-  console.log('Render Select Network', indexerServerContext);
+  console.log('Render Select Network', fromSettings);
 
   return (
     <ToastProvider>

app/LoadingApp/components/ServerListScreen.tsx

@@ -38,6 +38,7 @@ export type ServerListScreenProps = {
   indexerList: IndexerList;
   closeServers: () => void;
   goBack: () => void;
+  previousServer?: string;
 };
 
 export const ServerListScreen: React.FC<ServerListScreenProps> = ({
@@ -46,12 +47,19 @@ export const ServerListScreen: React.FC<ServerListScreenProps> = ({
   indexerList,
   closeServers,
   goBack,
+  previousServer,
 }) => {
   const { colors } = useTheme() as unknown as ThemeType; // TODO: FIX
   const insets = useSafeAreaInsets();
   const { clear } = useToast();
 
-  const [selectedServer, setSelectedServer] = useState<Indexer | null>(null);
+  const prevIndexer = indexerList.find(
+    indexer => indexer.url === previousServer,
+  );
+
+  const [selectedServer, setSelectedServer] = useState<Indexer | null>(
+    prevIndexer ? prevIndexer : null,
+  );
   const [connected, setConnected] = useState<boolean | null>(null);
   const [borderColor, setBorderColor] = useState<string>('transparent');
   const [isTestingSelected, setIsTestingSelected] = useState(false);
@@ -116,7 +124,6 @@ export const ServerListScreen: React.FC<ServerListScreenProps> = ({
         title="Connect to indexer"
         goBack={() => {
           clear();
-
           goBack();
         }}
       />

app/utils/Utils.ts

@@ -596,3 +596,7 @@ export async function getIndexerList(): Promise<IndexerList> {
   console.log('json', json.data.indexers);
   return json.data.indexers;
 }
+
+export function formatAmount(value: number) {
+  return `${value.toFixed(2)} cTAZ`;
+}

components/Staking/Finalizers/FinalizerPosition.tsx

@@ -9,6 +9,7 @@ import {
   ViewStyle,
 } from 'react-native';
 import { WalletBondsStatusEnum } from '../../../app/AppState/enums/WalletBondsStatusEnum';
+import { formatAmount } from '../../../app/utils/Utils';
 
 export default interface WalletBondsType {
   txid: string;
@@ -37,10 +38,6 @@ type WalletBondCardProps = {
   secondaryButtonStyle?: StyleProp<ViewStyle>;
 };
 
-function formatAmount(value: number) {
-  return `${value.toFixed(2)} cTAZ`;
-}
-
 function truncateMiddle(value: string, start = 10, end = 8) {
   if (!value) return '';
   if (value.length <= start + end + 3) return value;

components/Staking/components/Redelegate.tsx

@@ -42,6 +42,7 @@ import Refresh from '../../../assets/icons/refresh.svg';
 import RegText from '../../Components/RegText';
 import { WalletBondsStatusEnum } from '../../../app/AppState/enums/WalletBondsStatusEnum';
 import ZecAmount from '../../Components/ZecAmount';
+import { ChevronRight } from 'lucide-react-native';
 
 type ModalState = 'idle' | 'sending' | 'success';
 
@@ -322,30 +323,18 @@ const Redelegate: React.FC<RedelegateProps> = ({ route }) => {
           }}
         />
 
-        <Text
-          style={{
-            fontSize: 16,
-            fontWeight: '600',
-            color: colors.text,
-            marginBottom: 8,
-            marginTop: 15,
-            marginHorizontal: 20,
-          }}
-        >
-          Finalizers addresses
-        </Text>
         <View
           style={{
             flexDirection: 'row',
             justifyContent: 'space-between',
             alignItems: 'center',
             borderRadius: 20,
             marginBottom: 10,
-            backgroundColor: colors.secondary,
             padding: 16,
             marginHorizontal: 10,
+            marginTop: 20,
             borderWidth: 0.5,
-            borderColor: colors.text,
+            borderColor: '#575757',
           }}
         >
           <View
@@ -418,7 +407,7 @@ const Redelegate: React.FC<RedelegateProps> = ({ route }) => {
               </View>
               {!!stakedFromNumber && (
                 <FadeText
-                  style={{ marginLeft: 15, marginBottom: 5 }}
+                  style={{ marginBottom: 5 }}
                 >{`Staked: ${stakedFromNumber.toFixed(5)} ${info.currencyName}`}</FadeText>
               )}
             </View>
@@ -470,11 +459,12 @@ const Redelegate: React.FC<RedelegateProps> = ({ route }) => {
             alignItems: 'center',
             borderRadius: 20,
             marginBottom: 10,
-            backgroundColor: colors.secondary,
+            backgroundColor: '#161616',
+
             padding: 16,
             marginHorizontal: 10,
             borderWidth: 0.5,
-            borderColor: colors.text,
+            borderColor: '#575757',
             marginTop: -15,
           }}
         >
@@ -552,7 +542,7 @@ const Redelegate: React.FC<RedelegateProps> = ({ route }) => {
               )}
             </View>
           </View>
-          <ChevronDown
+          <ChevronRight
             onPress={() =>
               navigation.navigate(RouteEnum.Finalizers, {
                 setFinalizer: (f: string, s: number) => {

components/Staking/components/Unstake.tsx

@@ -335,11 +335,11 @@ const Unstake: React.FC<UnstakeProps> = ({ route }) => {
             alignItems: 'center',
             borderRadius: 20,
             marginBottom: 10,
-            backgroundColor: colors.secondary,
+            backgroundColor: '#161616',
             padding: 16,
             marginHorizontal: 10,
             borderWidth: 0.5,
-            borderColor: colors.text,
+            borderColor: '#575757',
           }}
         >
           <View
@@ -412,7 +412,7 @@ const Unstake: React.FC<UnstakeProps> = ({ route }) => {
               </View>
               {!!stakedFromNumber && (
                 <FadeText
-                  style={{ marginLeft: 15, marginBottom: 5 }}
+                  style={{ marginBottom: 5 }}
                 >{`Staked: ${stakedFromNumber.toFixed(5)} ${info.currencyName}`}</FadeText>
               )}
             </View>