Merge pull request #2441 from get10101/fix/fee-rebate-calculation

fix(ui): Calculate fee rebate from full order matching fee
get10101 · Apr 18, 2024 · 2fe6fde · 2fe6fde
2 parents 1f88581 + 34db224
commit 2fe6fde
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 16 deletions.
diff --git a/mobile/lib/features/trade/trade_bottom_sheet_confirmation.dart b/mobile/lib/features/trade/trade_bottom_sheet_confirmation.dart
@@ -178,9 +178,8 @@ class TradeBottomSheetConfirmation extends StatelessWidget {
 
     final orderMatchingFee = tradeValues.fee ?? Amount.zero();
     final feeRebate = referralStatus != null
-        ? Amount((referralStatus.referralFeeBonus * orderMatchingFee.sats).ceil())
+        ? Amount((referralStatus.referralFeeBonus * orderMatchingFee.sats).floor())
         : Amount.zero();
-    final feeBeforeRebate = orderMatchingFee + feeRebate;
 
     return Container(
         padding: EdgeInsets.only(left: 20, right: 20, top: (isClose ? 20 : 10), bottom: 10),
@@ -224,7 +223,7 @@ class TradeBottomSheetConfirmation extends StatelessWidget {
                               ),
                         ValueDataRow(
                           type: ValueType.amount,
-                          value: feeBeforeRebate,
+                          value: orderMatchingFee,
                           label: "Order-matching fee",
                         ),
                         if (referralStatus != null && referralStatus.referralFeeBonus > 0)

diff --git a/mobile/lib/features/trade/trade_bottom_sheet_tab.dart b/mobile/lib/features/trade/trade_bottom_sheet_tab.dart
@@ -321,13 +321,8 @@ class _TradeBottomSheetTabState extends State<TradeBottomSheetTab> {
                     selector: (_, provider) =>
                         provider.orderMatchingFee(direction) ?? Amount.zero(),
                     builder: (context, fee, child) {
-                      final feeRebate = referralStatus != null
-                          ? Amount((referralStatus.referralFeeBonus * fee.sats).ceil())
-                          : Amount.zero();
-                      final feeBeforeRebate = fee + feeRebate;
                       return Flexible(
-                          child: ValueDataRow(
-                              type: ValueType.amount, value: feeBeforeRebate, label: "Fee:"));
+                          child: ValueDataRow(type: ValueType.amount, value: fee, label: "Fee:"));
                     }),
               ],
             ),
@@ -344,7 +339,7 @@ class _TradeBottomSheetTabState extends State<TradeBottomSheetTab> {
                           provider.orderMatchingFee(direction) ?? Amount.zero(),
                       builder: (context, fee, child) {
                         return Text(
-                          "-${Amount((referralStatus.referralFeeBonus * fee.sats).ceil())}",
+                          "-${Amount((referralStatus.referralFeeBonus * fee.sats).floor())}",
                           style: const TextStyle(color: Colors.green),
                         );
                       }),

diff --git a/mobile/native/src/api.rs b/mobile/native/src/api.rs
@@ -332,7 +332,7 @@ pub fn calculate_pnl(
 pub fn order_matching_fee(quantity: f32, price: f32) -> SyncReturn<u64> {
     let price = Decimal::from_f32(price).expect("price to fit in Decimal");
 
-    let fee_rate = ln_dlc::get_order_matching_fee_rate();
+    let fee_rate = ln_dlc::get_order_matching_fee_rate(false);
     let order_matching_fee = commons::order_matching_fee(quantity, price, fee_rate).to_sat();
 
     SyncReturn(order_matching_fee)

diff --git a/mobile/native/src/ln_dlc/mod.rs b/mobile/native/src/ln_dlc/mod.rs
@@ -185,13 +185,17 @@ pub fn get_maintenance_margin_rate() -> Decimal {
     }
 }
 
-pub fn get_order_matching_fee_rate() -> Decimal {
+pub fn get_order_matching_fee_rate(deduct_rebate: bool) -> Decimal {
     match state::try_get_tentenone_config() {
         Some(config) => {
             let fee_percent =
                 Decimal::try_from(config.order_matching_fee_rate).expect("to fit into decimal");
-            let fee_discount = config.referral_status.referral_fee_bonus;
-            fee_percent - (fee_percent * fee_discount)
+            if deduct_rebate {
+                let fee_discount = config.referral_status.referral_fee_bonus;
+                fee_percent - (fee_percent * fee_discount)
+            } else {
+                fee_percent
+            }
         }
         None => dec!(0.003),
     }

diff --git a/webapp/src/api.rs b/webapp/src/api.rs
@@ -404,7 +404,7 @@ impl From<(native::trade::position::Position, Option<Price>)> for Position {
                 };
 
                 // FIXME: A from implementation should not contain this kind of logic.
-                let fee_rate = ln_dlc::get_order_matching_fee_rate();
+                let fee_rate = ln_dlc::get_order_matching_fee_rate(true);
 
                 (
                     calculate_pnl(
@@ -682,7 +682,7 @@ pub async fn get_best_quote(
             bid: bid_price,
             ask: ask_price,
         },
-        fee: ln_dlc::get_order_matching_fee_rate(),
+        fee: ln_dlc::get_order_matching_fee_rate(true),
     };
 
     Ok(Json(Some(quotes)))