diff --git a/BTCPayServer.Tests/GreenfieldAPITests.cs b/BTCPayServer.Tests/GreenfieldAPITests.cs index 44f4e7eec..6bffb89f9 100644 --- a/BTCPayServer.Tests/GreenfieldAPITests.cs +++ b/BTCPayServer.Tests/GreenfieldAPITests.cs @@ -4473,7 +4473,7 @@ clientBasic.PreviewUpdateStoreRateConfiguration(user.StoreId, new StoreRateConfi await AssertHttpError(404, async () => await withdrawalClient.SimulateCustodianAccountWithdrawal(storeId, "WRONG-ACCOUNT-ID", simulateWithdrawalRequest)); // Test: SimulateWithdrawal, wrong store ID - // TODO it is wierd that 403 is considered normal, but it is like this for all calls where the store is wrong... I'd have preferred a 404 error, because the store cannot be found. + // TODO it is weird that 403 is considered normal, but it is like this for all calls where the store is wrong... I'd have preferred a 404 error, because the store cannot be found. await AssertHttpError(403, async () => await withdrawalClient.SimulateCustodianAccountWithdrawal("WRONG-STORE-ID", accountId, simulateWithdrawalRequest)); // Test: SimulateWithdrawal, correct payment method, wrong amount @@ -4504,7 +4504,7 @@ clientBasic.PreviewUpdateStoreRateConfiguration(user.StoreId, new StoreRateConfi await AssertHttpError(404, async () => await withdrawalClient.CreateCustodianAccountWithdrawal(storeId, "WRONG-ACCOUNT-ID", createWithdrawalRequest)); // Test: CreateWithdrawal, wrong store ID - // TODO it is wierd that 403 is considered normal, but it is like this for all calls where the store is wrong... I'd have preferred a 404 error, because the store cannot be found. + // TODO it is weird that 403 is considered normal, but it is like this for all calls where the store is wrong... I'd have preferred a 404 error, because the store cannot be found. await AssertHttpError(403, async () => await withdrawalClient.CreateCustodianAccountWithdrawal("WRONG-STORE-ID", accountId, createWithdrawalRequest)); // Test: CreateWithdrawal, correct payment method, wrong amount diff --git a/BTCPayServer.Tests/docker-bitcoin-multisig-setup.sh b/BTCPayServer.Tests/docker-bitcoin-multisig-setup.sh index ef774e34f..6f00a94c1 100755 --- a/BTCPayServer.Tests/docker-bitcoin-multisig-setup.sh +++ b/BTCPayServer.Tests/docker-bitcoin-multisig-setup.sh @@ -14,7 +14,7 @@ declare -A xpubs printf "\nšŸ‘› Create descriptor wallets\n\n" for ((n=1;n<=3;n++)); do - # Create descriptor wallets, surpress error output in case wallet already exists + # Create descriptor wallets, suppress error output in case wallet already exists ./docker-bitcoin-cli.sh -named createwallet wallet_name="${prefix}_part_${n}" descriptors=true > /dev/null 2>&1 # Collect xpubs @@ -38,7 +38,7 @@ multisig_int_desc="{\"desc\": $internal_desc_sum, \"active\": true, \"internal\" multisig_desc="[$multisig_ext_desc, $multisig_int_desc]" -# Create multisig wallet, surpress error output in case wallet already exists +# Create multisig wallet, suppress error output in case wallet already exists printf "\nšŸ” Create multisig wallet\n" printf "\nExternal descriptor: $external_desc\n" diff --git a/BTCPayServer/Components/Pager/Default.cshtml b/BTCPayServer/Components/Pager/Default.cshtml index 8a2d2b920..f85dbcd5b 100644 --- a/BTCPayServer/Components/Pager/Default.cshtml +++ b/BTCPayServer/Components/Pager/Default.cshtml @@ -83,7 +83,7 @@ if (Model.PaginationQuery != null) { - // merge both, prefering the `query` properties in case of duplicate keys + // merge both, preferring the `query` properties in case of duplicate keys query = query.Concat(Model.PaginationQuery) .GroupBy(e => e.Key) .ToDictionary(g => g.Key, g => g.First().Value);