Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Embedded LND: revamped wallet recovery process #1977

Merged
merged 7 commits into from
Feb 26, 2024
Merged

Embedded LND: revamped wallet recovery process #1977

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3d954c1
Embedded LND: revamped wallet recovery process
kaloudis Feb 14, 2024
4bb9c93
SeedRecovery: remove modal code
kaloudis Feb 21, 2024
5bcab0a
SeedRecovery: highlight active word index
kaloudis Feb 21, 2024
495e7c6
SeedRecovery: Android: prevent MnemonicWords from being cropped off
kaloudis Feb 21, 2024
c66f6aa
SeedRecovery: TextInput: hide suggestions when text field empty
kaloudis Feb 21, 2024
2681e65
SeedRecovery: highlight SCB fields correctly
kaloudis Feb 21, 2024
b9e77bc
Merge branch 'master' into wallet-recovery
kaloudis Feb 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions Navigation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,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';
Expand Down Expand Up @@ -324,6 +325,9 @@ const AppScenes = {
Seed: {
screen: Seed
},
SeedRecovery: {
screen: SeedRecovery
},
Sync: {
screen: Sync
},
Expand Down
23 changes: 16 additions & 7 deletions components/TextInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,16 @@ interface TextInputProps {
autoFocus?: boolean;
secureTextEntry?: boolean;
prefix?: string;
prefixStyle?: any;
suffix?: string;
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,
Expand All @@ -50,12 +52,14 @@ export default function TextInput(props: TextInputProps) {
autoFocus,
secureTextEntry,
prefix,
prefixStyle,
suffix,
toggleUnits,
onPressIn,
right
} = props;

},
ref
) => {
const defaultStyle = numberOfLines
? {
paddingTop: 10
Expand All @@ -74,12 +78,14 @@ export default function TextInput(props: TextInputProps) {
paddingRight: 5,
marginRight: 5,
color: themeColor('text'),
backgroundColor: themeColor('background')
backgroundColor: themeColor('background'),
...prefixStyle
}
: {
...styles.unit,
marginRight: 5,
color: themeColor('text')
color: themeColor('text'),
...prefixStyle
}
}
>
Expand Down Expand Up @@ -154,6 +160,7 @@ export default function TextInput(props: TextInputProps) {
autoFocus={autoFocus}
secureTextEntry={secureTextEntry}
onPressIn={onPressIn}
ref={ref}
/>
{suffix ? (
toggleUnits ? (
Expand All @@ -168,7 +175,7 @@ export default function TextInput(props: TextInputProps) {
) : null}
</View>
);
}
};

const styles = StyleSheet.create({
wrapper: {
Expand All @@ -191,3 +198,5 @@ const styles = StyleSheet.create({
fontFamily: 'PPNeueMontreal-Book'
}
});

export default React.forwardRef(TextInput);
7 changes: 6 additions & 1 deletion ios/zeus.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1839,9 +1839,9 @@
MARKETING_VERSION = 0.8.2;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = (
"$(inherited)",
"-ObjC",
"-lc++",
"$(inherited)",
);
PRODUCT_BUNDLE_IDENTIFIER = com.zeusln.zeus;
PRODUCT_NAME = zeus;
Expand Down Expand Up @@ -1892,6 +1892,11 @@
"-ObjC",
"-lc++",
);
"OTHER_LDFLAGS[arch=*]" = (
"-ObjC",
"-lc++",
"$(inherited)",
);
PRODUCT_BUNDLE_IDENTIFIER = com.zeusln.zeus;
PRODUCT_NAME = zeus;
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
2 changes: 2 additions & 0 deletions locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
5 changes: 5 additions & 0 deletions stores/SettingsStore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,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',
Expand Down
Loading
Loading