From def8d1e0cb6b6ed3e452264c95dd1472a8751b46 Mon Sep 17 00:00:00 2001 From: Kukks Date: Tue, 8 Jan 2019 10:54:02 +0100 Subject: [PATCH 1/2] fix ln node clipboard --- .../ShowLightningNodeInfo.cshtml | 32 +++++++++---------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/BTCPayServer/Views/PublicLightningNodeInfo/ShowLightningNodeInfo.cshtml b/BTCPayServer/Views/PublicLightningNodeInfo/ShowLightningNodeInfo.cshtml index 0c43dda00..257967862 100644 --- a/BTCPayServer/Views/PublicLightningNodeInfo/ShowLightningNodeInfo.cshtml +++ b/BTCPayServer/Views/PublicLightningNodeInfo/ShowLightningNodeInfo.cshtml @@ -37,22 +37,20 @@ srvModel: srvModel }, mounted: function() { - setTimeout(function() { - var copyInput = new Clipboard('.copy', - { - target: function(trigger) { - Vue.toasted.show('Copied', - { - iconPack: "fontawesome", - icon: "copy", - duration: 5000 - }); - return trigger; - } - }); - }, - 500); + this.$nextTick(function() { + var copyInput = new Clipboard('.copy'); + + copyInput.on("success", + function(e) { + Vue.toasted.show('Copied', + { + iconPack: "fontawesome", + icon: "copy", + duration: 5000 + }); + }); + }); } }); @@ -127,8 +125,8 @@ -
- +
+
From 8b686f0b12b0ae4395db0455c07d085faee80b00 Mon Sep 17 00:00:00 2001 From: Kukks Date: Tue, 8 Jan 2019 11:27:37 +0100 Subject: [PATCH 2/2] fix coin switch issues --- .../UpdateCoinSwitchSettingsViewModel.cs | 2 +- .../Views/Invoice/Checkout-Body.cshtml | 19 ++++++++++++++++--- .../wwwroot/checkout/css/normalizer.css | 12 ++++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/BTCPayServer/Models/StoreViewModels/UpdateCoinSwitchSettingsViewModel.cs b/BTCPayServer/Models/StoreViewModels/UpdateCoinSwitchSettingsViewModel.cs index 41d146451..424ba255b 100644 --- a/BTCPayServer/Models/StoreViewModels/UpdateCoinSwitchSettingsViewModel.cs +++ b/BTCPayServer/Models/StoreViewModels/UpdateCoinSwitchSettingsViewModel.cs @@ -11,7 +11,7 @@ namespace BTCPayServer.Models.StoreViewModels public bool Enabled { get; set; } [Display(Name = "Integration Mode")] - public string Mode { get; set; } = "popup"; + public string Mode { get; set; } = "inline"; public List Modes { get; } = new List { diff --git a/BTCPayServer/Views/Invoice/Checkout-Body.cshtml b/BTCPayServer/Views/Invoice/Checkout-Body.cshtml index 307bddabb..5ee6e178e 100644 --- a/BTCPayServer/Views/Invoice/Checkout-Body.cshtml +++ b/BTCPayServer/Views/Invoice/Checkout-Body.cshtml @@ -299,9 +299,16 @@ :autoload="selectedThirdPartyProcessor === 'coinswitch'" :to-currency-address="srvModel.btcAddress">
- - {{$t("Pay with CoinSwitch")}} - + + {{$t("Pay with CoinSwitch")}} + + + @if (Model.ChangellyEnabled) + { + + }