diff --git a/stores/LSPStore.ts b/stores/LSPStore.ts
index dbd38eea5..392e0c303 100644
--- a/stores/LSPStore.ts
+++ b/stores/LSPStore.ts
@@ -19,6 +19,8 @@ export default class LSPStore {
     @observable public feeId: string | undefined;
     @observable public pubkey: string;
     @observable public host: string;
+    @observable public restHost: string;
+    @observable public loading: boolean = true;
     @observable public error: boolean = false;
     @observable public error_msg: string = '';
     @observable public showLspSettings: boolean = false;
@@ -62,6 +64,7 @@ export default class LSPStore {
     public resetLSPS1Data = () => {
         this.createOrderResponse = {};
         this.getInfoData = {};
+        this.loading = true;
     };
 
     getLSPHost = () =>
@@ -321,10 +324,12 @@ export default class LSPStore {
 
         if (data.id === '42') {
             this.getInfoData = data;
+            this.loading = false;
         } else if (data.id === '52') {
             this.getOrderResponse = data;
         } else {
             this.createOrderResponse = data;
+            this.loading = false;
         }
     };
 
@@ -363,7 +368,7 @@ export default class LSPStore {
     };
 
     @action
-    public getinfoREST = (host = 'https://testnet-lsps1.lnolymp.us') => {
+    public getinfoREST = (host: string) => {
         const endpoint = `${host}/api/v1/get_info`;
 
         console.log('Fetching data from:', endpoint);
@@ -373,6 +378,7 @@ export default class LSPStore {
                 if (response.info().status === 200) {
                     const responseData = JSON.parse(response.data);
                     this.getInfoData = responseData;
+                    this.loading = false;
                 } else {
                     throw new Error(
                         `Failed to fetch get_info: ${response.info().status}`
@@ -386,7 +392,7 @@ export default class LSPStore {
     };
 
     @action
-    public createorderREST = (host: string, state: any) => {
+    public createorderREST = (state: any) => {
         const data = JSON.stringify({
             lsp_balance_sat: state.lspBalanceSat,
             client_balance_sat: state.clientBalanceSat,
@@ -402,8 +408,8 @@ export default class LSPStore {
             announce_channel: true,
             public_key: this.pubkey
         });
-        const endpoint = `${host}/api/v1/create_order`;
-
+        this.loading = true;
+        const endpoint = `${state.host}/api/v1/create_order`;
         console.log('Sending data to:', endpoint);
 
         return ReactNativeBlobUtil.fetch(
@@ -417,6 +423,7 @@ export default class LSPStore {
             .then((response) => {
                 const responseData = JSON.parse(response.data);
                 this.createOrderResponse = responseData;
+                this.loading = false;
                 console.log('Response received:', responseData);
             })
             .catch((error) => {
diff --git a/views/Settings/LSPS1/Settings.tsx b/views/Settings/LSPS1/Settings.tsx
index 2e65d455e..2c347a155 100644
--- a/views/Settings/LSPS1/Settings.tsx
+++ b/views/Settings/LSPS1/Settings.tsx
@@ -109,13 +109,12 @@ export default class LSPS1Settings extends React.Component<
                             LSPStore.host = text;
                         }}
                     />
-                    {inputsChanged && (
-                        <Button
-                            containerStyle={{ paddingTop: 30 }}
-                            title="RESET"
-                            onPress={() => this.handleReset()}
-                        />
-                    )}
+
+                    <Button
+                        containerStyle={{ paddingTop: 30 }}
+                        title={inputsChanged ? 'RESET' : 'CONNECT TO OLYMPUS'}
+                        onPress={() => this.handleReset()}
+                    />
                 </View>
             </Screen>
         );
diff --git a/views/Settings/LSPS1/index.tsx b/views/Settings/LSPS1/index.tsx
index 77668982b..cfd936479 100644
--- a/views/Settings/LSPS1/index.tsx
+++ b/views/Settings/LSPS1/index.tsx
@@ -20,6 +20,8 @@ import Screen from '../../../components/Screen';
 import TextInput from '../../../components/TextInput';
 import Button from '../../../components/Button';
 import KeyValue from '../../../components/KeyValue';
+import Switch from '../../../components/Switch';
+import { ErrorMessage } from '../../../components/SuccessErrorMessage';
 import { Row } from '../../../components/layout/Row';
 
 import BackendUtils from '../../../utils/BackendUtils';
@@ -31,6 +33,7 @@ import InvoicesStore from '../../../stores/InvoicesStore';
 import ChannelsStore from '../../../stores/ChannelsStore';
 import SettingsStore from '../../../stores/SettingsStore';
 import { Icon } from 'react-native-elements';
+import LoadingIndicator from '../../../components/LoadingIndicator';
 
 interface LSPS1Props {
     LSPStore: LSPStore;
@@ -49,7 +52,9 @@ interface LSPS1State {
     channelExpiryBlocks: any;
     token: any;
     refundOnchainAddress: any;
+    announceChannel: boolean;
     advancedSettings: boolean;
+    host: string;
 }
 
 @inject('LSPStore', 'ChannelsStore', 'InvoicesStore', 'SettingsStore')
@@ -67,7 +72,9 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
             token: '',
             refundOnchainAddress: 'bc1q3uppthgr2k3wag8w2f3fj03ataenwvwauswudt',
             peer: '03e84a109cd70e57864274932fc87c5e6434c59ebb8e6e7d28532219ba38f7f6df@139.144.22.237:9735',
-            advancedSettings: false
+            advancedSettings: false,
+            host: 'https://testnet-lsps1.lnolymp.us',
+            announceChannel: false
         };
     }
 
@@ -77,7 +84,7 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
         this.connectPeer();
         this.subscribeToCustomMessages();
         this.props.SettingsStore.implementation === 'c-lightning-REST'
-            ? this.props.LSPStore.getinfoREST()
+            ? this.props.LSPStore.getinfoREST(this.state.host)
             : this.sendCustomMessage_lsps1();
     }
 
@@ -121,6 +128,7 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
 
     sendCustomMessage_lsps1() {
         const { LSPStore } = this.props;
+        LSPStore.loading = true;
         const node_pubkey_string: string = LSPStore.pubkey;
         const type = 37913;
         const data = this.encodeMesage({
@@ -148,6 +156,7 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
 
     lsps1_createorder = () => {
         const { LSPStore } = this.props;
+        LSPStore.loading = true;
         const node_pubkey_string: string = LSPStore.pubkey;
         const type = 37913;
         const data = this.encodeMesage({
@@ -165,7 +174,7 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
                 channel_expiry_blocks: parseInt(this.state.channelExpiryBlocks),
                 token: this.state.token,
                 refund_onchain_address: this.state.refundOnchainAddress,
-                announce_channel: true
+                announce_channel: this.state.announceChannel
             },
             id: '420'
         });
@@ -206,7 +215,8 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
     }
 
     render() {
-        const { navigation, LSPStore, InvoicesStore } = this.props;
+        const { navigation, LSPStore, InvoicesStore, SettingsStore } =
+            this.props;
         const { advancedSettings } = this.state;
         const { getInfoData, createOrderResponse } = LSPStore;
         const options = getInfoData?.result?.options || getInfoData?.options;
@@ -261,498 +271,632 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
                     }
                     onBack={() => LSPStore.resetLSPS1Data()}
                 />
-                <ScrollView style={{ flex: 1 }}>
-                    {getInfoData &&
-                        Object.keys(createOrderResponse).length == 0 &&
-                        Object.keys(getInfoData).length > 0 &&
-                        options && (
-                            <View style={{ paddingHorizontal: 20 }}>
-                                {options.max_channel_balance_sat &&
-                                    options.min_channel_balance_sat && (
-                                        <KeyValue
-                                            keyValue="Channel Balance (Sats)"
-                                            value={`${options.min_channel_balance_sat} - ${options.max_channel_balance_sat}`}
-                                        />
-                                    )}
-                                {options.max_initial_client_balance_sat &&
-                                    options.min_initial_client_balance_sat && (
-                                        <KeyValue
-                                            keyValue="Initial Client Balance (Sats)"
-                                            value={`${options.min_initial_client_balance_sat} - ${options.max_initial_client_balance_sat}`}
-                                        />
-                                    )}
-                                {options.max_initial_lsp_balance_sat &&
-                                    options.min_initial_lsp_balance_sat && (
-                                        <KeyValue
-                                            keyValue="Initial LSP Balance (Sats)"
-                                            value={`${options.min_initial_lsp_balance_sat} - ${options.max_initial_lsp_balance_sat}`}
-                                        />
-                                    )}
-                                {options.max_channel_expiry_blocks && (
-                                    <KeyValue
-                                        keyValue="Max Channel Expiry Blocks"
-                                        value={
-                                            options.max_channel_expiry_blocks
-                                        }
-                                    />
-                                )}
-                                {options.min_channel_confirmations && (
-                                    <KeyValue
-                                        keyValue="Min Channel Confirmations"
-                                        value={
-                                            options.min_channel_confirmations
-                                        }
-                                    />
-                                )}
-                                {options.min_onchain_payment_confirmations && (
-                                    <KeyValue
-                                        keyValue="Min Onchain Payment Confirmations"
-                                        value={
-                                            options.min_onchain_payment_confirmations
-                                        }
-                                    />
-                                )}
-                                {options.min_onchain_payment_size_sat && (
-                                    <KeyValue
-                                        keyValue="Min Onchain Payment Size (Sats)"
-                                        value={
-                                            options.min_onchain_payment_size_sat
-                                        }
-                                    />
-                                )}
-                                {options.supports_zero_channel_reserve !==
-                                    null && (
-                                    <KeyValue
-                                        keyValue="Supports Zero Channel Reserve"
-                                        value={
-                                            options.supports_zero_channel_reserve
-                                                ? 'True'
-                                                : 'False'
-                                        }
-                                        color={
-                                            options.supports_zero_channel_reserve
-                                                ? 'green'
-                                                : '#808000'
-                                        }
-                                    />
-                                )}
-                            </View>
-                        )}
-
-                    {createOrderResponse &&
-                        Object.keys(createOrderResponse).length > 0 &&
-                        result &&
-                        payment && (
-                            <View style={{ paddingHorizontal: 20 }}>
-                                {result.announce_channel && (
-                                    <KeyValue
-                                        keyValue="Announce Channel"
-                                        value={
-                                            result.announce_channel
-                                                ? 'True'
-                                                : 'False'
-                                        }
-                                        color={
-                                            result.announce_channel
-                                                ? 'green'
-                                                : '#808000'
-                                        }
-                                    />
-                                )}
-                                {result.channel && (
-                                    <KeyValue
-                                        keyValue="Channel"
-                                        value={result.channel}
-                                    />
-                                )}
-                                {result.channel_expiry_blocks && (
-                                    <KeyValue
-                                        keyValue="Channel Expiry Blocks"
-                                        value={result.channel_expiry_blocks}
-                                    />
-                                )}
-                                {result.client_balance_sat && (
-                                    <KeyValue
-                                        keyValue="Client Balance (SAT)"
-                                        value={result.client_balance_sat}
-                                    />
-                                )}
-                                {result.funding_confirms_within_blocks && (
-                                    <KeyValue
-                                        keyValue="Confirms Within Blocks"
-                                        value={
-                                            result.funding_confirms_within_blocks
-                                        }
-                                    />
-                                )}
-                                {result.created_at && (
-                                    <KeyValue
-                                        keyValue="Created At"
-                                        value={result.created_at}
-                                    />
-                                )}
-                                {result.expires_at && (
-                                    <KeyValue
-                                        keyValue="Expires At"
-                                        value={result.expires_at}
-                                    />
-                                )}
-                                {result.lsp_balance_sat && (
-                                    <KeyValue
-                                        keyValue="LSP Balance (SAT)"
-                                        value={result.lsp_balance_sat}
-                                    />
-                                )}
-                                {result.order_id && (
-                                    <KeyValue
-                                        keyValue="Order ID"
-                                        value={result.order_id}
-                                    />
-                                )}
-                                {result.order_state && (
-                                    <KeyValue
-                                        keyValue="Order State"
-                                        value={result.order_state}
-                                    />
-                                )}
-                                <KeyValue keyValue="PAYMENT:" />
-                                {payment.fee_total_sat && (
-                                    <KeyValue
-                                        keyValue="Fee Total SAT"
-                                        value={payment.fee_total_sat}
-                                    />
-                                )}
-                                {payment.lightning_invoice && (
-                                    <KeyValue
-                                        keyValue="Lightning Invoice"
-                                        value={payment.lightning_invoice}
-                                    />
-                                )}
-                                {payment.state && (
-                                    <KeyValue
-                                        keyValue="State"
-                                        value={payment.state}
-                                    />
-                                )}
-                                {payment.min_fee_for_0conf && (
-                                    <KeyValue
-                                        keyValue="Min Fee for 0 Conf"
-                                        value={payment.min_fee_for_0conf}
-                                    />
-                                )}
-                                {payment.min_onchain_payment_confirmations && (
-                                    <KeyValue
-                                        keyValue="Min Onchain Payment Confirmations"
-                                        value={
-                                            payment.min_onchain_payment_confirmations
-                                        }
-                                    />
-                                )}
-                                {payment.onchain_address && (
-                                    <KeyValue
-                                        keyValue="Onchain Address"
-                                        value={payment.onchain_address}
-                                    />
-                                )}
-                                {payment.onchain_payment && (
-                                    <KeyValue
-                                        keyValue="Onchain Payment"
-                                        value={payment.onchain_payment}
-                                    />
+                <View style={{ paddingHorizontal: 18 }}>
+                    {!LSPStore.pubkey && !LSPStore.host && (
+                        <ErrorMessage message="Node pubkey and host are not set" />
+                    )}
+                </View>
+                {LSPStore.loading ? (
+                    <LoadingIndicator />
+                ) : (
+                    <>
+                        <ScrollView style={{ flex: 1 }}>
+                            {getInfoData &&
+                                Object.keys(createOrderResponse).length == 0 &&
+                                Object.keys(getInfoData).length > 0 &&
+                                options && (
+                                    <View style={{ paddingHorizontal: 20 }}>
+                                        {options.max_channel_balance_sat &&
+                                            options.min_channel_balance_sat && (
+                                                <KeyValue
+                                                    keyValue="Channel Balance (Sats)"
+                                                    value={`${options.min_channel_balance_sat} - ${options.max_channel_balance_sat}`}
+                                                />
+                                            )}
+                                        {options.max_initial_client_balance_sat !==
+                                            '0' &&
+                                            options.min_initial_client_balance_sat !==
+                                                '0' && (
+                                                <KeyValue
+                                                    keyValue="Initial Client Balance (Sats)"
+                                                    value={`${options.min_initial_client_balance_sat} - ${options.max_initial_client_balance_sat}`}
+                                                />
+                                            )}
+
+                                        {options.max_initial_lsp_balance_sat &&
+                                            options.min_initial_lsp_balance_sat && (
+                                                <KeyValue
+                                                    keyValue="Initial LSP Balance (Sats)"
+                                                    value={`${options.min_initial_lsp_balance_sat} - ${options.max_initial_lsp_balance_sat}`}
+                                                />
+                                            )}
+                                        {options.max_channel_expiry_blocks && (
+                                            <KeyValue
+                                                keyValue="Max Channel Expiry Blocks"
+                                                value={
+                                                    options.max_channel_expiry_blocks
+                                                }
+                                            />
+                                        )}
+                                        {options.min_channel_confirmations && (
+                                            <KeyValue
+                                                keyValue="Min Channel Confirmations"
+                                                value={
+                                                    options.min_channel_confirmations
+                                                }
+                                            />
+                                        )}
+                                        {options.min_onchain_payment_confirmations && (
+                                            <KeyValue
+                                                keyValue="Min Onchain Payment Confirmations"
+                                                value={
+                                                    options.min_onchain_payment_confirmations
+                                                }
+                                            />
+                                        )}
+                                        {options.min_onchain_payment_size_sat && (
+                                            <KeyValue
+                                                keyValue="Min Onchain Payment Size (Sats)"
+                                                value={
+                                                    options.min_onchain_payment_size_sat
+                                                }
+                                            />
+                                        )}
+                                        {options.supports_zero_channel_reserve !==
+                                            null && (
+                                            <KeyValue
+                                                keyValue="Supports Zero Channel Reserve"
+                                                value={
+                                                    options.supports_zero_channel_reserve
+                                                        ? 'True'
+                                                        : 'False'
+                                                }
+                                                color={
+                                                    options.supports_zero_channel_reserve
+                                                        ? 'green'
+                                                        : '#808000'
+                                                }
+                                            />
+                                        )}
+                                    </View>
                                 )}
-                                {payment.order_total_sat && (
-                                    <KeyValue
-                                        keyValue="Order Total SAT"
-                                        value={payment.order_total_sat}
-                                    />
+
+                            {createOrderResponse &&
+                                Object.keys(createOrderResponse).length > 0 &&
+                                result &&
+                                payment && (
+                                    <View style={{ paddingHorizontal: 20 }}>
+                                        {result.announce_channel && (
+                                            <KeyValue
+                                                keyValue="Announce Channel"
+                                                value={
+                                                    result.announce_channel
+                                                        ? 'True'
+                                                        : 'False'
+                                                }
+                                                color={
+                                                    result.announce_channel
+                                                        ? 'green'
+                                                        : '#808000'
+                                                }
+                                            />
+                                        )}
+                                        {result.channel && (
+                                            <KeyValue
+                                                keyValue="Channel"
+                                                value={result.channel}
+                                            />
+                                        )}
+                                        {result.channel_expiry_blocks && (
+                                            <KeyValue
+                                                keyValue="Channel Expiry Blocks"
+                                                value={
+                                                    result.channel_expiry_blocks
+                                                }
+                                            />
+                                        )}
+                                        {result.client_balance_sat && (
+                                            <KeyValue
+                                                keyValue="Client Balance (SAT)"
+                                                value={
+                                                    result.client_balance_sat
+                                                }
+                                            />
+                                        )}
+                                        {result.funding_confirms_within_blocks && (
+                                            <KeyValue
+                                                keyValue="Confirms Within Blocks"
+                                                value={
+                                                    result.funding_confirms_within_blocks
+                                                }
+                                            />
+                                        )}
+                                        {result.created_at && (
+                                            <KeyValue
+                                                keyValue="Created At"
+                                                value={result.created_at}
+                                            />
+                                        )}
+                                        {result.expires_at && (
+                                            <KeyValue
+                                                keyValue="Expires At"
+                                                value={result.expires_at}
+                                            />
+                                        )}
+                                        {result.lsp_balance_sat && (
+                                            <KeyValue
+                                                keyValue="LSP Balance (SAT)"
+                                                value={result.lsp_balance_sat}
+                                            />
+                                        )}
+                                        {result.order_id && (
+                                            <KeyValue
+                                                keyValue="Order ID"
+                                                value={result.order_id}
+                                            />
+                                        )}
+                                        {result.order_state && (
+                                            <KeyValue
+                                                keyValue="Order State"
+                                                value={result.order_state}
+                                            />
+                                        )}
+                                        <KeyValue keyValue="PAYMENT:" />
+                                        {payment.fee_total_sat && (
+                                            <KeyValue
+                                                keyValue="Fee Total SAT"
+                                                value={payment.fee_total_sat}
+                                            />
+                                        )}
+                                        {payment.lightning_invoice && (
+                                            <KeyValue
+                                                keyValue="Lightning Invoice"
+                                                value={
+                                                    payment.lightning_invoice
+                                                }
+                                            />
+                                        )}
+                                        {payment.state && (
+                                            <KeyValue
+                                                keyValue="State"
+                                                value={payment.state}
+                                            />
+                                        )}
+                                        {payment.min_fee_for_0conf && (
+                                            <KeyValue
+                                                keyValue="Min Fee for 0 Conf"
+                                                value={
+                                                    payment.min_fee_for_0conf
+                                                }
+                                            />
+                                        )}
+                                        {payment.min_onchain_payment_confirmations && (
+                                            <KeyValue
+                                                keyValue="Min Onchain Payment Confirmations"
+                                                value={
+                                                    payment.min_onchain_payment_confirmations
+                                                }
+                                            />
+                                        )}
+                                        {payment.onchain_address && (
+                                            <KeyValue
+                                                keyValue="Onchain Address"
+                                                value={payment.onchain_address}
+                                            />
+                                        )}
+                                        {payment.onchain_payment && (
+                                            <KeyValue
+                                                keyValue="Onchain Payment"
+                                                value={payment.onchain_payment}
+                                            />
+                                        )}
+                                        {payment.order_total_sat && (
+                                            <KeyValue
+                                                keyValue="Order Total SAT"
+                                                value={payment.order_total_sat}
+                                            />
+                                        )}
+                                    </View>
                                 )}
-                            </View>
-                        )}
-
-                    {Object.keys(createOrderResponse).length == 0 && (
-                        <ScrollView
-                            style={{
-                                flex: 1,
-                                marginTop: 30,
-                                paddingHorizontal: 22
-                            }}
-                        >
-                            <Text
-                                style={{ color: themeColor('secondaryText') }}
-                            >
-                                Initial LSP Balance (Sats)
-                            </Text>
-                            <TextInput
-                                placeholder="LSP Balance (SAT)"
-                                value={this.state.lspBalanceSat}
-                                onChangeText={(text) =>
-                                    this.setState({ lspBalanceSat: text })
-                                }
-                                // style={styles.textInput}
-                            />
 
-                            <TouchableOpacity
-                                onPress={() => {
-                                    this.setState({
-                                        advancedSettings: !advancedSettings
-                                    });
-                                }}
-                            >
-                                <View
+                            {Object.keys(createOrderResponse).length == 0 && (
+                                <ScrollView
                                     style={{
-                                        marginBottom: 10
+                                        flex: 1,
+                                        marginTop: 30,
+                                        paddingHorizontal: 22
                                     }}
                                 >
-                                    <Row justify="space-between">
-                                        <View style={{ width: '95%' }}>
-                                            <KeyValue keyValue="Advanced settings" />
-                                        </View>
-                                        {advancedSettings ? (
-                                            <CaretDown
-                                                fill={themeColor('text')}
-                                                width="20"
-                                                height="20"
-                                            />
-                                        ) : (
-                                            <CaretRight
-                                                fill={themeColor('text')}
-                                                width="20"
-                                                height="20"
+                                    {SettingsStore.implementation ===
+                                        'c-lightning-REST' && (
+                                        <>
+                                            <Text
+                                                style={{
+                                                    color: themeColor(
+                                                        'secondaryText'
+                                                    )
+                                                }}
+                                            >
+                                                Rest Host
+                                            </Text>
+                                            <TextInput
+                                                placeholder="LSP Balance (SAT)"
+                                                value={this.state.host}
+                                                onChangeText={(
+                                                    text: string
+                                                ) => {
+                                                    this.setState({
+                                                        host: text
+                                                    });
+                                                    LSPStore.restHost = text;
+                                                }}
                                             />
-                                        )}
-                                    </Row>
-                                </View>
-                            </TouchableOpacity>
-
-                            {advancedSettings && (
-                                <>
+                                        </>
+                                    )}
                                     <Text
                                         style={{
                                             color: themeColor('secondaryText')
                                         }}
                                     >
-                                        Initial Client Balance (Sats)
+                                        Initial LSP Balance (Sats)
                                     </Text>
                                     <TextInput
-                                        placeholder="Client Balance (SAT)"
-                                        value={this.state.clientBalanceSat}
+                                        placeholder="LSP Balance (SAT)"
+                                        value={this.state.lspBalanceSat}
                                         onChangeText={(text) =>
                                             this.setState({
-                                                clientBalanceSat: text
+                                                lspBalanceSat: text
                                             })
                                         }
-                                        style={styles.textInput}
                                     />
+                                    {Object.keys(getInfoData).length > 0 && (
+                                        <TouchableOpacity
+                                            onPress={() => {
+                                                this.setState({
+                                                    advancedSettings:
+                                                        !advancedSettings
+                                                });
+                                            }}
+                                        >
+                                            <View
+                                                style={{
+                                                    marginBottom: 10
+                                                }}
+                                            >
+                                                <Row justify="space-between">
+                                                    <View
+                                                        style={{ width: '95%' }}
+                                                    >
+                                                        <KeyValue keyValue="Advanced settings" />
+                                                    </View>
+                                                    {advancedSettings ? (
+                                                        <CaretDown
+                                                            fill={themeColor(
+                                                                'text'
+                                                            )}
+                                                            width="20"
+                                                            height="20"
+                                                        />
+                                                    ) : (
+                                                        <CaretRight
+                                                            fill={themeColor(
+                                                                'text'
+                                                            )}
+                                                            width="20"
+                                                            height="20"
+                                                        />
+                                                    )}
+                                                </Row>
+                                            </View>
+                                        </TouchableOpacity>
+                                    )}
 
-                                    <Text
-                                        style={{
-                                            color: themeColor('secondaryText')
-                                        }}
-                                    >
-                                        Required Channel Confirmations
-                                    </Text>
-                                    <TextInput
-                                        placeholder="Required Channel Confirmations"
-                                        value={
-                                            this.state
-                                                .requiredChannelConfirmations
-                                        }
-                                        onChangeText={(text) =>
-                                            this.setState({
-                                                requiredChannelConfirmations:
-                                                    text
-                                            })
-                                        }
-                                        style={styles.textInput}
-                                        keyboardType="numeric"
-                                    />
+                                    {advancedSettings && (
+                                        <>
+                                            <Text
+                                                style={{
+                                                    color: themeColor(
+                                                        'secondaryText'
+                                                    )
+                                                }}
+                                            >
+                                                Initial Client Balance (Sats)
+                                            </Text>
+                                            <TextInput
+                                                placeholder="Client Balance (SAT)"
+                                                value={
+                                                    this.state.clientBalanceSat
+                                                }
+                                                onChangeText={(text) =>
+                                                    this.setState({
+                                                        clientBalanceSat: text
+                                                    })
+                                                }
+                                                style={styles.textInput}
+                                            />
 
-                                    <Text
-                                        style={{
-                                            color: themeColor('secondaryText')
-                                        }}
-                                    >
-                                        Confirms Within Blocks
-                                    </Text>
-                                    <TextInput
-                                        placeholder="Confirms Within Blocks"
-                                        value={this.state.confirmsWithinBlocks}
-                                        onChangeText={(text) =>
-                                            this.setState({
-                                                confirmsWithinBlocks: text
-                                            })
-                                        }
-                                        style={styles.textInput}
-                                        keyboardType="numeric"
-                                    />
+                                            <Text
+                                                style={{
+                                                    color: themeColor(
+                                                        'secondaryText'
+                                                    )
+                                                }}
+                                            >
+                                                Required Channel Confirmations
+                                            </Text>
+                                            <TextInput
+                                                placeholder="Required Channel Confirmations"
+                                                value={
+                                                    this.state
+                                                        .requiredChannelConfirmations
+                                                }
+                                                onChangeText={(text) =>
+                                                    this.setState({
+                                                        requiredChannelConfirmations:
+                                                            text
+                                                    })
+                                                }
+                                                style={styles.textInput}
+                                                keyboardType="numeric"
+                                            />
 
-                                    <Text
-                                        style={{
-                                            color: themeColor('secondaryText')
-                                        }}
-                                    >
-                                        Channel Expiry Blocks
-                                    </Text>
-                                    <TextInput
-                                        placeholder="Channel Expiry Blocks"
-                                        value={this.state.channelExpiryBlocks}
-                                        onChangeText={(text) =>
-                                            this.setState({
-                                                channelExpiryBlocks: text
-                                            })
-                                        }
-                                        style={styles.textInput}
-                                        keyboardType="numeric"
-                                    />
+                                            <Text
+                                                style={{
+                                                    color: themeColor(
+                                                        'secondaryText'
+                                                    )
+                                                }}
+                                            >
+                                                Confirms Within Blocks
+                                            </Text>
+                                            <TextInput
+                                                placeholder="Confirms Within Blocks"
+                                                value={
+                                                    this.state
+                                                        .confirmsWithinBlocks
+                                                }
+                                                onChangeText={(text) =>
+                                                    this.setState({
+                                                        confirmsWithinBlocks:
+                                                            text
+                                                    })
+                                                }
+                                                style={styles.textInput}
+                                                keyboardType="numeric"
+                                            />
 
-                                    <Text
-                                        style={{
-                                            color: themeColor('secondaryText')
-                                        }}
-                                    >
-                                        Token
-                                    </Text>
-                                    <TextInput
-                                        placeholder="Token"
-                                        value={this.state.token}
-                                        onChangeText={(text) =>
-                                            this.setState({ token: text })
-                                        }
-                                        style={styles.textInput}
-                                    />
+                                            <Text
+                                                style={{
+                                                    color: themeColor(
+                                                        'secondaryText'
+                                                    )
+                                                }}
+                                            >
+                                                Channel Expiry Blocks
+                                            </Text>
+                                            <TextInput
+                                                placeholder="Channel Expiry Blocks"
+                                                value={
+                                                    this.state
+                                                        .channelExpiryBlocks
+                                                }
+                                                onChangeText={(text) =>
+                                                    this.setState({
+                                                        channelExpiryBlocks:
+                                                            text
+                                                    })
+                                                }
+                                                style={styles.textInput}
+                                                keyboardType="numeric"
+                                            />
 
-                                    <Text
-                                        style={{
-                                            color: themeColor('secondaryText')
-                                        }}
-                                    >
-                                        Refund Onchain Address
-                                    </Text>
-                                    <TextInput
-                                        placeholder="Refund Onchain Address"
-                                        value={this.state.refundOnchainAddress}
-                                        onChangeText={(text) =>
-                                            this.setState({
-                                                refundOnchainAddress: text
-                                            })
-                                        }
-                                        style={styles.textInput}
-                                    />
-                                </>
+                                            <Text
+                                                style={{
+                                                    color: themeColor(
+                                                        'secondaryText'
+                                                    )
+                                                }}
+                                            >
+                                                Token
+                                            </Text>
+                                            <TextInput
+                                                placeholder="Token"
+                                                value={this.state.token}
+                                                onChangeText={(text) =>
+                                                    this.setState({
+                                                        token: text
+                                                    })
+                                                }
+                                                style={styles.textInput}
+                                            />
+
+                                            <Text
+                                                style={{
+                                                    color: themeColor(
+                                                        'secondaryText'
+                                                    )
+                                                }}
+                                            >
+                                                Refund Onchain Address
+                                            </Text>
+                                            <TextInput
+                                                placeholder="Refund Onchain Address"
+                                                value={
+                                                    this.state
+                                                        .refundOnchainAddress
+                                                }
+                                                onChangeText={(text) =>
+                                                    this.setState({
+                                                        refundOnchainAddress:
+                                                            text
+                                                    })
+                                                }
+                                                style={styles.textInput}
+                                            />
+                                            <View
+                                                style={{
+                                                    flexDirection: 'row',
+                                                    justifyContent:
+                                                        'space-between',
+                                                    alignItems: 'center',
+                                                    marginVertical: 10
+                                                }}
+                                            >
+                                                <Text
+                                                    style={{
+                                                        fontSize: 16,
+                                                        color: themeColor(
+                                                            'secondaryText'
+                                                        )
+                                                    }}
+                                                >
+                                                    Announce channel
+                                                </Text>
+                                                <Switch
+                                                    value={
+                                                        this.state
+                                                            .announceChannel
+                                                    }
+                                                    onValueChange={async () => {
+                                                        this.setState({
+                                                            announceChannel:
+                                                                !this.state
+                                                                    .announceChannel
+                                                        });
+                                                    }}
+                                                />
+                                            </View>
+                                        </>
+                                    )}
+                                </ScrollView>
                             )}
                         </ScrollView>
-                    )}
-                </ScrollView>
-                <View style={{ marginTop: 10 }}>
-                    <Button
-                        title={
-                            Object.keys(createOrderResponse).length == 0
-                                ? 'GET QUOTE'
-                                : 'MAKE PAYMENT'
-                        }
-                        onPress={() => {
-                            if (Object.keys(createOrderResponse).length === 0) {
-                                if (
-                                    this.props.SettingsStore.implementation ===
-                                    'c-lightning-REST'
-                                ) {
-                                    LSPStore.createorderREST(
-                                        'https://testnet-lsps1.lnolymp.us',
-                                        this.state
-                                    );
-                                } else {
-                                    this.lsps1_createorder();
+                        <View style={{ marginTop: 10 }}>
+                            <Button
+                                title={
+                                    Object.keys(createOrderResponse).length == 0
+                                        ? 'GET QUOTE'
+                                        : 'MAKE PAYMENT'
                                 }
-                            } else {
-                                const orderId = result.order_id;
-
-                                // Retrieve existing responses from encrypted storage or initialize an empty array
-                                EncryptedStorage.getItem('orderResponses')
-                                    .then((responseArrayString) => {
-                                        let responseArray = [];
-                                        if (responseArrayString) {
-                                            responseArray =
-                                                JSON.parse(responseArrayString);
+                                onPress={() => {
+                                    if (
+                                        Object.keys(createOrderResponse)
+                                            .length === 0
+                                    ) {
+                                        if (
+                                            this.props.SettingsStore
+                                                .implementation ===
+                                            'c-lightning-REST'
+                                        ) {
+                                            LSPStore.createorderREST(
+                                                this.state
+                                            );
+                                        } else {
+                                            this.lsps1_createorder();
                                         }
+                                    } else {
+                                        const orderId = result.order_id;
 
-                                        // Check if the order_id already exists in the stored responses
-                                        const existingResponseIndex =
-                                            responseArray.findIndex(
-                                                (response) => {
-                                                    const currentOrderId =
-                                                        JSON.parse(response)
-                                                            .order_id ||
-                                                        JSON.parse(response);
-                                                    result?.order_id;
-                                                    return (
-                                                        currentOrderId ===
-                                                        orderId
-                                                    );
+                                        // Retrieve existing responses from encrypted storage or initialize an empty array
+                                        EncryptedStorage.getItem(
+                                            'orderResponses'
+                                        )
+                                            .then((responseArrayString) => {
+                                                let responseArray = [];
+                                                if (responseArrayString) {
+                                                    responseArray =
+                                                        JSON.parse(
+                                                            responseArrayString
+                                                        );
                                                 }
-                                            );
 
-                                        if (existingResponseIndex === -1) {
-                                            // Serialize the createOrderResponse object into a JSON string
-                                            const serializedResponse =
-                                                JSON.stringify(
-                                                    createOrderResponse
-                                                );
+                                                // Check if the order_id already exists in the stored responses
+                                                const existingResponseIndex =
+                                                    responseArray.findIndex(
+                                                        (response) => {
+                                                            const currentOrderId =
+                                                                JSON.parse(
+                                                                    response
+                                                                ).order_id ||
+                                                                JSON.parse(
+                                                                    response
+                                                                );
+                                                            result?.order_id;
+                                                            return (
+                                                                currentOrderId ===
+                                                                orderId
+                                                            );
+                                                        }
+                                                    );
 
-                                            // Append the serialized response to the array
-                                            responseArray.push(
-                                                serializedResponse
-                                            );
+                                                if (
+                                                    existingResponseIndex === -1
+                                                ) {
+                                                    // Serialize the createOrderResponse object into a JSON string
+                                                    const serializedResponse =
+                                                        JSON.stringify(
+                                                            createOrderResponse
+                                                        );
+
+                                                    // Append the serialized response to the array
+                                                    responseArray.push(
+                                                        serializedResponse
+                                                    );
 
-                                            // Save the updated array back to encrypted storage
-                                            EncryptedStorage.setItem(
-                                                'orderResponses',
-                                                JSON.stringify(responseArray)
-                                            )
-                                                .then(() => {
+                                                    // Save the updated array back to encrypted storage
+                                                    EncryptedStorage.setItem(
+                                                        'orderResponses',
+                                                        JSON.stringify(
+                                                            responseArray
+                                                        )
+                                                    )
+                                                        .then(() => {
+                                                            console.log(
+                                                                'Response saved successfully.'
+                                                            );
+                                                        })
+                                                        .catch((error) =>
+                                                            console.error(
+                                                                'Error saving order response:',
+                                                                error
+                                                            )
+                                                        );
+                                                } else {
                                                     console.log(
-                                                        'Response saved successfully.'
+                                                        'Response with same order_id already exists. Skipping save.'
                                                     );
-                                                })
-                                                .catch((error) =>
-                                                    console.error(
-                                                        'Error saving order response:',
-                                                        error
-                                                    )
-                                                );
-                                        } else {
-                                            console.log(
-                                                'Response with same order_id already exists. Skipping save.'
-                                            );
-                                        }
+                                                }
 
-                                        // Navigate to the PaymentRequest screen
-                                        InvoicesStore.getPayReq(
-                                            payment.lightning_invoice
-                                        )
-                                            .then(() => {
-                                                navigation.navigate(
-                                                    'PaymentRequest',
-                                                    {}
-                                                );
+                                                // Navigate to the PaymentRequest screen
+                                                InvoicesStore.getPayReq(
+                                                    payment.lightning_invoice
+                                                )
+                                                    .then(() => {
+                                                        navigation.navigate(
+                                                            'PaymentRequest',
+                                                            {}
+                                                        );
+                                                    })
+                                                    .catch((error) =>
+                                                        console.error(
+                                                            'Error fetching payment request:',
+                                                            error
+                                                        )
+                                                    );
                                             })
                                             .catch((error) =>
                                                 console.error(
-                                                    'Error fetching payment request:',
+                                                    'Error retrieving order responses:',
                                                     error
                                                 )
                                             );
-                                    })
-                                    .catch((error) =>
-                                        console.error(
-                                            'Error retrieving order responses:',
-                                            error
-                                        )
-                                    );
-                            }
-                        }}
-                        secondary
-                    />
-                </View>
+                                    }
+                                }}
+                                secondary
+                            />
+                        </View>
+                    </>
+                )}
             </Screen>
         );
     }