From 3b65110af632b3ef010906c3d54b30001ffda35d Mon Sep 17 00:00:00 2001
From: shubham <shubham@zeusln.com>
Date: Thu, 5 Sep 2024 20:57:09 +0530
Subject: [PATCH 1/3] Add modal to dismiss custodial wallet warning

---
 locales/en.json                           |   1 +
 views/Settings/CustodialWalletWarning.tsx | 149 +++++++++++++++++++++-
 2 files changed, 143 insertions(+), 7 deletions(-)

diff --git a/locales/en.json b/locales/en.json
index 3d32d0a75..3e8bfa10a 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -1143,6 +1143,7 @@
     "views.Settings.CustodialWalletWarning.graph3": "ZEUS has the ability to create a self-custodial wallet in the app. This wallet provides you with a 24-word seed phrase that gives you full control of your funds.",
     "views.Settings.CustodialWalletWarning.graph4": "To get started with your own self-custodial wallet, press the button below, and hit the 'Create mainnet wallet' button on the next screen.",
     "views.Settings.CustodialWalletWarning.create": "Create self-custodial wallet",
+    "views.Settings.CustodialWalletWarning.dismissWarning": "Dismiss warning",
     "views.PayCode.bolt12": "BOLT 12",
     "views.PayCode.offerId": "Offer ID",
     "views.PayCode.createOffer": "Create pay code",
diff --git a/views/Settings/CustodialWalletWarning.tsx b/views/Settings/CustodialWalletWarning.tsx
index b76fad7c1..6205127a7 100644
--- a/views/Settings/CustodialWalletWarning.tsx
+++ b/views/Settings/CustodialWalletWarning.tsx
@@ -1,7 +1,8 @@
 import * as React from 'react';
-import { StyleSheet, Text, View, ScrollView } from 'react-native';
+import { StyleSheet, Text, View, ScrollView, Modal } from 'react-native';
 import { inject, observer } from 'mobx-react';
 import { StackNavigationProp } from '@react-navigation/stack';
+import { CheckBox } from 'react-native-elements';
 
 import Button from '../../components/Button';
 import Header from '../../components/Header';
@@ -12,6 +13,14 @@ import { themeColor } from '../../utils/ThemeUtils';
 
 import SettingsStore from '../../stores/SettingsStore';
 
