Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ZeusLN/zeus
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e6eb541a820be1582dd81f648875b804e7ba1799
Choose a base ref
..
head repository: ZeusLN/zeus
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 71cfa8b2afe9f141416610acf8d0bf8457097b41
Choose a head ref
Showing with 20 additions and 18 deletions.
  1. +3 −3 views/Intro.tsx
  2. +3 −5 views/IntroSplash.tsx
  3. +7 −5 views/SendingLightning.tsx
  4. +2 −1 views/Settings/SeedRecovery.tsx
  5. +2 −1 views/Settings/WalletConfiguration.tsx
  6. +3 −3 views/Settings/Wallets.tsx
6 changes: 3 additions & 3 deletions views/Intro.tsx
View file
Original file line number Diff line number Diff line change
@@ -240,9 +240,9 @@ const Intro: React.FC<IntroProps> = (props) => {

updateSettings({ nodes }).then(() => {
setConnectingStatus(true);
navigation.navigate('Wallet', {
triggerSettingsRefresh: true
});
stores.settingsStore.triggerSettingsRefresh =
true;
navigation.navigate('Wallet');
});
} else {
setCreatingWallet(false);
8 changes: 3 additions & 5 deletions views/IntroSplash.tsx
View file
Original file line number Diff line number Diff line change
@@ -311,12 +311,10 @@ export default class IntroSplash extends React.Component<
updateSettings({ nodes }).then(
() => {
setConnectingStatus(true);
SettingsStore.triggerSettingsRefresh =
true;
navigation.navigate(
'Wallet',
{
triggerSettingsRefresh:
true
}
'Wallet'
);
}
);
12 changes: 7 additions & 5 deletions views/SendingLightning.tsx
View file
Original file line number Diff line number Diff line change
@@ -23,6 +23,7 @@ import { Row } from '../components/layout/Row';
import TransactionsStore from '../stores/TransactionsStore';
import LnurlPayStore from '../stores/LnurlPayStore';
import PaymentsStore from '../stores/PaymentsStore';
import SettingsStore from '../stores/SettingsStore';

import { localeString } from '../utils/LocaleUtils';
import { themeColor } from '../utils/ThemeUtils';
@@ -37,6 +38,7 @@ interface SendingLightningProps {
TransactionsStore: TransactionsStore;
LnurlPayStore: LnurlPayStore;
PaymentsStore: PaymentsStore;
SettingsStore: SettingsStore;
}

interface SendingLightningState {
@@ -502,11 +504,11 @@ export default class SendingLightning extends React.Component<
size: 25,
color: themeColor('background')
}}
onPress={() =>
navigation.popTo('Wallet', {
triggerSettingsRefresh: true
})
}
onPress={() => {
this.props.SettingsStore.triggerSettingsRefresh =
true;
navigation.popTo('Wallet');
}}
buttonStyle={{ height: 40 }}
titleStyle={{
color: themeColor('background')
3 changes: 2 additions & 1 deletion views/Settings/SeedRecovery.tsx
View file
Original file line number Diff line number Diff line change
@@ -151,7 +151,8 @@ export default class SeedRecovery extends React.PureComponent<

if (nodes.length === 1) {
setConnectingStatus(true);
navigation.popTo('Wallet', { triggerSettingsRefresh: true });
SettingsStore.triggerSettingsRefresh = true;
navigation.popTo('Wallet');
} else {
navigation.popTo('Wallets');
}
3 changes: 2 additions & 1 deletion views/Settings/WalletConfiguration.tsx
View file
Original file line number Diff line number Diff line change
@@ -518,7 +518,8 @@ export default class WalletConfiguration extends React.Component<
BackendUtils.disconnect();
}
setConnectingStatus(true);
navigation.popTo('Wallet', { triggerSettingsRefresh: true });
SettingsStore.triggerSettingsRefresh = true;
navigation.popTo('Wallet');
} else {
navigation.goBack();
}
6 changes: 3 additions & 3 deletions views/Settings/Wallets.tsx
View file
Original file line number Diff line number Diff line change
@@ -257,9 +257,9 @@ export default class Nodes extends React.Component<NodesProps, NodesState> {
}).then(() => {
setConnectingStatus(true);
setInitialStart(false);
navigation.popTo('Wallet', {
triggerSettingsRefresh: true
});
SettingsStore.triggerSettingsRefresh =
true;
navigation.popTo('Wallet');
});
}}
>