diff --git a/stores/LSPStore.ts b/stores/LSPStore.ts
index a16d18564..587f6bcbc 100644
--- a/stores/LSPStore.ts
+++ b/stores/LSPStore.ts
@@ -1,6 +1,5 @@
 import { action, observable } from 'mobx';
 import ReactNativeBlobUtil from 'react-native-blob-util';
-import EncryptedStorage from 'react-native-encrypted-storage';
 
 import SettingsStore from './SettingsStore';
 import ChannelsStore from './ChannelsStore';
@@ -23,6 +22,8 @@ export default class LSPStore {
     @observable public showLspSettings: boolean = false;
     @observable public channelAcceptor: any;
     @observable public customMessagesSubscriber: any;
+    @observable public getInfoData: any = {};
+    @observable public createOrderResponse: any = {};
 
     settingsStore: SettingsStore;
     channelsStore: ChannelsStore;
@@ -319,10 +320,11 @@ export default class LSPStore {
                         console.log('peer', peer);
                         console.log('data', data);
 
-                        await EncryptedStorage.setItem(
-                            'get_info_data',
-                            JSON.stringify(data)
-                        );
+                        if (data.id === '42') {
+                            this.getInfoData = data;
+                        } else {
+                            this.createOrderResponse = data;
+                        }
                     } catch (error: any) {
                         console.error(
                             'sub custom messages error: ' + error.message
diff --git a/views/Settings/LSPS1.tsx b/views/Settings/LSPS1.tsx
index d4f23d51c..4bb07a21c 100644
--- a/views/Settings/LSPS1.tsx
+++ b/views/Settings/LSPS1.tsx
@@ -7,13 +7,13 @@ import {
     ScrollView,
     TouchableOpacity
 } from 'react-native';
-import EncryptedStorage from 'react-native-encrypted-storage';
 
 import Header from '../../components/Header';
 import Screen from '../../components/Screen';
 import TextInput from '../../components/TextInput';
 
 import LSPStore from '../../stores/LSPStore';
+import InvoicesStore from '../../stores/InvoicesStore';
 import ChannelsStore from '../../stores/ChannelsStore';
 
 import Button from '../../components/Button';
@@ -26,13 +26,13 @@ import CaretRight from '../../assets/images/SVG/Caret Right.svg';
 
 interface LSPS1Props {
     LSPStore: LSPStore;
+    InvoicesStore: InvoicesStore;
     ChannelsStore: ChannelsStore;
     navigation: any;
 }
 
 interface LSPS1State {
     peer: string;
-    getInfoData: any;
     lspBalanceSat: any;
     clientBalanceSat: any;
     requiredChannelConfirmations: any;
@@ -40,10 +40,10 @@ interface LSPS1State {
     channelExpiryBlocks: any;
     token: any;
     refundOnchainAddress: any;
-    advanceSettings: boolean;
+    advancedSettings: boolean;
 }
 
-@inject('LSPStore', 'ChannelsStore')
+@inject('LSPStore', 'ChannelsStore', 'InvoicesStore')
 @observer
 export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
     constructor(props: LSPS1Props) {
@@ -57,8 +57,7 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
             token: '',
             refundOnchainAddress: 'bc1q3uppthgr2k3wag8w2f3fj03ataenwvwauswudt',
             peer: '03e84a109cd70e57864274932fc87c5e6434c59ebb8e6e7d28532219ba38f7f6df@139.144.22.237:9735',
-            getInfoData: {},
-            advanceSettings: false
+            advancedSettings: false
         };
     }
 
@@ -70,19 +69,6 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
         this.sendCustomMessage_lsps1();
     }
 
-    async retrieveData() {
-        try {
-            const savedData: any = await EncryptedStorage.getItem(
-                'get_info_data'
-            );
-            this.setState({
-                getInfoData: JSON.parse(savedData)
-            });
-        } catch (error) {
-            console.error('Error retrieving data:', error);
-        }
-    }
-
     subscribeToCustomMessages() {
         this.props.LSPStore.subscribeCustomMessages()
             .then((response) => {
@@ -110,7 +96,6 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
             data
         })
             .then((response) => {
-                this.retrieveData();
                 console.log('Custom message sent:', response);
             })
             .catch((error) => {
@@ -230,15 +215,20 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
     }
 
     render() {
-        const { navigation } = this.props;
-        const { getInfoData, advanceSettings } = this.state;
+        const { navigation, LSPStore, InvoicesStore } = this.props;
+        const { advancedSettings } = this.state;
+        const getInfoData = LSPStore.getInfoData;
         const options = getInfoData?.result?.options;
+        const createOrderResponse = LSPStore?.createOrderResponse;
+        const result = createOrderResponse?.result;
+        const payment = result?.payment;
 
         return (
             <Screen>
                 <Header leftComponent="Back" navigation={navigation} />
-                <View style={{ flex: 1 }}>
+                <ScrollView style={{ flex: 1 }}>
                     {getInfoData &&
+                        Object.keys(createOrderResponse).length == 0 &&
                         Object.keys(getInfoData).length > 0 &&
                         options && (
                             <View style={{ paddingHorizontal: 20 }}>
@@ -314,178 +304,337 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
                             </View>
                         )}
 
-                    <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}
-                        />
+                    {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.confirms_within_blocks && (
+                                    <KeyValue
+                                        keyValue="Confirms Within Blocks"
+                                        value={result.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}
+                                        isCopyable
+                                    />
+                                )}
+                                {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>
+                        )}
 
-                        <TouchableOpacity
-                            onPress={() => {
-                                this.setState({
-                                    advanceSettings: !advanceSettings
-                                });
+                    {Object.keys(createOrderResponse).length == 0 && (
+                        <ScrollView
+                            style={{
+                                flex: 1,
+                                marginTop: 30,
+                                paddingHorizontal: 22
                             }}
                         >
-                            <View
-                                style={{
-                                    marginBottom: 10
-                                }}
+                            <Text
+                                style={{ color: themeColor('secondaryText') }}
                             >
-                                <Row justify="space-between">
-                                    <View style={{ width: '95%' }}>
-                                        <KeyValue keyValue="Advance settings" />
-                                    </View>
-                                    {advanceSettings ? (
-                                        <CaretDown
-                                            fill={themeColor('text')}
-                                            width="20"
-                                            height="20"
-                                        />
-                                    ) : (
-                                        <CaretRight
-                                            fill={themeColor('text')}
-                                            width="20"
-                                            height="20"
-                                        />
-                                    )}
-                                </Row>
-                            </View>
-                        </TouchableOpacity>
+                                Initial LSP Balance (Sats)
+                            </Text>
+                            <TextInput
+                                placeholder="LSP Balance (SAT)"
+                                value={this.state.lspBalanceSat}
+                                onChangeText={(text) =>
+                                    this.setState({ lspBalanceSat: text })
+                                }
+                                // style={styles.textInput}
+                            />
 
-                        {advanceSettings && (
-                            <>
-                                <Text
+                            <TouchableOpacity
+                                onPress={() => {
+                                    this.setState({
+                                        advancedSettings: !advancedSettings
+                                    });
+                                }}
+                            >
+                                <View
                                     style={{
-                                        color: themeColor('secondaryText')
+                                        marginBottom: 10
                                     }}
                                 >
-                                    Initial Client Balance (Sats)
-                                </Text>
-                                <TextInput
-                                    placeholder="Client Balance (SAT)"
-                                    value={this.state.clientBalanceSat}
-                                    onChangeText={(text) =>
-                                        this.setState({
-                                            clientBalanceSat: text
-                                        })
-                                    }
-                                    style={styles.textInput}
-                                />
+                                    <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}
-                                />
-                            </>
-                        )}
-                    </ScrollView>
-                </View>
+                                    <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}
+                                    />
+                                </>
+                            )}
+                        </ScrollView>
+                    )}
+                </ScrollView>
                 <View style={{ marginTop: 10 }}>
                     <Button
-                        title="GET QUOTE / CREATE ORDER"
-                        onPress={() => this.lsps1_createorder()}
+                        title={
+                            Object.keys(createOrderResponse).length == 0
+                                ? 'GET QUOTE'
+                                : 'MAKE PAYMENT'
+                        }
+                        onPress={() => {
+                            if (Object.keys(createOrderResponse).length === 0) {
+                                this.lsps1_createorder();
+                            } else {
+                                InvoicesStore.getPayReq(
+                                    payment.lightning_invoice
+                                )
+                                    .then(
+                                        navigation.navigate(
+                                            'PaymentRequest',
+                                            {}
+                                        )
+                                    )
+                                    .catch((error) =>
+                                        console.error(
+                                            'Error fetching payment request:',
+                                            error
+                                        )
+                                    );
+                            }
+                        }}
                         secondary
                     />
                 </View>