+interface CustodialWalletWarningState {
+    checkbox1: boolean;
+    checkbox2: boolean;
+    checkbox3: boolean;
+    checkbox4: boolean;
+    showModal: boolean;
+}
+
 interface CustodialWalletWarningProps {
     SettingsStore: SettingsStore;
     navigation: StackNavigationProp<any, any>;
@@ -21,10 +30,37 @@ interface CustodialWalletWarningProps {
 @observer
 export default class CustodialWalletWarning extends React.Component<
     CustodialWalletWarningProps,
-    {}
+    CustodialWalletWarningState
 > {
+    constructor(props: CustodialWalletWarningProps) {
+        super(props);
+        this.state = {
+            checkbox1: false,
+            checkbox2: false,
+            checkbox3: false,
+            checkbox4: false,
+            showModal: false
+        };
+    }
+
+    areAllChecked = () => {
+        const { checkbox1, checkbox2, checkbox3, checkbox4 } = this.state;
+        return checkbox1 && checkbox2 && checkbox3 && checkbox4;
+    };
+
+    toggleModal = () => {
+        this.setState({
+            showModal: !this.state.showModal,
+            checkbox1: false,
+            checkbox2: false,
+            checkbox3: false,
+            checkbox4: false
+        });
+    };
+
     render() {
         const { SettingsStore, navigation } = this.props;
+        const { showModal } = this.state;
         const nodes = SettingsStore?.settings?.nodes || [];
 
         // check if user has embedded node wallet configured already
@@ -111,10 +147,7 @@ export default class CustodialWalletWarning extends React.Component<
                     <View style={{ bottom: 10 }}>
                         <View
                             style={{
-                                paddingTop: 30,
-                                paddingBottom: 15,
-                                paddingLeft: 10,
-                                paddingRight: 10
+                                paddingBottom: 10
                             }}
                         >
                             <Button
@@ -135,6 +168,86 @@ export default class CustodialWalletWarning extends React.Component<
                         </View>
                     </View>
                 )}
+
+                <Modal
+                    visible={showModal}
+                    transparent={true}
+                    animationType="slide"
+                    onRequestClose={this.toggleModal}
+                >
+                    <View style={styles.modalOverlay}>
+                        <View
+                            style={{
+                                ...styles.modalContainer,
+                                backgroundColor: themeColor('background')
+                            }}
+                        >
+                            <Text
+                                style={{
+                                    ...styles.text,
+                                    color: themeColor('text')
+                                }}
+                            >
+                                Please confirm the following to dismiss the
+                                warning:
+                            </Text>
+                            {[
+                                "I know that I don't have custody of the funds in this wallet without the 12 or 24 word seed phrase",
+                                'I know that an LNDHub account password is not the same as a seed phrase',
+                                'I either set up this connection myself or I trust the person who set it up',
+                                "I'm not just lying to get this over with"
+                            ].map((title, index) => (
+                                <CheckBox
+                                    key={index}
+                                    title={title}
+                                    checked={this.state[`checkbox${index + 1}`]}
+                                    onPress={() =>
+                                        this.setState((prevState) => ({
+                                            [`checkbox${index + 1}`]:
+                                                !prevState[
+                                                    `checkbox${index + 1}`
+                                                ]
+                                        }))
+                                    }
+                                    containerStyle={{
+                                        backgroundColor: 'transparent',
+                                        borderWidth: 0
+                                    }}
+                                    textStyle={{
+                                        ...styles.text,
+                                        color: themeColor('text')
+                                    }}
+                                />
+                            ))}
+                            <View style={styles.modalButtonContainer}>
+                                <Button
+                                    title={localeString(
+                                        'views.Settings.CustodialWalletWarning.dismissWarning'
+                                    )}
+                                    disabled={!this.areAllChecked()}
+                                    onPress={() => {
+                                        this.toggleModal();
+                                    }}
+                                    containerStyle={{ paddingBottom: 20 }}
+                                />
+                                <Button
+                                    title="CLOSE"
+                                    onPress={() => {
+                                        this.toggleModal();
+                                    }}
+                                    secondary
+                                />
+                            </View>
+                        </View>
+                    </View>
+                </Modal>
+                <Button
+                    title={localeString(
+                        'views.Settings.CustodialWalletWarning.dismissWarning'
+                    )}
+                    onPress={this.toggleModal}
+                    secondary
+                />
             </Screen>
         );
     }
@@ -142,7 +255,29 @@ export default class CustodialWalletWarning extends React.Component<
 
 const styles = StyleSheet.create({
     text: {
-        fontSize: 18,
+        fontSize: 16,
+        fontWeight: 'normal',
         paddingTop: 12
+    },
+    modalOverlay: {
+        flex: 1,
+        backgroundColor: 'rgba(0, 0, 0, 0.4)',
+        justifyContent: 'center',
+        alignItems: 'center'
+    },
+    modalContainer: {
+        width: '86%',
+        padding: 22,
+        borderRadius: 10,
+        alignItems: 'center'
+    },
+    modalButtonContainer: {
+        marginTop: 20,
+        width: '100%',
+        alignItems: 'center'
+    },
+    closeButton: {
+        marginTop: 10,
+        color: 'blue'
     }
 });

From fec86d0d24cff833948838494259eadbd848ac7a Mon Sep 17 00:00:00 2001
From: shubham <shubham@zeusln.com>
Date: Fri, 13 Sep 2024 19:59:28 +0530
Subject: [PATCH 2/3] Add dismissCustodialWarning property to the node and
 update it to disable the warning in lndhub nodes

---
 components/WalletHeader.tsx               |  3 +-
 stores/SettingsStore.ts                   |  3 ++
 views/Settings/CustodialWalletWarning.tsx | 37 +++++++++++++++++++++++
 views/Settings/NodeConfiguration.tsx      |  6 ++++
 4 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/components/WalletHeader.tsx b/components/WalletHeader.tsx
