From 36c1ebf27d988c0743415d50bced06ac1fac9c52 Mon Sep 17 00:00:00 2001
From: Evan Kaloudis <zeusln@tutanota.com>
Date: Fri, 21 Jun 2024 14:14:56 -0400
Subject: [PATCH 1/2] LSP-101: LSPS1: Explicitly support LSPS1 payment options

---
 components/LSPS1OrderResponse.tsx | 401 +++++++++++++++++++++++-------
 locales/en.json                   |   3 +
 views/Settings/LSPS1/index.tsx    | 104 ++++----
 3 files changed, 362 insertions(+), 146 deletions(-)

diff --git a/components/LSPS1OrderResponse.tsx b/components/LSPS1OrderResponse.tsx
index 96f92fa1e..b498971eb 100644
--- a/components/LSPS1OrderResponse.tsx
+++ b/components/LSPS1OrderResponse.tsx
@@ -173,88 +173,247 @@ export default class LSPS1OrderResponse extends React.Component<
                                 }
                             />
                         )}
-                        <KeyValue
-                            keyValue={localeString('views.Payment.title')}
-                        />
-                        {payment?.fee_total_sat && (
-                            <KeyValue
-                                keyValue={localeString(
-                                    'views.Transaction.totalFees'
+                        {/* Legacy format */}
+                        {payment && !payment.bolt11 && !payment.onchain && (
+                            <>
+                                <KeyValue
+                                    keyValue={localeString(
+                                        'views.Payment.title'
+                                    )}
+                                />
+                                {payment?.state && (
+                                    <KeyValue
+                                        keyValue={localeString('general.state')}
+                                        value={payment?.state}
+                                    />
                                 )}
-                                value={
-                                    <Amount
-                                        sats={payment?.fee_total_sat}
-                                        sensitive
-                                        toggleable
+                                {payment?.fee_total_sat && (
+                                    <KeyValue
+                                        keyValue={localeString(
+                                            'views.Transaction.totalFees'
+                                        )}
+                                        value={
+                                            <Amount
+                                                sats={payment?.fee_total_sat}
+                                                sensitive
+                                                toggleable
+                                            />
+                                        }
                                     />
-                                }
-                            />
-                        )}
-                        {(payment?.lightning_invoice ||
-                            payment?.bolt11_invoice) && (
-                            <KeyValue
-                                keyValue={localeString(
-                                    'general.lightningInvoice'
                                 )}
-                                value={
-                                    payment?.lightning_invoice ||
-                                    payment?.bolt11_invoice
-                                }
-                            />
-                        )}
-                        {payment?.state && (
-                            <KeyValue
-                                keyValue={localeString('general.state')}
-                                value={payment?.state}
-                            />
-                        )}
-                        {payment?.min_fee_for_0conf && (
-                            <KeyValue
-                                keyValue={localeString(
-                                    'views.LSPS1.miniFeeFor0Conf'
+                                {payment?.order_total_sat && (
+                                    <KeyValue
+                                        keyValue={localeString(
+                                            'views.LSPS1.totalOrderValue'
+                                        )}
+                                        value={
+                                            <Amount
+                                                sats={payment?.order_total_sat}
+                                                toggleable
+                                                sensitive
+                                            />
+                                        }
+                                    />
                                 )}
-                                value={payment?.min_fee_for_0conf}
-                            />
-                        )}
-                        {payment?.min_onchain_payment_confirmations && (
-                            <KeyValue
-                                keyValue={localeString(
-                                    'views.LSPS1.minOnchainPaymentConfirmations'
+                                {(payment?.lightning_invoice ||
+                                    payment?.bolt11_invoice) && (
+                                    <KeyValue
+                                        keyValue={localeString(
+                                            'general.lightningInvoice'
+                                        )}
+                                        value={
+                                            payment?.lightning_invoice ||
+                                            payment?.bolt11_invoice
+                                        }
+                                    />
                                 )}
-                                value={
-                                    payment?.min_onchain_payment_confirmations
-                                }
-                            />
-                        )}
-                        {payment?.onchain_address && (
-                            <KeyValue
-                                keyValue={localeString(
-                                    'views.Settings.AddContact.onchainAddress'
+                                {payment?.min_fee_for_0conf && (
+                                    <KeyValue
+                                        keyValue={localeString(
+                                            'views.LSPS1.miniFeeFor0Conf'
+                                        )}
+                                        value={payment?.min_fee_for_0conf}
+                                    />
                                 )}
-                                value={payment?.onchain_address}
-                            />
+                                {payment?.min_onchain_payment_confirmations && (
+                                    <KeyValue
+                                        keyValue={localeString(
+                                            'views.LSPS1.minOnchainPaymentConfirmations'
+                                        )}
+                                        value={
+                                            payment?.min_onchain_payment_confirmations
+                                        }
+                                    />
+                                )}
+                                {payment?.onchain_address && (
+                                    <KeyValue
+                                        keyValue={localeString(
+                                            'views.Settings.AddContact.onchainAddress'
+                                        )}
+                                        value={payment?.onchain_address}
+                                    />
+                                )}
+                                {payment?.onchain_payment && (
+                                    <KeyValue
+                                        keyValue={localeString(
+                                            'views.LSPS1.onchainPayment'
+                                        )}
+                                        value={payment?.onchain_payment}
+                                    />
+                                )}
+                            </>
                         )}
-                        {payment?.onchain_payment && (
-                            <KeyValue
-                                keyValue={localeString(
-                                    'views.LSPS1.onchainPayment'
+                        {/* BOLT11 */}
+                        {payment && payment.bolt11 && (
+                            <>
+                                <KeyValue
+                                    keyValue={localeString(
+                                        'views.LSPS1.bolt11Payment'
+                                    )}
+                                />
+                                {payment?.bolt11.state && (
+                                    <KeyValue
+                                        keyValue={localeString('general.state')}
+                                        value={payment?.bolt11.state}
+                                    />
                                 )}
-                                value={payment?.onchain_payment}
-                            />
+                                {payment?.bolt11.fee_total_sat && (
+                                    <KeyValue
+                                        keyValue={localeString(
+                                            'views.Transaction.totalFees'
+                                        )}
+                                        value={
+                                            <Amount
+                                                sats={
+                                                    payment?.bolt11
+                                                        .fee_total_sat
+                                                }
+                                                sensitive
+                                                toggleable
+                                            />
+                                        }
+                                    />
+                                )}
+                                {payment?.bolt11.order_total_sat && (
+                                    <KeyValue
+                                        keyValue={localeString(
+                                            'views.LSPS1.totalOrderValue'
+                                        )}
+                                        value={
+                                            <Amount
+                                                sats={
+                                                    payment?.bolt11
+                                                        .order_total_sat
+                                                }
+                                                toggleable
+                                                sensitive
+                                            />
+                                        }
+                                    />
+                                )}
+                                {payment?.bolt11.expires_at && (
+                                    <KeyValue
+                                        keyValue={localeString(
+                                            'general.expiresAt'
+                                        )}
+                                        value={moment(
+                                            payment?.bolt11.expires_at
+                                        ).format('MMM Do YYYY, h:mm:ss a')}
+                                    />
+                                )}
+                                {payment?.bolt11.invoice && (
+                                    <KeyValue
+                                        keyValue={localeString(
+                                            'views.Invoice.title'
+                                        )}
+                                        value={payment?.bolt11.invoice}
+                                    />
+                                )}
+                            </>
                         )}
-                        {payment?.order_total_sat && (
-                            <KeyValue
-                                keyValue={localeString(
-                                    'views.LSPS1.totalOrderValue'
+                        {/* On-chain */}
+                        {payment && payment.onchain && (
+                            <>
+                                <KeyValue
+                                    keyValue={localeString(
+                                        'iews.LSPS1.onchainPayment'
+                                    )}
+                                />
+                                {payment?.onchain.fee_total_sat && (
+                                    <KeyValue
+                                        keyValue={localeString(
+                                            'views.Transaction.totalFees'
+                                        )}
+                                        value={
+                                            <Amount
+                                                sats={
+                                                    payment?.onchain
+                                                        .fee_total_sat
+                                                }
+                                                sensitive
+                                                toggleable
+                                            />
+                                        }
+                                    />
                                 )}
-                                value={
-                                    <Amount
-                                        sats={payment.order_total_sat}
-                                        toggleable
-                                        sensitive
+                                {payment?.onchain.order_total_sat && (
+                                    <KeyValue
+                                        keyValue={localeString(
+                                            'views.LSPS1.totalOrderValue'
+                                        )}
+                                        value={
+                                            <Amount
+                                                sats={
+                                                    payment?.onchain
+                                                        .order_total_sat
+                                                }
+                                                toggleable
+                                                sensitive
+                                            />
+                                        }
                                     />
-                                }
-                            />
+                                )}
+                                {payment?.onchain.expires_at && (
+                                    <KeyValue
+                                        keyValue={localeString(
+                                            'general.expiresAt'
+                                        )}
+                                        value={moment(
+                                            payment?.onchain.expires_at
+                                        ).format('MMM Do YYYY, h:mm:ss a')}
+                                    />
+                                )}
+                                {payment?.onchain.address && (
+                                    <KeyValue
+                                        keyValue={localeString(
+                                            'general.address'
+                                        )}
+                                        value={payment?.onchain.address}
+                                    />
+                                )}
+                                {payment?.onchain.min_fee_for_0conf && (
+                                    <KeyValue
+                                        keyValue={localeString(
+                                            'views.LSPS1.miniFeeFor0Conf'
+                                        )}
+                                        value={
+                                            payment?.onchain.min_fee_for_0conf
+                                        }
+                                    />
+                                )}
+                                {payment?.onchain
+                                    .min_onchain_payment_confirmations && (
+                                    <KeyValue
+                                        keyValue={localeString(
+                                            'views.LSPS1.minOnchainPaymentConfirmations'
+                                        )}
+                                        value={
+                                            payment?.onchain
+                                                .min_onchain_payment_confirmations
+                                        }
+                                    />
+                                )}
+                            </>
                         )}
                         {channel && (
                             <>
@@ -294,30 +453,82 @@ export default class LSPS1OrderResponse extends React.Component<
                             </>
                         )}
                         {orderResponse?.order_state === 'CREATED' && orderView && (
-                            <Button
-                                title={localeString('views.LSPS1.makePayment')}
-                                containerStyle={{
-                                    paddingVertical: 20
-                                }}
-                                onPress={() => {
-                                    InvoicesStore.getPayReq(
-                                        payment.lightning_invoice ||
-                                            payment.bolt11_invoice
-                                    )
-                                        .then(() => {
-                                            navigation.navigate(
-                                                'PaymentRequest',
-                                                {}
-                                            );
-                                        })
-                                        .catch((error: any) =>
-                                            console.error(
-                                                'Error fetching payment request:',
-                                                error
-                                            )
-                                        );
-                                }}
-                            />
+                            <>
+                                {payment.bolt11?.invoice ||
+                                    payment.lightning_invoice ||
+                                    (payment.bolt11_invoice && (
+                                        <>
+                                            <Button
+                                                title={
+                                                    payment.onchain
+                                                        ? localeString(
+                                                              'views.LSPS1.makePaymentLN'
+                                                          )
+                                                        : localeString(
+                                                              'views.LSPS1.makePayment'
+                                                          )
+                                                }
+                                                containerStyle={{
+                                                    paddingVertical: 20
+                                                }}
+                                                onPress={() => {
+                                                    InvoicesStore.getPayReq(
+                                                        payment.bolt11
+                                                            ?.invoice ||
+                                                            payment.lightning_invoice ||
+                                                            payment.bolt11_invoice
+                                                    )
+                                                        .then(() => {
+                                                            navigation.navigate(
+                                                                'PaymentRequest',
+                                                                {}
+                                                            );
+                                                        })
+                                                        .catch((error: any) =>
+                                                            console.error(
+                                                                'Error fetching payment request:',
+                                                                error
+                                                            )
+                                                        );
+                                                }}
+                                            />
+                                        </>
+                                    ))}
+                                {payment.onchain?.address &&
+                                    payment.onchain?.fee_total_sat && (
+                                        <>
+                                            <Button
+                                                title={
+                                                    payment.bolt11
+                                                        ? localeString(
+                                                              'views.LSPS1.makePaymentOnchain'
+                                                          )
+                                                        : localeString(
+                                                              'views.LSPS1.makePayment'
+                                                          )
+                                                }
+                                                containerStyle={{
+                                                    paddingVertical: 20
+                                                }}
+                                                onPress={() => {
+                                                    navigation.navigate(
+                                                        'Send',
+                                                        {
+                                                            destination:
+                                                                payment.onchain
+                                                                    ?.address,
+                                                            amount: payment
+                                                                .onchain
+                                                                ?.fee_total_sat,
+                                                            transactionType:
+                                                                'On-chain'
+                                                        }
+                                                    );
+                                                }}
+                                            />
+                                        </>
+                                    )}
+                            </>
                         )}
                     </View>
                 </ScrollView>
diff --git a/locales/en.json b/locales/en.json
index 4c0ab51ba..9ff25c062 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -985,6 +985,8 @@
     "views.LSPS1.refundOnchainAddress": "Refund onchain address",
     "views.LSPS1.getQuote": "Get quote",
     "views.LSPS1.makePayment": "Make payment",
+    "views.LSPS1.makePaymentLN": "Make payment (LN)",
+    "views.LSPS1.makePaymentOnchain": "Make payment (on-chain)",
     "views.LSPS1.goToSettings": "Go to settings",
     "views.LSPS1.fundedAt": "Funded At",
     "views.LSPS1.fundingOutpoint": "Funding outpoint",
@@ -993,6 +995,7 @@
     "views.LSPS1.lsps1Orders": "LSPS1 Orders",
     "views.LSPS1.noOrdersError": "No orders are saved yet!",
     "views.LSPS1.showingPreviousState": "showing previous state!",
+    "views.LSPS1.bolt11Payment": "BOLT 11 payment",
     "components.UTXOPicker.modal.title": "Select UTXOs to use",
     "components.UTXOPicker.modal.description": "Select the UTXOs to be used in this operation. You may want to only use specific UTXOs to preserve your privacy.",
     "components.UTXOPicker.modal.set": "Set UTXOs",
diff --git a/views/Settings/LSPS1/index.tsx b/views/Settings/LSPS1/index.tsx
index f63c16f41..fac118ad6 100644
--- a/views/Settings/LSPS1/index.tsx
+++ b/views/Settings/LSPS1/index.tsx
@@ -252,7 +252,11 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
             confirmsWithinBlocks
         } = this.state;
         const { getInfoData, createOrderResponse } = LSPStore;
-        const options = getInfoData?.result?.options || getInfoData?.options;
+        const info =
+            getInfoData?.result?.options ||
+            getInfoData?.options ||
+            getInfoData?.result ||
+            getInfoData;
         const result = createOrderResponse?.result || createOrderResponse;
         const payment = result?.payment;
 
@@ -287,45 +291,43 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
             </TouchableOpacity>
         );
 
-        if (lspBalanceSat === 0 && options?.min_initial_lsp_balance_sat) {
+        if (lspBalanceSat === 0 && info?.min_initial_lsp_balance_sat) {
             this.setState({
-                lspBalanceSat: parseInt(options.min_initial_lsp_balance_sat)
+                lspBalanceSat: parseInt(info.min_initial_lsp_balance_sat)
             });
         }
         if (
             clientBalanceSat === 0 &&
-            options?.min_initial_client_balance_sat > 0
+            info?.min_initial_client_balance_sat > 0
         ) {
             this.setState({
-                clientBalanceSat: parseInt(
-                    options.min_initial_client_balance_sat
-                )
+                clientBalanceSat: parseInt(info.min_initial_client_balance_sat)
             });
         }
 
-        if (channelExpiryBlocks === 0 && options?.max_channel_expiry_blocks) {
+        if (channelExpiryBlocks === 0 && info?.max_channel_expiry_blocks) {
             this.setState({
-                channelExpiryBlocks: parseInt(options.max_channel_expiry_blocks)
+                channelExpiryBlocks: parseInt(info.max_channel_expiry_blocks)
             });
         }
 
         if (
             requiredChannelConfirmations === '' &&
-            options?.min_required_channel_confirmations
+            info?.min_required_channel_confirmations
         ) {
             this.setState({
                 requiredChannelConfirmations:
-                    options?.min_required_channel_confirmations.toString()
+                    info?.min_required_channel_confirmations.toString()
             });
         }
 
         if (
             confirmsWithinBlocks === '' &&
-            options?.min_funding_confirms_within_blocks
+            info?.min_funding_confirms_within_blocks
         ) {
             this.setState({
                 confirmsWithinBlocks:
-                    (options?.min_funding_confirms_within_blocks).toString()
+                    (info?.min_funding_confirms_within_blocks).toString()
             });
         }
 
@@ -426,7 +428,7 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
                                             }}
                                         >
                                             {FiatStore.numberWithCommas(
-                                                options?.min_initial_lsp_balance_sat
+                                                info?.min_initial_lsp_balance_sat
                                             )}
                                         </Text>
                                         <Text
@@ -435,17 +437,17 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
                                             }}
                                         >
                                             {FiatStore.numberWithCommas(
-                                                options?.max_initial_lsp_balance_sat
+                                                info?.max_initial_lsp_balance_sat
                                             )}
                                         </Text>
                                     </Row>
                                     <Slider
                                         style={{ width: '100%', height: 40 }}
                                         minimumValue={parseInt(
-                                            options?.min_initial_lsp_balance_sat
+                                            info?.min_initial_lsp_balance_sat
                                         )}
                                         maximumValue={parseInt(
-                                            options?.max_initial_lsp_balance_sat
+                                            info?.max_initial_lsp_balance_sat
                                         )}
                                         minimumTrackTintColor={themeColor(
                                             'highlight'
@@ -507,10 +509,10 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
                                         Object.keys(createOrderResponse)
                                             .length == 0 &&
                                         Object.keys(getInfoData).length > 0 &&
-                                        options && (
+                                        info && (
                                             <>
-                                                {options?.max_channel_balance_sat &&
-                                                    options?.min_channel_balance_sat && (
+                                                {info?.max_channel_balance_sat &&
+                                                    info?.min_channel_balance_sat && (
                                                         <KeyValue
                                                             keyValue={`${localeString(
                                                                 'views.Channel.channelBalance'
@@ -518,15 +520,15 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
                                                                 'general.sats'
                                                             )})`}
                                                             value={`${FiatStore.numberWithCommas(
-                                                                options?.min_channel_balance_sat
+                                                                info?.min_channel_balance_sat
                                                             )} - ${FiatStore.numberWithCommas(
-                                                                options?.max_channel_balance_sat
+                                                                info?.max_channel_balance_sat
                                                             )}`}
                                                         />
                                                     )}
-                                                {options?.max_initial_client_balance_sat !==
+                                                {info?.max_initial_client_balance_sat !==
                                                     '0' &&
-                                                    options?.min_initial_client_balance_sat !==
+                                                    info?.min_initial_client_balance_sat !==
                                                         '0' && (
                                                         <KeyValue
                                                             keyValue={`${localeString(
@@ -534,12 +536,12 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
                                                             )} (${localeString(
                                                                 'general.sats'
                                                             )})`}
-                                                            value={`${options?.min_initial_client_balance_sat} - ${options?.max_initial_client_balance_sat}`}
+                                                            value={`${info?.min_initial_client_balance_sat} - ${info?.max_initial_client_balance_sat}`}
                                                         />
                                                     )}
 
-                                                {options?.max_initial_lsp_balance_sat &&
-                                                    options?.min_initial_lsp_balance_sat && (
+                                                {info?.max_initial_lsp_balance_sat &&
+                                                    info?.min_initial_lsp_balance_sat && (
                                                         <KeyValue
                                                             keyValue={`${localeString(
                                                                 'views.LSPS1.initialLSPBalance'
@@ -547,43 +549,43 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
                                                                 'general.sats'
                                                             )})`}
                                                             value={`${FiatStore.numberWithCommas(
-                                                                options?.min_initial_lsp_balance_sat
+                                                                info?.min_initial_lsp_balance_sat
                                                             )} - ${FiatStore.numberWithCommas(
-                                                                options?.max_initial_lsp_balance_sat
+                                                                info?.max_initial_lsp_balance_sat
                                                             )}`}
                                                         />
                                                     )}
-                                                {options?.max_channel_expiry_blocks && (
+                                                {info?.max_channel_expiry_blocks && (
                                                     <KeyValue
                                                         keyValue={localeString(
                                                             'views.LSPS1.maxChannelExpiryBlocks'
                                                         )}
                                                         value={FiatStore.numberWithCommas(
-                                                            options?.max_channel_expiry_blocks
+                                                            info?.max_channel_expiry_blocks
                                                         )}
                                                     />
                                                 )}
-                                                {options?.min_channel_confirmations && (
+                                                {info?.min_channel_confirmations && (
                                                     <KeyValue
                                                         keyValue={localeString(
                                                             'views.LSPS1.minChannelConfirmations'
                                                         )}
                                                         value={
-                                                            options?.min_channel_confirmations
+                                                            info?.min_channel_confirmations
                                                         }
                                                     />
                                                 )}
-                                                {options?.min_onchain_payment_confirmations && (
+                                                {info?.min_onchain_payment_confirmations && (
                                                     <KeyValue
                                                         keyValue={localeString(
                                                             'views.LSPS1.minOnchainPaymentConfirmations'
                                                         )}
                                                         value={
-                                                            options?.min_onchain_payment_confirmations
+                                                            info?.min_onchain_payment_confirmations
                                                         }
                                                     />
                                                 )}
-                                                {options?.min_onchain_payment_size_sat && (
+                                                {info?.min_onchain_payment_size_sat && (
                                                     <KeyValue
                                                         keyValue={`${localeString(
                                                             'views.LSPS1.minOnchainPaymentSize'
@@ -591,43 +593,43 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
                                                             'general.sats'
                                                         )})`}
                                                         value={
-                                                            options?.min_onchain_payment_size_sat
+                                                            info?.min_onchain_payment_size_sat
                                                         }
                                                     />
                                                 )}
-                                                {options?.min_funding_confirms_within_blocks && (
+                                                {info?.min_funding_confirms_within_blocks && (
                                                     <KeyValue
                                                         keyValue={localeString(
                                                             'views.LSPS1.minFundingConfirmWithingBlocks'
                                                         )}
                                                         value={
-                                                            options?.min_funding_confirms_within_blocks
+                                                            info?.min_funding_confirms_within_blocks
                                                         }
                                                     />
                                                 )}
-                                                {options?.min_required_channel_confirmations && (
+                                                {info?.min_required_channel_confirmations && (
                                                     <KeyValue
                                                         keyValue={localeString(
                                                             'views.LSPS1.minRequiredChannelConfirmations'
                                                         )}
                                                         value={
-                                                            options?.min_required_channel_confirmations
+                                                            info?.min_required_channel_confirmations
                                                         }
                                                     />
                                                 )}
-                                                {options?.supports_zero_channel_reserve !==
+                                                {info?.supports_zero_channel_reserve !==
                                                     null && (
                                                     <KeyValue
                                                         keyValue={localeString(
                                                             'views.LSPS1.supportZeroChannelReserve'
                                                         )}
                                                         value={
-                                                            options?.supports_zero_channel_reserve
+                                                            info?.supports_zero_channel_reserve
                                                                 ? 'True'
                                                                 : 'False'
                                                         }
                                                         color={
-                                                            options?.supports_zero_channel_reserve
+                                                            info?.supports_zero_channel_reserve
                                                                 ? 'green'
                                                                 : '#808000'
                                                         }
@@ -684,7 +686,7 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
 
                                     {advancedSettings && (
                                         <>
-                                            {options?.max_initial_client_balance_sat !==
+                                            {info?.max_initial_client_balance_sat !==
                                                 '0' && (
                                                 <>
                                                     <Text
@@ -737,7 +739,7 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
                                                             }}
                                                         >
                                                             {FiatStore.numberWithCommas(
-                                                                options?.min_initial_client_balance_sat
+                                                                info?.min_initial_client_balance_sat
                                                             )}
                                                         </Text>
                                                         <Text
@@ -748,7 +750,7 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
                                                             }}
                                                         >
                                                             {FiatStore.numberWithCommas(
-                                                                options?.max_initial_client_balance_sat
+                                                                info?.max_initial_client_balance_sat
                                                             )}
                                                         </Text>
                                                     </Row>
@@ -758,10 +760,10 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
                                                             height: 40
                                                         }}
                                                         minimumValue={parseInt(
-                                                            options?.min_initial_client_balance_sat
+                                                            info?.min_initial_client_balance_sat
                                                         )}
                                                         maximumValue={parseInt(
-                                                            options?.max_initial_client_balance_sat
+                                                            info?.max_initial_client_balance_sat
                                                         )}
                                                         minimumTrackTintColor={themeColor(
                                                             'highlight'
@@ -881,7 +883,7 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
                                                 }}
                                                 minimumValue={0}
                                                 maximumValue={parseInt(
-                                                    options?.max_channel_expiry_blocks
+                                                    info?.max_channel_expiry_blocks
                                                 )}
                                                 minimumTrackTintColor={themeColor(
                                                     'highlight'
@@ -924,7 +926,7 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
                                                 style={styles.textInput}
                                             />
 
-                                            {options?.min_onchain_payment_confirmations && (
+                                            {info?.min_onchain_payment_confirmations && (
                                                 <>
                                                     <Text
                                                         style={{

From 6ba1d6ea7b2a3c6f1c35dd42fe4889214850daa4 Mon Sep 17 00:00:00 2001
From: Evan Kaloudis <zeusln@tutanota.com>
Date: Mon, 24 Jun 2024 19:58:10 -0400
Subject: [PATCH 2/2] LSPS1: make web app and mobile app language uniform

---
 components/LSPS1OrderResponse.tsx | 167 +++++++++++++++---------------
 locales/en.json                   |  24 ++---
 views/Settings/LSPS1/index.tsx    |  50 +++++----
 3 files changed, 126 insertions(+), 115 deletions(-)

diff --git a/components/LSPS1OrderResponse.tsx b/components/LSPS1OrderResponse.tsx
index b498971eb..cf5c71fb2 100644
--- a/components/LSPS1OrderResponse.tsx
+++ b/components/LSPS1OrderResponse.tsx
@@ -47,6 +47,30 @@ export default class LSPS1OrderResponse extends React.Component<
             <Screen>
                 <ScrollView>
                     <View style={{ paddingHorizontal: 20 }}>
+                        {orderResponse?.order_id && (
+                            <KeyValue
+                                keyValue={localeString('views.LSPS1.orderId')}
+                                value={orderResponse?.order_id}
+                            />
+                        )}
+                        {orderResponse?.lsp_balance_sat &&
+                            orderResponse?.client_balance_sat && (
+                                <KeyValue
+                                    keyValue={localeString(
+                                        'views.Channel.channelBalance'
+                                    )}
+                                    value={
+                                        <Amount
+                                            sats={
+                                                orderResponse?.client_balance_sat +
+                                                orderResponse?.lsp_balance_sat
+                                            }
+                                            sensitive
+                                            toggleable
+                                        />
+                                    }
+                                />
+                            )}
                         {orderResponse?.lsp_balance_sat && (
                             <KeyValue
                                 keyValue={localeString(
@@ -75,24 +99,6 @@ export default class LSPS1OrderResponse extends React.Component<
                                 }
                             />
                         )}
-                        {orderResponse?.lsp_balance_sat &&
-                            orderResponse?.client_balance_sat && (
-                                <KeyValue
-                                    keyValue={localeString(
-                                        'views.LSPS1.totalBalance'
-                                    )}
-                                    value={
-                                        <Amount
-                                            sats={
-                                                orderResponse?.client_balance_sat +
-                                                orderResponse?.lsp_balance_sat
-                                            }
-                                            sensitive
-                                            toggleable
-                                        />
-                                    }
-                                />
-                            )}
                         {orderResponse?.announce_channel && (
                             <KeyValue
                                 keyValue={localeString(
@@ -131,29 +137,6 @@ export default class LSPS1OrderResponse extends React.Component<
                                 }
                             />
                         )}
-                        {orderResponse?.created_at && (
-                            <KeyValue
-                                keyValue={localeString('general.createdAt')}
-                                value={moment(orderResponse?.created_at).format(
-                                    'MMM Do YYYY, h:mm:ss a'
-                                )}
-                            />
-                        )}
-                        {orderResponse?.expires_at && (
-                            <KeyValue
-                                keyValue={localeString('general.expiresAt')}
-                                value={moment(orderResponse?.expires_at).format(
-                                    'MMM Do YYYY, h:mm:ss a'
-                                )}
-                            />
-                        )}
-
-                        {orderResponse?.order_id && (
-                            <KeyValue
-                                keyValue={localeString('views.LSPS1.orderId')}
-                                value={orderResponse?.order_id}
-                            />
-                        )}
                         {orderResponse?.order_state && (
                             <KeyValue
                                 keyValue={localeString(
@@ -173,6 +156,22 @@ export default class LSPS1OrderResponse extends React.Component<
                                 }
                             />
                         )}
+                        {orderResponse?.created_at && (
+                            <KeyValue
+                                keyValue={localeString('general.createdAt')}
+                                value={moment(orderResponse?.created_at).format(
+                                    'MMM Do YYYY, h:mm:ss a'
+                                )}
+                            />
+                        )}
+                        {orderResponse?.expires_at && (
+                            <KeyValue
+                                keyValue={localeString('general.expiresAt')}
+                                value={moment(orderResponse?.expires_at).format(
+                                    'MMM Do YYYY, h:mm:ss a'
+                                )}
+                            />
+                        )}
                         {/* Legacy format */}
                         {payment && !payment.bolt11 && !payment.onchain && (
                             <>
@@ -187,30 +186,30 @@ export default class LSPS1OrderResponse extends React.Component<
                                         value={payment?.state}
                                     />
                                 )}
-                                {payment?.fee_total_sat && (
+                                {payment?.order_total_sat && (
                                     <KeyValue
                                         keyValue={localeString(
-                                            'views.Transaction.totalFees'
+                                            'views.LSPS1.orderTotal'
                                         )}
                                         value={
                                             <Amount
-                                                sats={payment?.fee_total_sat}
-                                                sensitive
+                                                sats={payment?.order_total_sat}
                                                 toggleable
+                                                sensitive
                                             />
                                         }
                                     />
                                 )}
-                                {payment?.order_total_sat && (
+                                {payment?.fee_total_sat && (
                                     <KeyValue
                                         keyValue={localeString(
-                                            'views.LSPS1.totalOrderValue'
+                                            'views.LSPS1.feeTotal'
                                         )}
                                         value={
                                             <Amount
-                                                sats={payment?.order_total_sat}
-                                                toggleable
+                                                sats={payment?.fee_total_sat}
                                                 sensitive
+                                                toggleable
                                             />
                                         }
                                     />
@@ -277,33 +276,16 @@ export default class LSPS1OrderResponse extends React.Component<
                                         value={payment?.bolt11.state}
                                     />
                                 )}
-                                {payment?.bolt11.fee_total_sat && (
+                                {payment?.bolt11?.order_total_sat && (
                                     <KeyValue
                                         keyValue={localeString(
-                                            'views.Transaction.totalFees'
+                                            'views.LSPS1.orderTotal'
                                         )}
                                         value={
                                             <Amount
                                                 sats={
                                                     payment?.bolt11
-                                                        .fee_total_sat
-                                                }
-                                                sensitive
-                                                toggleable
-                                            />
-                                        }
-                                    />
-                                )}
-                                {payment?.bolt11.order_total_sat && (
-                                    <KeyValue
-                                        keyValue={localeString(
-                                            'views.LSPS1.totalOrderValue'
-                                        )}
-                                        value={
-                                            <Amount
-                                                sats={
-                                                    payment?.bolt11
-                                                        .order_total_sat
+                                                        ?.order_total_sat
                                                 }
                                                 toggleable
                                                 sensitive
@@ -311,6 +293,25 @@ export default class LSPS1OrderResponse extends React.Component<
                                         }
                                     />
                                 )}
+                                {payment?.bolt11?.fee_total_sat &&
+                                    payment?.bolt11?.fee_total_sat !==
+                                        payment?.bolt11?.order_total_sat && (
+                                        <KeyValue
+                                            keyValue={localeString(
+                                                'views.LSPS1.feeTotal'
+                                            )}
+                                            value={
+                                                <Amount
+                                                    sats={
+                                                        payment?.bolt11
+                                                            ?.fee_total_sat
+                                                    }
+                                                    sensitive
+                                                    toggleable
+                                                />
+                                            }
+                                        />
+                                    )}
                                 {payment?.bolt11.expires_at && (
                                     <KeyValue
                                         keyValue={localeString(
@@ -422,20 +423,6 @@ export default class LSPS1OrderResponse extends React.Component<
                                         'views.Channel.title'
                                     )}
                                 />
-                                <KeyValue
-                                    keyValue={localeString('general.expiresAt')}
-                                    value={moment(channel?.expires_at).format(
-                                        'MMM Do YYYY, h:mm:ss a'
-                                    )}
-                                />
-                                <KeyValue
-                                    keyValue={localeString(
-                                        'views.LSPS1.fundedAt'
-                                    )}
-                                    value={moment(channel?.funded_at).format(
-                                        'MMM Do YYYY, h:mm:ss a'
-                                    )}
-                                />
                                 <KeyValue
                                     keyValue={localeString(
                                         'views.LSPS1.fundingOutpoint'
@@ -450,6 +437,20 @@ export default class LSPS1OrderResponse extends React.Component<
                                         )
                                     }
                                 />
+                                <KeyValue
+                                    keyValue={localeString(
+                                        'views.LSPS1.fundedAt'
+                                    )}
+                                    value={moment(channel?.funded_at).format(
+                                        'MMM Do YYYY, h:mm:ss a'
+                                    )}
+                                />
+                                <KeyValue
+                                    keyValue={localeString('general.expiresAt')}
+                                    value={moment(channel?.expires_at).format(
+                                        'MMM Do YYYY, h:mm:ss a'
+                                    )}
+                                />
                             </>
                         )}
                         {orderResponse?.order_state === 'CREATED' && orderView && (
diff --git a/locales/en.json b/locales/en.json
index 9ff25c062..d9b38c130 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -960,27 +960,27 @@
     "views.LSPS1.pubkeyAndHostNotFound": "Node pubkey and host are not set",
     "views.SyncRecovery.title": "Recovering wallet",
     "views.LSPS1.timeoutError": "Did not receive response from server",
-    "views.LSPS1.channelExpiryBlocks": "Channel Expiry Blocks",
-    "views.LSPS1.maxChannelExpiryBlocks": "Max channel Expiry Blocks",
-    "views.LSPS1.lspBalance": "LSP Balance",
+    "views.LSPS1.channelExpiryBlocks": "Channel expiry blocks",
+    "views.LSPS1.maxChannelExpiryBlocks": "Max channel expiry blocks",
+    "views.LSPS1.lspBalance": "LSP balance",
     "views.LSPS1.clientBalance": "Client balance",
-    "views.LSPS1.totalBalance": "Total balance",
     "views.LSPS1.totalChannelSize": "Total channel size",
-    "views.LSPS1.confirmWithinBlocks": "Confirm within blocks",
+    "views.LSPS1.confirmWithinBlocks": "Funding confirms within blocks",
     "views.LSPS1.orderId": "Order ID",
     "views.LSPS1.orderState": "Order state",
     "views.LSPS1.miniFeeFor0Conf": "Min fee for 0 conf",
     "views.LSPS1.minOnchainPaymentConfirmations": "Min Onchain Payment Confirmations",
     "views.LSPS1.onchainPayment": "Onchain payment",
-    "views.LSPS1.totalOrderValue": "Total order value",
-    "views.LSPS1.initialLSPBalance": "Initial LSP Balance",
-    "views.LSPS1.initialClientBalance": "Initial Client Balance",
+    "views.LSPS1.orderTotal": "Order total",
+    "views.LSPS1.feeTotal": "Fee total",
+    "views.LSPS1.initialLSPBalance": "Initial LSP balance",
+    "views.LSPS1.initialClientBalance": "Initial client balance",
     "views.LSPS1.minChannelConfirmations": "Min channel confirmations",
     "views.LSPS1.minOnchainPaymentSize": "Min onchain payment size",
-    "views.LSPS1.supportZeroChannelReserve": "Support zero channel reserve",
+    "views.LSPS1.supportZeroChannelReserve": "Supports zero channel reserve",
     "views.LSPS1.requiredChannelConfirmations": "Required channel confirmations",
-    "views.LSPS1.minFundingConfirmWithingBlocks": "Minimum funding confirm withing blocks",
-    "views.LSPS1.minRequiredChannelConfirmations": "Minimum required channel confirmations",
+    "views.LSPS1.minFundingConfirmWithingBlocks": "Min funding confirm within blocks",
+    "views.LSPS1.minRequiredChannelConfirmations": "Min required channel confirmations",
     "views.LSPS1.token": "Token",
     "views.LSPS1.refundOnchainAddress": "Refund onchain address",
     "views.LSPS1.getQuote": "Get quote",
@@ -988,7 +988,7 @@
     "views.LSPS1.makePaymentLN": "Make payment (LN)",
     "views.LSPS1.makePaymentOnchain": "Make payment (on-chain)",
     "views.LSPS1.goToSettings": "Go to settings",
-    "views.LSPS1.fundedAt": "Funded At",
+    "views.LSPS1.fundedAt": "Funded at",
     "views.LSPS1.fundingOutpoint": "Funding outpoint",
     "views.LSPS1.purchaseInbound": "Purchase inbound channel",
     "views.LSPS1.lsps1Spec": "LSPS1 API and spec",
diff --git a/views/Settings/LSPS1/index.tsx b/views/Settings/LSPS1/index.tsx
index fac118ad6..71b7bc2fd 100644
--- a/views/Settings/LSPS1/index.tsx
+++ b/views/Settings/LSPS1/index.tsx
@@ -516,43 +516,53 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
                                                         <KeyValue
                                                             keyValue={`${localeString(
                                                                 'views.Channel.channelBalance'
-                                                            )} (${localeString(
-                                                                'general.sats'
-                                                            )})`}
+                                                            )}`}
                                                             value={`${FiatStore.numberWithCommas(
                                                                 info?.min_channel_balance_sat
                                                             )} - ${FiatStore.numberWithCommas(
                                                                 info?.max_channel_balance_sat
-                                                            )}`}
-                                                        />
-                                                    )}
-                                                {info?.max_initial_client_balance_sat !==
-                                                    '0' &&
-                                                    info?.min_initial_client_balance_sat !==
-                                                        '0' && (
-                                                        <KeyValue
-                                                            keyValue={`${localeString(
-                                                                'views.LSPS1.initialClientBalance'
-                                                            )} (${localeString(
+                                                            )} ${localeString(
                                                                 'general.sats'
-                                                            )})`}
-                                                            value={`${info?.min_initial_client_balance_sat} - ${info?.max_initial_client_balance_sat}`}
+                                                            )}`}
                                                         />
                                                     )}
-
                                                 {info?.max_initial_lsp_balance_sat &&
                                                     info?.min_initial_lsp_balance_sat && (
                                                         <KeyValue
                                                             keyValue={`${localeString(
                                                                 'views.LSPS1.initialLSPBalance'
-                                                            )} (${localeString(
-                                                                'general.sats'
-                                                            )})`}
+                                                            )}`}
                                                             value={`${FiatStore.numberWithCommas(
                                                                 info?.min_initial_lsp_balance_sat
                                                             )} - ${FiatStore.numberWithCommas(
                                                                 info?.max_initial_lsp_balance_sat
+                                                            )} ${localeString(
+                                                                'general.sats'
+                                                            )}`}
+                                                        />
+                                                    )}
+                                                {info?.max_initial_client_balance_sat &&
+                                                    info?.min_initial_client_balance_sat && (
+                                                        <KeyValue
+                                                            keyValue={`${localeString(
+                                                                'views.LSPS1.initialClientBalance'
                                                             )}`}
+                                                            value={
+                                                                info?.max_initial_client_balance_sat ===
+                                                                info?.min_initial_client_balance_sat
+                                                                    ? `${
+                                                                          info?.min_initial_client_balance_sat
+                                                                      } ${localeString(
+                                                                          'general.sats'
+                                                                      )}`
+                                                                    : `${
+                                                                          info?.min_initial_client_balance_sat
+                                                                      } - ${
+                                                                          info?.max_initial_client_balance_sat
+                                                                      } ${localeString(
+                                                                          'general.sats'
+                                                                      )}`
+                                                            }
                                                         />
                                                     )}
                                                 {info?.max_channel_expiry_blocks && (