aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-17 14:04:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Address feedback from code review

Browse Source 
Thanks @kukks
This commit is contained in:
Dennis Reimann
2021-12-20 15:15:32 +01:00
committed by Andrew Camilleri
parent 3a59e2a5c4
commit 8e5a9251d6
6 changed files with 96 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
BTCPayServer/Controllers/WalletsController.cs
View File

@@ -368,8 +368,9 @@ namespace BTCPayServer.Controllers
var network = NetworkProvider.GetNetwork<BTCPayNetwork>(walletId?.CryptoCode);
if (network == null)
return NotFound();
var store = GetCurrentStore();
var address = _walletReceiveService.Get(walletId)?.Address;
var allowedPayjoin = paymentMethod.IsHotWallet && CurrentStore.GetStoreBlob().PayJoinEnabled;
var allowedPayjoin = paymentMethod.IsHotWallet && store.GetStoreBlob().PayJoinEnabled;
var bip21 = network.GenerateBIP21(address?.ToString(), null);
if (allowedPayjoin)
{
@@ -1030,14 +1031,9 @@ namespace BTCPayServer.Controllers
return RedirectToAction();
}
private StoreData CurrentStore
{
get => HttpContext.GetStoreData();
}
internal DerivationSchemeSettings GetDerivationSchemeSettings(WalletId walletId)
{
return CurrentStore.GetDerivationSchemeSettings(NetworkProvider, walletId.CryptoCode);
return GetCurrentStore().GetDerivationSchemeSettings(NetworkProvider, walletId.CryptoCode);
}
private static async Task<IMoney> GetBalanceAsMoney(BTCPayWallet wallet, DerivationStrategyBase derivationStrategy)
@@ -1065,11 +1061,6 @@ namespace BTCPayServer.Controllers
return "--";
}
}
private string GetUserId()
{
return _userManager.GetUserId(User);
}
[HttpPost("{walletId}/actions")]
public async Task<IActionResult> WalletActions(
@@ -1125,6 +1116,10 @@ namespace BTCPayServer.Controllers
: Url.Content(network.LightningImagePath);
return Request.GetRelativePathOrAbsolute(res);
}
private string GetUserId() => _userManager.GetUserId(User);
private StoreData GetCurrentStore() => HttpContext.GetStoreData();
}
public class WalletReceiveViewModel