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

fix: currency message not needed anymore and symbol change #313

Merged
merged 16 commits into from
Oct 18, 2023
Merged

fix: currency message not needed anymore and symbol change #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
20cb829
Add some improvements.
AleksKSoftware Sep 3, 2023
795e7e1
Added some fixes according to the comments.
AleksKSoftware Sep 27, 2023
5073eed
Removed unused code.
AleksKSoftware Sep 27, 2023
a793248
Added some improvements.
AleksKSoftware Sep 27, 2023
27bc855
Improvements fields.
AleksKSoftware Oct 1, 2023
0c5d866
feat(NodeChannelSubscribeJob.cs, ProcessNodeChannelAcceptorJob.cs): a…
Jossec101 Oct 4, 2023
77da1ba
Improvements
AleksKSoftware Oct 9, 2023
09ec03c
Resolving issues according to the comments
AleksKSoftware Oct 10, 2023
39b80f4
Fixed chanel capacity for regtest.
AleksKSoftware Oct 10, 2023
19ba912
Fixed amount field.
AleksKSoftware Oct 15, 2023
89ddee3
Merge branch 'main' into fix_edit_field
RodriFS Oct 16, 2023
49c5c47
Merge pull request #306 from Elenpay/fix_edit_field
RodriFS Oct 16, 2023
038f74a
fix: currency message not needed anymore and symbol change
markettes Oct 16, 2023
6ef7f05
merge main
markettes Oct 16, 2023
2aafb46
Merge branch 'main' into 312-review-modals-amount-currency-indicator
markettes Oct 17, 2023
414f712
Merge branch 'main' into 312-review-modals-amount-currency-indicator
markettes Oct 18, 2023
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: 2 additions & 2 deletions src/Pages/ChannelRequests.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,15 +141,15 @@
</DisplayTemplate>
<EditTemplate>
<Validation Validator="@ValidationHelper.ValidateChannelCapacity" @ref="_capacityValidation">
<NumericPicker TValue="decimal" @bind-Value="@_amount" Min="@_minimumChannelCapacity" Max="@_maxChannelCapacity" Decimals="8" Step="0.00001m" CurrencySymbol=" BTC" CurrencySymbolPlacement="CurrencySymbolPlacement.Suffix" Disabled="@(SelectedUTXOs.Count > 0)"/>
<NumericPicker TValue="decimal" @bind-Value="@_amount" Min="@_minimumChannelCapacity" Max="@_maxChannelCapacity" Decimals="8" Step="0.00001m" CurrencySymbol=" ₿" Disabled="@(SelectedUTXOs.Count > 0)"/>
<FieldHelp>
@{
decimal amountToShow = _amount < _maxChannelCapacity
? _amount
: _maxChannelCapacity;
decimal convertedAmount = Math.Round(PriceConversionService.SatToUsdConversion(new Money(amountToShow, MoneyUnit.BTC).Satoshi, _btcPrice), 2);
}
@($"Amount in Satoshis. Minimum {_minimumChannelCapacity:f8}. Current amount: {convertedAmount} USD")
@($"Minimum {_minimumChannelCapacity:f8}. Current amount: {convertedAmount} USD")
</FieldHelp>
</Validation>
<div class="mb-3">
Expand Down Expand Up @@ -390,7 +390,7 @@
TemplatePsbtString="@_templatePSBTString"
SignedPSBT="@_psbt"/>

<CancelOrRejectPopup

Check warning on line 393 in src/Pages/ChannelRequests.razor

View workflow job for this annotation

GitHub Actions / build-and-test 

Component 'CancelOrRejectPopup' expects a value for the parameter 'Reason', but a value may not have been provided.
@ref=@_rejectCancelModalRef
Title='@(_selectedStatusActionString + " operation: " + _selectedRequest?.Id)'
Validator="@RejectReasonValidator"
Expand Down
2 changes: 1 addition & 1 deletion src/Pages/Withdrawals.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@
: Constants.MAXIMUM_WITHDRAWAL_BTC_AMOUNT;
decimal convertedAmount = Math.Round(PriceConversionService.SatToUsdConversion(new Money(amountToShow, MoneyUnit.BTC).Satoshi, _btcPrice), 2);
}
@($"Amount in BTC. Minimum {_minimumWithdrawalAmount:f8}. Current amount: {convertedAmount} USD")
@($"Minimum {_minimumWithdrawalAmount:f8}. Current amount: {convertedAmount} USD")
</FieldHelp>
</Validation>
<div class="mb-3">
Expand Down Expand Up @@ -383,7 +383,7 @@
ApproveRequestDelegate="async ()=> await ApproveRequestDelegate()"
/>

<CancelOrRejectPopup

Check warning on line 386 in src/Pages/Withdrawals.razor

View workflow job for this annotation

GitHub Actions / build-and-test 

Component 'CancelOrRejectPopup' expects a value for the parameter 'Reason', but a value may not have been provided.
@ref="@_rejectCancelModalRef"
Title='@("Wallet withdrawal:"+_selectedRequest?.Id)'
Validator="@RejectReasonValidator"
Expand Down
Loading