diff --git a/api/api.go b/api/api.go
index 2ef4b30f..84e09d47 100644
--- a/api/api.go
+++ b/api/api.go
@@ -60,8 +60,9 @@ func NewAPI(svc service.Service, gormDB *gorm.DB, config config.Config, keys key
 func (api *api) CreateApp(createAppRequest *CreateAppRequest) (*CreateAppResponse, error) {
 	backendType, _ := api.cfg.Get("LNBackendType", "")
 	if createAppRequest.Isolated &&
-		backendType != "LDK" &&
-		backendType != "LND" {
+		backendType != config.LDKBackendType &&
+		backendType != config.LNDBackendType &&
+		backendType != config.PhoenixBackendType {
 		return nil, fmt.Errorf(
 			"sub-wallets are currently not supported on your node backend. Try LDK or LND")
 	}
diff --git a/lnclient/phoenixd/phoenixd.go b/lnclient/phoenixd/phoenixd.go
index c565d657..a469a7d2 100644
--- a/lnclient/phoenixd/phoenixd.go
+++ b/lnclient/phoenixd/phoenixd.go
@@ -166,23 +166,12 @@ func (svc *PhoenixService) ListTransactions(ctx context.Context, from, until, li
 	}
 	transactions = []lnclient.Transaction{}
 	for _, invoice := range incomingPayments {
-		var settledAt *int64
-		if invoice.CompletedAt != 0 {
-			settledAtUnix := time.UnixMilli(invoice.CompletedAt).Unix()
-			settledAt = &settledAtUnix
-		}
-		transaction := lnclient.Transaction{
-			Type:        "incoming",
-			Invoice:     invoice.Invoice,
-			Preimage:    invoice.Preimage,
-			PaymentHash: invoice.PaymentHash,
-			Amount:      invoice.ReceivedSat * 1000,
-			FeesPaid:    invoice.Fees * 1000,
-			CreatedAt:   time.UnixMilli(invoice.CreatedAt).Unix(),
-			Description: invoice.Description,
-			SettledAt:   settledAt,
+		transaction, err := phoenixInvoiceToTransaction(&invoice)
+		if err != nil {
+			return nil, err
 		}
-		transactions = append(transactions, transaction)
+
+		transactions = append(transactions, *transaction)
 	}
 
 	// get outgoing payments
@@ -320,31 +309,12 @@ func (svc *PhoenixService) MakeInvoice(ctx context.Context, amount int64, descri
 		return nil, err
 	}
 
-	paymentRequest, err := decodepay.Decodepay(invoiceRes.Serialized)
+	tx, err := svc.LookupInvoice(ctx, invoiceRes.PaymentHash)
 	if err != nil {
-		logger.Logger.WithFields(logrus.Fields{
-			"bolt11": invoiceRes.Serialized,
-		}).Errorf("Failed to decode bolt11 invoice: %v", err)
-
+		logger.Logger.WithError(err).Error("failed to lookup newly created invoice")
 		return nil, err
 	}
 
-	expiresAt := time.UnixMilli(int64(paymentRequest.CreatedAt) * 1000).Add(time.Duration(paymentRequest.Expiry) * time.Second).Unix()
-
-	tx := &lnclient.Transaction{
-		Type:            "incoming",
-		Invoice:         invoiceRes.Serialized,
-		Preimage:        "", // TODO: set preimage to enable self-payments
-		PaymentHash:     invoiceRes.PaymentHash,
-		Amount:          amount,
-		FeesPaid:        0,
-		CreatedAt:       time.Now().Unix(),
-		ExpiresAt:       &expiresAt,
-		SettledAt:       nil,
-		Metadata:        nil,
-		Description:     paymentRequest.Description,
-		DescriptionHash: paymentRequest.DescriptionHash,
-	}
 	return tx, nil
 }
 
@@ -366,36 +336,11 @@ func (svc *PhoenixService) LookupInvoice(ctx context.Context, paymentHash string
 		return nil, err
 	}
 
-	var settledAt *int64
-	if invoiceRes.CompletedAt != 0 {
-		settledAtUnix := time.UnixMilli(invoiceRes.CompletedAt).Unix()
-		settledAt = &settledAtUnix
-	}
-
-	paymentRequest, err := decodepay.Decodepay(invoiceRes.Invoice)
+	transaction, err = phoenixInvoiceToTransaction(&invoiceRes)
 	if err != nil {
-		logger.Logger.WithFields(logrus.Fields{
-			"bolt11": invoiceRes.Invoice,
-		}).Errorf("Failed to decode bolt11 invoice: %v", err)
-
 		return nil, err
 	}
 
-	expiresAt := time.UnixMilli(int64(paymentRequest.CreatedAt) * 1000).Add(time.Duration(paymentRequest.Expiry) * time.Second).Unix()
-
-	transaction = &lnclient.Transaction{
-		Type:            "incoming",
-		Invoice:         invoiceRes.Invoice,
-		Preimage:        invoiceRes.Preimage,
-		PaymentHash:     invoiceRes.PaymentHash,
-		Amount:          invoiceRes.ReceivedSat * 1000,
-		FeesPaid:        invoiceRes.Fees * 1000,
-		CreatedAt:       time.UnixMilli(invoiceRes.CreatedAt).Unix(),
-		Description:     invoiceRes.Description,
-		SettledAt:       settledAt,
-		ExpiresAt:       &expiresAt,
-		DescriptionHash: paymentRequest.DescriptionHash,
-	}
 	return transaction, nil
 }
 
@@ -543,6 +488,39 @@ func (svc *PhoenixService) GetPubkey() string {
 	return svc.pubkey
 }
 
+func phoenixInvoiceToTransaction(invoiceRes *InvoiceResponse) (*lnclient.Transaction, error) {
+	var settledAt *int64
+	if invoiceRes.CompletedAt != 0 {
+		settledAtUnix := time.UnixMilli(invoiceRes.CompletedAt).Unix()
+		settledAt = &settledAtUnix
+	}
+
+	paymentRequest, err := decodepay.Decodepay(invoiceRes.Invoice)
+	if err != nil {
+		logger.Logger.WithFields(logrus.Fields{
+			"bolt11": invoiceRes.Invoice,
+		}).Errorf("Failed to decode bolt11 invoice: %v", err)
+
+		return nil, err
+	}
+
+	expiresAt := time.UnixMilli(int64(paymentRequest.CreatedAt) * 1000).Add(time.Duration(paymentRequest.Expiry) * time.Second).Unix()
+
+	return &lnclient.Transaction{
+		Type:            "incoming",
+		Invoice:         invoiceRes.Invoice,
+		Preimage:        invoiceRes.Preimage,
+		PaymentHash:     invoiceRes.PaymentHash,
+		Amount:          paymentRequest.MSatoshi,
+		FeesPaid:        invoiceRes.Fees * 1000,
+		CreatedAt:       time.UnixMilli(invoiceRes.CreatedAt).Unix(),
+		Description:     invoiceRes.Description,
+		SettledAt:       settledAt,
+		ExpiresAt:       &expiresAt,
+		DescriptionHash: paymentRequest.DescriptionHash,
+	}, nil
+}
+
 func (svc *PhoenixService) GetCustomNodeCommandDefinitions() []lnclient.CustomNodeCommandDef {
 	return nil
 }