Merge pull request 'fix' (#65) from bug-64 into main

Reviewed-on: #65

api/server/interface/api/sresponse/payment.go

@@ -44,7 +44,6 @@ type PaymentQuote struct {
 	DebitAmount              *model.Money `json:"debitAmount,omitempty"`
 	ExpectedSettlementAmount *model.Money `json:"expectedSettlementAmount,omitempty"`
 	ExpectedFeeTotal         *model.Money `json:"expectedFeeTotal,omitempty"`
-	FeeQuoteToken            string       `json:"feeQuoteToken,omitempty"`
 	FeeLines                 []FeeLine    `json:"feeLines,omitempty"`
 	NetworkFee               *NetworkFee  `json:"networkFee,omitempty"`
 	FxQuote                  *FxQuote     `json:"fxQuote,omitempty"`
@@ -153,7 +152,6 @@ func toPaymentQuote(q *orchestratorv1.PaymentQuote) *PaymentQuote {
 		DebitAmount:              toMoney(q.GetDebitAmount()),
 		ExpectedSettlementAmount: toMoney(q.GetExpectedSettlementAmount()),
 		ExpectedFeeTotal:         toMoney(q.GetExpectedFeeTotal()),
-		FeeQuoteToken:            q.GetFeeQuoteToken(),
 		FeeLines:                 toFeeLines(q.GetFeeLines()),
 		NetworkFee:               toNetworkFee(q.GetNetworkFee()),
 		FxQuote:                  toFxQuote(q.GetFxQuote()),

frontend/pshared/lib/data/dto/payment/payment_quote.dart

@@ -14,7 +14,6 @@ class PaymentQuoteDTO {
   final MoneyDTO? debitAmount;
   final MoneyDTO? expectedSettlementAmount;
   final MoneyDTO? expectedFeeTotal;
-  final String? feeQuoteToken;
   final List<FeeLineDTO>? feeLines;
   final NetworkFeeDTO? networkFee;
   final FxQuoteDTO? fxQuote;
@@ -24,7 +23,6 @@ class PaymentQuoteDTO {
     this.debitAmount,
     this.expectedSettlementAmount,
     this.expectedFeeTotal,
-    this.feeQuoteToken,
     this.feeLines,
     this.networkFee,
     this.fxQuote,

frontend/pshared/lib/data/mapper/payment/payment_quote.dart

@@ -12,7 +12,6 @@ extension PaymentQuoteDTOMapper on PaymentQuoteDTO {
     debitAmount: debitAmount?.toDomain(),
     expectedSettlementAmount: expectedSettlementAmount?.toDomain(),
     expectedFeeTotal: expectedFeeTotal?.toDomain(),
-    feeQuoteToken: feeQuoteToken,
     feeLines: feeLines?.map((line) => line.toDomain()).toList(),
     networkFee: networkFee?.toDomain(),
     fxQuote: fxQuote?.toDomain(),
@@ -25,7 +24,6 @@ extension PaymentQuoteMapper on PaymentQuote {
     debitAmount: debitAmount?.toDTO(),
     expectedSettlementAmount: expectedSettlementAmount?.toDTO(),
     expectedFeeTotal: expectedFeeTotal?.toDTO(),
-    feeQuoteToken: feeQuoteToken,
     feeLines: feeLines?.map((line) => line.toDTO()).toList(),
     networkFee: networkFee?.toDTO(),
     fxQuote: fxQuote?.toDTO(),

frontend/pshared/lib/models/payment/quote.dart

@@ -9,7 +9,6 @@ class PaymentQuote {
   final Money? debitAmount;
   final Money? expectedSettlementAmount;
   final Money? expectedFeeTotal;
-  final String? feeQuoteToken;
   final List<FeeLine>? feeLines;
   final NetworkFee? networkFee;
   final FxQuote? fxQuote;
@@ -19,7 +18,6 @@ class PaymentQuote {
     required this.debitAmount,
     required this.expectedSettlementAmount,
     required this.expectedFeeTotal,
-    required this.feeQuoteToken,
     required this.feeLines,
     required this.networkFee,
     required this.fxQuote,