index 3de14736a..ad8fe2bef 100644
--- a/components/WalletHeader.tsx
+++ b/components/WalletHeader.tsx
@@ -339,7 +339,8 @@ export default class WalletHeader extends React.Component<
         };
 
         const CustodialBadge = () => {
-            return implementation === 'lndhub' ? (
+            return implementation === 'lndhub' &&
+                !selectedNode.dismissCustodialWarning ? (
                 <Badge
                     onPress={() =>
                         navigation.navigate('CustodialWalletWarning')
diff --git a/stores/SettingsStore.ts b/stores/SettingsStore.ts
index 6edb16e41..9e511dc96 100644
--- a/stores/SettingsStore.ts
+++ b/stores/SettingsStore.ts
@@ -22,6 +22,7 @@ export interface Node {
     certVerification?: boolean;
     enableTor?: boolean;
     nickname?: string;
+    dismissCustodialWarning: boolean;
     photo?: string;
     // LNC
     pairingPhrase?: string;
@@ -1180,6 +1181,7 @@ export default class SettingsStore {
     @observable username: string;
     @observable password: string;
     @observable lndhubUrl: string;
+    @observable dismissCustodialWarning: boolean = false;
     @observable public createAccountError: string;
     @observable public createAccountSuccess: string;
     @observable public accessToken: string;
@@ -1529,6 +1531,7 @@ export default class SettingsStore {
                     this.macaroonHex = node.macaroonHex;
                     this.rune = node.rune;
                     this.accessKey = node.accessKey;
+                    this.dismissCustodialWarning = node.dismissCustodialWarning;
                     this.implementation = node.implementation || 'lnd';
                     this.certVerification = node.certVerification || false;
                     this.enableTor = node.enableTor;
diff --git a/views/Settings/CustodialWalletWarning.tsx b/views/Settings/CustodialWalletWarning.tsx
index 6205127a7..9edab2b71 100644
--- a/views/Settings/CustodialWalletWarning.tsx
+++ b/views/Settings/CustodialWalletWarning.tsx
@@ -58,6 +58,41 @@ export default class CustodialWalletWarning extends React.Component<
         });
     };
 
+    updateNode = () => {
+        const { SettingsStore } = this.props;
+        const { settings, updateSettings } = SettingsStore;
+        const { nodes, selectedNode } = settings;
+
+        if (nodes && nodes.length > 0) {
+            const currentNodeIndex = selectedNode || 0;
+            const currentNode = nodes[currentNodeIndex];
+
+            // Update the dismissCustodialWarning property
+            const updatedNode = {
+                ...currentNode,
+                dismissCustodialWarning: true
+            };
+
+            // Replace the current node with the updated node
+            const updatedNodes = [...nodes];
+            updatedNodes[currentNodeIndex] = updatedNode;
+
+            // Save the updated nodes array back to the settings
+            updateSettings({ nodes: updatedNodes })
+                .then(() => {
+                    console.log('Node configuration updated successfully.');
+                })
+                .catch((error) => {
+                    console.error(
+                        'Failed to update node configuration:',
+                        error
+                    );
+                });
+        } else {
+            console.error('No nodes available to update.');
+        }
+    };
+
     render() {
         const { SettingsStore, navigation } = this.props;
         const { showModal } = this.state;
@@ -226,7 +261,9 @@ export default class CustodialWalletWarning extends React.Component<
                                     )}
                                     disabled={!this.areAllChecked()}
                                     onPress={() => {
+                                        this.updateNode();
                                         this.toggleModal();
+                                        navigation.popTo('Wallet');
                                     }}
                                     containerStyle={{ paddingBottom: 20 }}
                                 />
diff --git a/views/Settings/NodeConfiguration.tsx b/views/Settings/NodeConfiguration.tsx
index e5de6397d..ad1b37300 100644
--- a/views/Settings/NodeConfiguration.tsx
+++ b/views/Settings/NodeConfiguration.tsx
@@ -87,6 +87,7 @@ interface NodeConfigurationState {
     username: string | undefined; // lndhub
     password: string | undefined; // lndhub, eclair
     existingAccount: boolean; // lndhub
+    dismissCustodialWarning: boolean;
     implementation: Implementations;
     certVerification: boolean;
     saved: boolean;
@@ -132,6 +133,7 @@ export default class NodeConfiguration extends React.Component<
     state: NodeConfigurationState = {
         node: null,
         nickname: '',
+        dismissCustodialWarning: false,
         host: '',
         port: '',
         macaroonHex: '',
@@ -309,6 +311,7 @@ export default class NodeConfiguration extends React.Component<
         if (node) {
             const {
                 nickname,
+                dismissCustodialWarning,
                 host,
                 port,
                 macaroonHex,
@@ -337,6 +340,7 @@ export default class NodeConfiguration extends React.Component<
             this.setState({
                 node,
                 nickname,
+                dismissCustodialWarning,
                 host,
                 port,
                 macaroonHex,
@@ -379,6 +383,7 @@ export default class NodeConfiguration extends React.Component<
         const { SettingsStore, navigation } = this.props;
         const {
             nickname,
+            dismissCustodialWarning,
             host,
             port,
             url,
@@ -413,6 +418,7 @@ export default class NodeConfiguration extends React.Component<
 
         const node = {
             nickname,
+            dismissCustodialWarning,
             host,
             port,
             url,

From 2cff1edb7d32bc2eddf2715e51fd74fa36909041 Mon Sep 17 00:00:00 2001
From: shubham <shubham@zeusln.com>
Date: Mon, 16 Sep 2024 13:04:56 +0530
Subject: [PATCH 3/3] Localize strings

---
 locales/en.json                           |  5 +++++
 views/Settings/CustodialWalletWarning.tsx | 27 ++++++++++++++---------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/locales/en.json b/locales/en.json
index 3e8bfa10a..f0febea0e 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -1144,6 +1144,11 @@
     "views.Settings.CustodialWalletWarning.graph4": "To get started with your own self-custodial wallet, press the button below, and hit the 'Create mainnet wallet' button on the next screen.",
     "views.Settings.CustodialWalletWarning.create": "Create self-custodial wallet",
     "views.Settings.CustodialWalletWarning.dismissWarning": "Dismiss warning",
+    "views.Settings.CustodialWalletWarning.dismissWarningHeader": "Please confirm the following to dismiss the warning:",
+    "views.Settings.CustodialWalletWarning.dismissWarning1": "I know that I don't have custody of the funds in this wallet without the 12 or 24 word seed phrase",
+    "views.Settings.CustodialWalletWarning.dismissWarning2": "I know that an LNDHub account password is not the same as a seed phrase",
+    "views.Settings.CustodialWalletWarning.dismissWarning3": "I either set up this connection myself or I trust the person who set it up",
+    "views.Settings.CustodialWalletWarning.dismissWarning4": "I'm not just lying to get this over with",
     "views.PayCode.bolt12": "BOLT 12",
     "views.PayCode.offerId": "Offer ID",
     "views.PayCode.createOffer": "Create pay code",
diff --git a/views/Settings/CustodialWalletWarning.tsx b/views/Settings/CustodialWalletWarning.tsx
index 9edab2b71..1ddbb384e 100644
--- a/views/Settings/CustodialWalletWarning.tsx
+++ b/views/Settings/CustodialWalletWarning.tsx
@@ -223,14 +223,23 @@ export default class CustodialWalletWarning extends React.Component<
                                     color: themeColor('text')
                                 }}
                             >
-                                Please confirm the following to dismiss the
-                                warning:
+                                {localeString(
+                                    'views.Settings.CustodialWalletWarning.dismissWarningHeader'
+                                )}
                             </Text>
                             {[
-                                "I know that I don't have custody of the funds in this wallet without the 12 or 24 word seed phrase",
-                                'I know that an LNDHub account password is not the same as a seed phrase',
-                                'I either set up this connection myself or I trust the person who set it up',
-                                "I'm not just lying to get this over with"
+                                localeString(
+                                    'views.Settings.CustodialWalletWarning.dismissWarning1'
+                                ),
+                                localeString(
+                                    'views.Settings.CustodialWalletWarning.dismissWarning2'
+                                ),
+                                localeString(
+                                    'views.Settings.CustodialWalletWarning.dismissWarning3'
+                                ),
+                                localeString(
+                                    'views.Settings.CustodialWalletWarning.dismissWarning4'
+                                )
                             ].map((title, index) => (
                                 <CheckBox
                                     key={index}
@@ -268,7 +277,7 @@ export default class CustodialWalletWarning extends React.Component<
                                     containerStyle={{ paddingBottom: 20 }}
                                 />
                                 <Button
-                                    title="CLOSE"
+                                    title={localeString('general.close')}
                                     onPress={() => {
                                         this.toggleModal();
                                     }}
@@ -312,9 +321,5 @@ const styles = StyleSheet.create({
         marginTop: 20,
         width: '100%',
         alignItems: 'center'
-    },
-    closeButton: {
-        marginTop: 10,
-        color: 'blue'
     }
 });