Skip to content
New issue

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

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

Already on GitHub? # to your account

improve minSendableSats handling #2828

Merged
merged 1 commit into from
Feb 11, 2025
Merged
Changes from all commits
Commits
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
18 changes: 11 additions & 7 deletions views/LnurlPay/LnurlPay.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import LoadingIndicator from '../../components/LoadingIndicator';

import InvoicesStore from '../../stores/InvoicesStore';
import LnurlPayStore from '../../stores/LnurlPayStore';
import UnitsStore from '../../stores/UnitsStore';

import LnurlPayMetadata from './Metadata';

Expand All @@ -29,6 +30,7 @@ interface LnurlPayProps {
navigation: StackNavigationProp<any, any>;
InvoicesStore: InvoicesStore;
LnurlPayStore: LnurlPayStore;
UnitsStore: UnitsStore;
route: Route<'LnurlPay', { lnurlParams: any; amount: any; satAmount: any }>;
}

Expand All @@ -40,7 +42,7 @@ interface LnurlPayState {
loading: boolean;
}

@inject('InvoicesStore', 'LnurlPayStore')
@inject('InvoicesStore', 'LnurlPayStore', 'UnitsStore')
@observer
export default class LnurlPay extends React.Component<
LnurlPayProps,
Expand Down Expand Up @@ -73,15 +75,17 @@ export default class LnurlPay extends React.Component<
}

stateFromProps(props: LnurlPayProps) {
const { route } = props;
const { route, UnitsStore } = props;
const { lnurlParams: lnurl, amount, satAmount } = route.params ?? {};

const minSendableSats = Math.floor(lnurl.minSendable / 1000);

const { amount: unformattedAmount } =
UnitsStore.getUnformattedAmount(minSendableSats);

return {
amount:
amount && amount != 0
? amount
: Math.floor(lnurl.minSendable / 1000).toString(),
satAmount: satAmount ? satAmount : '',
amount: amount && amount != 0 ? amount : unformattedAmount,
satAmount: satAmount ? satAmount : minSendableSats,
domain: lnurl.domain,
comment: ''
};
Expand Down