Merge remote-tracking branch 'source/master' into dev-shapeshift

This commit is contained in:
lepipele
2018-03-17 23:50:11 -05:00
38 changed files with 434 additions and 491 deletions

View File

@@ -118,7 +118,7 @@ namespace BTCPayServer.Data
{
DerivationStrategy = null;
}
else if (!existing)
else if (!existing && supportedPaymentMethod != null)
strategies.Add(new JProperty(supportedPaymentMethod.PaymentId.ToString(), PaymentMethodExtensions.Serialize(supportedPaymentMethod)));
DerivationStrategies = strategies.ToString();
#pragma warning restore CS0618