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

LSPS1: Fix bug while setting up default info data #2278

Merged
merged 1 commit into from
Jul 9, 2024
Merged

LSPS1: Fix bug while setting up default info data #2278

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
128 changes: 71 additions & 57 deletions views/Settings/LSPS1/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,77 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
});
}

componentDidUpdate(_prevProps: LSPS1Props) {
const {
lspBalanceSat,
clientBalanceSat,
channelExpiryBlocks,
requiredChannelConfirmations,
confirmsWithinBlocks
} = this.state;
const { getInfoData } = this.props.LSPStore;
const info =
getInfoData?.result?.options ||
getInfoData?.options ||
getInfoData?.result ||
getInfoData;

if (lspBalanceSat === 0 && info?.min_initial_lsp_balance_sat) {
this.setState({
lspBalanceSat: parseInt(info.min_initial_lsp_balance_sat)
});
}
if (
clientBalanceSat === 0 &&
info?.min_initial_client_balance_sat > 0
) {
this.setState({
clientBalanceSat: parseInt(info.min_initial_client_balance_sat)
});
}

if (channelExpiryBlocks === 'N/A' && info?.max_channel_expiry_blocks) {
const channelExpiryBlocks = parseInt(
info.max_channel_expiry_blocks
);
let expirationIndex = 5;
if (channelExpiryBlocks === 4380) {
expirationIndex = 0;
} else if (channelExpiryBlocks === 13140) {
expirationIndex = 1;
} else if (channelExpiryBlocks === 26280) {
expirationIndex = 2;
} else if (channelExpiryBlocks === 52560) {
expirationIndex = 3;
}

this.setState({
channelExpiryBlocks,
expirationIndex
});
}

if (
requiredChannelConfirmations === '' &&
info?.min_required_channel_confirmations
) {
this.setState({
requiredChannelConfirmations:
info?.min_required_channel_confirmations.toString()
});
}

if (
confirmsWithinBlocks === '' &&
info?.min_funding_confirms_within_blocks
) {
this.setState({
confirmsWithinBlocks:
(info?.min_funding_confirms_within_blocks).toString()
});
}
}

subscribeToCustomMessages() {
if (
this.props.SettingsStore.implementation === 'lightning-node-connect'
Expand Down Expand Up @@ -289,8 +360,6 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
lspBalanceSat,
clientBalanceSat,
channelExpiryBlocks,
requiredChannelConfirmations,
confirmsWithinBlocks,
expirationIndex
} = this.state;
const { getInfoData, createOrderResponse } = LSPStore;
Expand Down Expand Up @@ -333,61 +402,6 @@ export default class LSPS1 extends React.Component<LSPS1Props, LSPS1State> {
</TouchableOpacity>
);

if (lspBalanceSat === 0 && info?.min_initial_lsp_balance_sat) {
this.setState({
lspBalanceSat: parseInt(info.min_initial_lsp_balance_sat)
});
}
if (
clientBalanceSat === 0 &&
info?.min_initial_client_balance_sat > 0
) {
this.setState({
clientBalanceSat: parseInt(info.min_initial_client_balance_sat)
});
}

if (channelExpiryBlocks === 'N/A' && info?.max_channel_expiry_blocks) {
const channelExpiryBlocks = parseInt(
info.max_channel_expiry_blocks
);
let expirationIndex = 5;
if (channelExpiryBlocks === 4380) {
expirationIndex = 0;
} else if (channelExpiryBlocks === 13140) {
expirationIndex = 1;
} else if (channelExpiryBlocks === 26280) {
expirationIndex = 2;
} else if (channelExpiryBlocks === 52560) {
expirationIndex = 3;
}

this.setState({
channelExpiryBlocks,
expirationIndex
});
}

if (
requiredChannelConfirmations === '' &&
info?.min_required_channel_confirmations
) {
this.setState({
requiredChannelConfirmations:
info?.min_required_channel_confirmations.toString()
});
}

if (
confirmsWithinBlocks === '' &&
info?.min_funding_confirms_within_blocks
) {
this.setState({
confirmsWithinBlocks:
(info?.min_funding_confirms_within_blocks).toString()
});
}

const oneMoButton = () => (
<Text
style={{
Expand Down
Loading