Skip to content

[Releases] v0.6.0-rc2 b #775

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

Merged
kaloudis merged 6 commits into from
Feb 8, 2022
Merged

[Releases] v0.6.0-rc2 b #775

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7e8e7ce
Send: make sure destination field doesn't autocorrect (#771)
kaloudis Feb 7, 2022
fe3068c
Wallet: modify style of Tor restart button (#772)
kaloudis Feb 7, 2022
4fcea24
Lockscreen enhancements (#773)
kaloudis Feb 7, 2022
6af5164
Nodes: refresh list after adding/delete node (#776)
kaloudis Feb 7, 2022
ee0a11a
Enforce modal warning text color (#778)
kaloudis Feb 7, 2022
a8de711
iOS Version Bump: v0.6.0-rc2 (b) (#779)
kaloudis Feb 7, 2022
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
5 changes: 4 additions & 1 deletion components/TextInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ interface TextInputProps {
autoCapitalize?: string;
autoCorrect?: boolean;
multiline?: boolean;
autoFocus?: boolean;
}

function TextInput(props: TextInputProps) {
Expand All @@ -28,7 +29,8 @@ function TextInput(props: TextInputProps) {
keyboardType,
autoCapitalize,
autoCorrect,
multiline
multiline,
autoFocus
} = props;

const defaultStyle = numberOfLines
Expand Down Expand Up @@ -73,6 +75,7 @@ function TextInput(props: TextInputProps) {
autoCapitalize={autoCapitalize}
autoCorrect={autoCorrect}
multiline={multiline}
autoFocus={autoFocus}
/>
);
}
Expand Down
4 changes: 2 additions & 2 deletions ios/zeus.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1360,7 +1360,7 @@
CODE_SIGN_ENTITLEMENTS = zeus/zeus.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 17;
CURRENT_PROJECT_VERSION = 18;
DEAD_CODE_STRIPPING = NO;
DEVELOPMENT_TEAM = 7222UU8F2H;
ENABLE_BITCODE = NO;
Expand Down Expand Up @@ -1399,7 +1399,7 @@
CODE_SIGN_ENTITLEMENTS = zeus/zeusRelease.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 17;
CURRENT_PROJECT_VERSION = 18;
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
HEADER_SEARCH_PATHS = (
Expand Down
11 changes: 7 additions & 4 deletions views/Lockscreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
import * as React from 'react';
import { ScrollView, StyleSheet, Text, TextInput, View } from 'react-native';
import { ScrollView, StyleSheet, Text, View } from 'react-native';
import { inject, observer } from 'mobx-react';

import Button from './../components/Button';
import { ErrorMessage } from './../components/SuccessErrorMessage';
import TextInput from './../components/TextInput';

import LinkingUtils from './../utils/LinkingUtils';
import { localeString } from './../utils/LocaleUtils';

Expand Down Expand Up @@ -91,7 +94,7 @@ export default class Lockscreen extends React.Component<
)}
/>
)}
<Text style={{ color: 'white' }}>
<Text style={{ color: '#A7A9AC' }}>
{localeString('views.Lockscreen.passphrase')}
</Text>
<TextInput
Expand All @@ -109,6 +112,7 @@ export default class Lockscreen extends React.Component<
autoCorrect={false}
secureTextEntry={hidden}
style={styles.textInputDark}
autoFocus={true}
/>
<View style={styles.button}>
<Button
Expand Down Expand Up @@ -147,8 +151,7 @@ const styles = StyleSheet.create({
},
container: {
flex: 1,
backgroundColor: 'black',
paddingTop: 200
backgroundColor: '#1f2328'
},
button: {
paddingTop: 15,
Expand Down
1 change: 1 addition & 0 deletions views/Send.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,7 @@ export default class Send extends React.Component<SendProps, SendState> {
this.validateAddress(text);
}}
style={styles.textInput}
autoCorrect={false}
/>
{!!error_msg && !!destination && (
<View style={{ paddingTop: 10, paddingBottom: 10 }}>
Expand Down
30 changes: 23 additions & 7 deletions views/Settings/AddEditNode.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ export default class AddEditNode extends React.Component<
privacy: settings.privacy
})
).then(() => {
navigation.navigate('Wallet', { refresh: true });
navigation.navigate('Nodes', { refresh: true });
});
};

Expand Down Expand Up @@ -508,18 +508,26 @@ export default class AddEditNode extends React.Component<
<View style={styles.modal}>
{showLndHubModal && (
<>
<Text style={{ fontSize: 40 }}>
<Text
style={{ fontSize: 40, color: 'black' }}
>
{localeString('general.warning')}
</Text>
<Text style={{ paddingTop: 20 }}>
<Text
style={{
paddingTop: 20,
color: 'black'
}}
>
{localeString(
'views.Settings.AddEditNode.lndhubWarning'
)}
</Text>
<Text
style={{
paddingTop: 20,
paddingBottom: 20
paddingBottom: 20,
color: 'black'
}}
>
{localeString(
Expand Down Expand Up @@ -572,18 +580,26 @@ export default class AddEditNode extends React.Component<
)}
{showCertModal && (
<>
<Text style={{ fontSize: 40 }}>
<Text
style={{ fontSize: 40, color: 'black' }}
>
{localeString('general.warning')}
</Text>
<Text style={{ paddingTop: 20 }}>
<Text
style={{
paddingTop: 20,
color: 'black'
}}
>
{localeString(
'views.Settings.AddEditNode.certificateWarning1'
)}
</Text>
<Text
style={{
paddingTop: 20,
paddingBottom: 20
paddingBottom: 20,
color: 'black'
}}
>
{localeString(
Expand Down
39 changes: 18 additions & 21 deletions views/Settings/Nodes.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,40 +31,37 @@ export default class Nodes extends React.Component<NodesProps, NodesState> {
loading: false
};

renderSeparator = () => (
<View
style={{
height: 1,
width: '86%',
backgroundColor: themeColor('separator'),
marginLeft: '14%'
}}
/>
);

componentDidMount() {
const { SettingsStore } = this.props;
const { settings } = SettingsStore;
this.refreshSettings();

if (settings) {
this.setState({
nodes: settings.nodes || []
});
}
}

UNSAFE_componentWillReceiveProps = () => {
this.refreshSettings();
};

async refreshSettings() {
this.setState({
loading: true
});
await this.props.SettingsStore.getSettings().then(() => {
await this.props.SettingsStore.getSettings().then((settings: any) => {
this.setState({
loading: false
loading: false,
nodes: (settings && settings.nodes) || []
});
});
}

renderSeparator = () => (
<View
style={{
height: 1,
width: '86%',
backgroundColor: themeColor('separator'),
marginLeft: '14%'
}}
/>
);

render() {
const { navigation, SettingsStore } = this.props;
const { loading, nodes } = this.state;
Expand Down
8 changes: 2 additions & 6 deletions views/Wallet/Wallet.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import {
View
} from 'react-native';
import LinearGradient from 'react-native-linear-gradient';
import { Button } from 'react-native-elements';

import { inject, observer } from 'mobx-react';
import Clipboard from '@react-native-clipboard/clipboard';
Expand All @@ -16,6 +15,7 @@ import { createBottomTabNavigator } from '@react-navigation/bottom-tabs';
import ChannelsPane from '../Channels/ChannelsPane';
import MainPane from './MainPane';

import Button from './../../components/Button';
import LoadingIndicator from './../../components/LoadingIndicator';

import RESTUtils from './../../utils/RESTUtils';
Expand Down Expand Up @@ -241,18 +241,14 @@ export default class Wallet extends React.Component<WalletProps, {}> {
/>

{error && enableTor && (
<View style={{ marginTop: 10 }}>
<View style={{ backgroundColor: themeColor('error') }}>
<Button
title={localeString('views.Wallet.restartTor')}
icon={{
name: 'sync',
size: 25,
color: 'white'
}}
buttonStyle={{
backgroundColor: 'gray',
borderRadius: 30
}}
onPress={() => this.restartTorAndReload()}
/>
</View>
Expand Down