Embedded LND: revamped wallet recovery process

ZeusLN · Feb 6, 2024 · b992808 · b992808
1 parent 256f0b2
commit b992808
Show file tree

Hide file tree

Showing 8 changed files with 3,255 additions and 57 deletions.
diff --git a/Navigation.ts b/Navigation.ts
@@ -113,6 +113,7 @@ import EditFee from './views/EditFee';
 
 // Embedded LND
 import Seed from './views/Settings/Seed';
+import SeedRecovery from './views/Settings/SeedRecovery';
 import Sync from './views/Sync';
 import LspExplanationFees from './views/Explanations/LspExplanationFees';
 import LspExplanationRouting from './views/Explanations/LspExplanationRouting';
@@ -321,6 +322,9 @@ const AppScenes = {
     Seed: {
         screen: Seed
     },
+    SeedRecovery: {
+        screen: SeedRecovery
+    },
     Sync: {
         screen: Sync
     },

diff --git a/components/TextInput.tsx b/components/TextInput.tsx
@@ -31,10 +31,11 @@ interface TextInputProps {
     toggleUnits?: any;
     onPressIn?: any;
     right?: number;
+    ref?: React.Ref<TextInputRN>;
 }
 
-export default function TextInput(props: TextInputProps) {
-    const {
+const TextInput: React.FC<TextInputProps> = (
+    {
         placeholder,
         value,
         onChangeText,
@@ -54,8 +55,9 @@ export default function TextInput(props: TextInputProps) {
         toggleUnits,
         onPressIn,
         right
-    } = props;
-
+    },
+    ref
+) => {
     const defaultStyle = numberOfLines
         ? {
               paddingTop: 10
@@ -154,6 +156,7 @@ export default function TextInput(props: TextInputProps) {
                 autoFocus={autoFocus}
                 secureTextEntry={secureTextEntry}
                 onPressIn={onPressIn}
+                ref={ref}
             />
             {suffix ? (
                 toggleUnits ? (
@@ -168,7 +171,7 @@ export default function TextInput(props: TextInputProps) {
             ) : null}
         </View>
     );
-}
+};
 
 const styles = StyleSheet.create({
     wrapper: {
@@ -191,3 +194,5 @@ const styles = StyleSheet.create({
         fontFamily: 'PPNeueMontreal-Book'
     }
 });
+
+export default React.forwardRef(TextInput);
diff --git a/ios/zeus.xcodeproj/project.pbxproj b/ios/zeus.xcodeproj/project.pbxproj
@@ -1843,9 +1843,9 @@
 				MARKETING_VERSION = 0.8.1;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = (
-					"$(inherited)",
 					"-ObjC",
 					"-lc++",
+					"$(inherited)",
 				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.zeusln.zeus;
 				PRODUCT_NAME = zeus;
@@ -1896,6 +1896,11 @@
 					"-ObjC",
 					"-lc++",
 				);
+				"OTHER_LDFLAGS[arch=*]" = (
+					"-ObjC",
+					"-lc++",
+					"$(inherited)",
+				);
 				PRODUCT_BUNDLE_IDENTIFIER = com.zeusln.zeus;
 				PRODUCT_NAME = zeus;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -2140,6 +2145,8 @@
 					"-ld_classic",
 					"-Wl",
 					"-ld_classic",
+					"-Wl",
+					"-ld_classic",
 					"-Wl -ld_classic ",
 				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";
@@ -2224,6 +2231,8 @@
 					"-ld_classic",
 					"-Wl",
 					"-ld_classic",
+					"-Wl",
+					"-ld_classic",
 					"-Wl -ld_classic ",
 				);
 				REACT_NATIVE_PATH = "${PODS_ROOT}/../../node_modules/react-native";

diff --git a/locales/en.json b/locales/en.json
@@ -107,6 +107,8 @@
     "views.Settings.SocialMedia.title": "Social media",
     "views.Settings.SocialMedia.twitter": "X / Twitter",
     "views.Settings.Support.store": "ZEUS merch store",
+    "network.mainnet": "Mainnet",
+    "network.testnet": "Testnet",
     "nostr.nostr": "Nostr",
     "nostr.keys": "Nostr keys",
     "nostr.pubkey": "Nostr pubkey",

diff --git a/stores/SettingsStore.ts b/stores/SettingsStore.ts
@@ -183,6 +183,11 @@ export const INTERFACE_KEYS = [
     { key: '[DEPRECATED] Eclair', value: 'eclair' }
 ];
 
+export const EMBEDDED_NODE_NETWORK_KEYS = [
+    { key: 'Mainnet', translateKey: 'network.mainnet', value: 'mainnet' },
+    { key: 'Testnet', translateKey: 'network.testnet', value: 'testnet' }
+];
+
 export const LNC_MAILBOX_KEYS = [
     {
         key: 'mailbox.terminal.lightning.today:443',