POS: add confirmation preference scaffolding

ZeusLN · Jan 17, 2023 · 1fda264 · 1fda264
1 parent 18323b9
commit 1fda264
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 37 deletions.
diff --git a/locales/en.json b/locales/en.json
@@ -465,6 +465,7 @@
     "views.Settings.POS.enableSquare": "Enable Square POS integration",
     "views.Settings.POS.accessToken": "Square Access token",
     "views.Settings.POS.locationId": "Square Location ID",
+    "views.Settings.POS.confPref": "Confirmation preference",
     "views.Transaction.title": "Transaction",
     "views.Transaction.totalFees": "Total Fees",
     "views.Transaction.transactionHash": "Transaction Hash",

diff --git a/stores/InvoicesStore.ts b/stores/InvoicesStore.ts
@@ -115,16 +115,16 @@ export default class InvoicesStore {
             this.getNewAddress(addressType ? { type: addressType } : null);
         }
 
-        const rHash = this.createInvoice(
+        return this.createInvoice(
             memo,
             value,
             expiry,
             lnurl,
             ampInvoice,
             routeHints
-        );
-
-        return { rHash, onChainAddress: this.onChainAddress };
+        ).then((rHash: string) => {
+            return { rHash, onChainAddress: this.onChainAddress };
+        });
     };
 
     @action

diff --git a/views/Receive.tsx b/views/Receive.tsx
@@ -166,7 +166,6 @@ export default class Receive extends React.Component<
     };
 
     subscribeInvoice = (rHash: string, onChainAddress: string) => {
-        console.log('!!!subscribeInvoice', { rHash, onChainAddress });
         const { InvoicesStore, PosStore, SettingsStore } = this.props;
         const { orderId, orderAmount, orderTip, value } = this.state;
         const { implementation, settings } = SettingsStore;
@@ -237,22 +236,21 @@ export default class Receive extends React.Component<
         }
 
         if (implementation === 'lnd') {
-            // BackendUtils.subscribeInvoice(rHash).then((response: any) => {
-            //     const result = response.result;
-            //     if (result && result.settled) {
-            //         setWatchedInvoicePaid(result.amt_paid_sat);
-            //         if (orderId)
-            //             PosStore.makePayment({
-            //                 orderId,
-            //                 orderAmount,
-            //                 orderTip
-            //             });
-            //     }
-            // });
+            BackendUtils.subscribeInvoice(rHash).then((response: any) => {
+                const result = response.result;
+                if (result && result.settled) {
+                    setWatchedInvoicePaid(result.amt_paid_sat);
+                    if (orderId)
+                        PosStore.makePayment({
+                            orderId,
+                            orderAmount,
+                            orderTip
+                        });
+                }
+            });
 
             BackendUtils.subscribeTransactions().then((response: any) => {
                 const result = response.result;
-                console.log('RESULT', result);
                 if (
                     result.dest_addresses.includes(onChainAddress) &&
                     result.num_confirmations >= numConfPreference &&

diff --git a/views/Settings/PointOfSale.tsx b/views/Settings/PointOfSale.tsx
@@ -233,26 +233,31 @@ export default class PointOfSale extends React.Component<
                                     }}
                                 />
 
-                                <DropdownSetting
-                                    title={localeString(
-                                        'views.Settings.Display.defaultView'
-                                    )}
-                                    selectedValue={confirmationPreference}
-                                    onValueChange={async (value: string) => {
-                                        this.setState({
-                                            confirmationPreference: value
-                                        });
-                                        await updateSettings({
-                                            pos: {
-                                                squareEnabled,
-                                                squareAccessToken,
-                                                squareLocationId,
+                                {false && (
+                                    <DropdownSetting
+                                        title={localeString(
+                                            'views.Settings.POS.confPref'
+                                        )}
+                                        selectedValue={confirmationPreference}
+                                        onValueChange={async (
+                                            value: string
+                                        ) => {
+                                            this.setState({
                                                 confirmationPreference: value
-                                            }
-                                        });
-                                    }}
-                                    values={POS_CONF_PREF_KEYS}
-                                />
+                                            });
+                                            await updateSettings({
+                                                pos: {
+                                                    squareEnabled,
+                                                    squareAccessToken,
+                                                    squareLocationId,
+                                                    confirmationPreference:
+                                                        value
+                                                }
+                                            });
+                                        }}
+                                        values={POS_CONF_PREF_KEYS}
+                                    />
+                                )}
                             </>
                         )}
                     </ScrollView>

diff --git a/views/Wallet/PosPane.tsx b/views/Wallet/PosPane.tsx
@@ -23,6 +23,8 @@ import PosStore from '../../stores/PosStore';
 import UnitsStore from '../../stores/UnitsStore';
 import SettingsStore from '../../stores/SettingsStore';
 
+import Order from '../../models/Order';
+
 import { themeColor } from '../../utils/ThemeUtils';
 import { localeString } from '../../utils/LocaleUtils';