[#22385] fix: tx setting current value as a range (#22568)

* [#22385] fix: tx setting current value as a range

* [#22385] fix: priority fee value issue for custom settings

* [#22385] fix: max priority fee be the same as desktop

Author: mohsen-ghafouri

src/status_im/contexts/wallet/common/transaction_settings/max_fee/view.cljs

@@ -29,11 +29,11 @@
   []
   (let [network-base-fee (rf/sub [:wallet/tx-settings-network-base-fee-route])
         max-base-fee     (rf/sub [:wallet/tx-settings-max-base-fee])
-        priority-fee     (rf/sub [:wallet/tx-settings-priority-fee])
+        priority-fee     (rf/sub [:wallet/tx-settings-custom-priority-fee])
         conditions       (partial hint-and-status network-base-fee priority-fee)]
     [transaction-settings/custom-setting-screen
      {:screen-title  (i18n/label :t/max-base-fee)
-      :token-sybmol  :gwei
+      :token-symbol  :gwei
       :conditions-fn conditions
       :current       max-base-fee
       :info-title    (i18n/label :t/max-base-fee)

src/status_im/contexts/wallet/common/transaction_settings/priority_fee/view.cljs

@@ -6,7 +6,7 @@
     [utils.re-frame :as rf]))
 
 (defn hint-and-status
-  [priority-fee spectrum max-base-fee entered-value]
+  [spectrum max-base-fee entered-value]
   (let [upper-limit-exceeded? (> entered-value (:high spectrum))
         lower-limit-exceeded? (< entered-value (:low spectrum))]
     (cond
@@ -19,20 +19,19 @@
                                       :status    :warning}
       lower-limit-exceeded?          {:hint-text (i18n/label :t/priority-fee-lower spectrum)
                                       :status    :warning}
-      :else                          {:hint-text (i18n/label :t/priority-fee-current
-                                                             {:current priority-fee})
+      :else                          {:hint-text (i18n/label :t/priority-fee-current spectrum)
                                       :status    :default})))
 
 (defn view
   []
-  (let [priority-fee (rf/sub [:wallet/tx-settings-priority-fee])
+  (let [priority-fee (rf/sub [:wallet/tx-settings-custom-priority-fee])
         max-base-fee (rf/sub [:wallet/tx-settings-max-base-fee])
         spectrum     {:low  (rf/sub [:wallet/tx-settings-suggested-min-priority-fee])
                       :high (rf/sub [:wallet/tx-settings-suggested-max-priority-fee])}
-        conditions   (partial hint-and-status priority-fee spectrum max-base-fee)]
+        conditions   (partial hint-and-status spectrum max-base-fee)]
     [transaction-settings/custom-setting-screen
      {:screen-title  (i18n/label :t/priority-fee)
-      :token-sybmol  :gwei
+      :token-symbol  :gwei
       :conditions-fn conditions
       :current       priority-fee
       :info-title    (i18n/label :t/priority-fee)

src/status_im/contexts/wallet/common/transaction_settings/view.cljs

@@ -12,7 +12,7 @@
 (defn custom-settings-sheet
   [_]
   (let [max-base-fee   (rf/sub [:wallet/tx-settings-max-base-fee])
-        priority-fee   (rf/sub [:wallet/tx-settings-priority-fee])
+        priority-fee   (rf/sub [:wallet/tx-settings-custom-priority-fee])
         max-gas-amount (rf/sub [:wallet/tx-settings-gas-amount])
         nonce          (rf/sub [:wallet/tx-settings-nonce])
         account-color  (rf/sub [:wallet/current-viewing-account-color])

src/status_im/subs/wallet/wallet.cljs

@@ -977,6 +977,18 @@
  (fn [[gas-fees value-set-by-user]]
    (or value-set-by-user (:tx-priority-fee gas-fees))))
 
+(rf/reg-sub
+ :wallet/tx-settings-custom-priority-fee
+ :<- [:wallet/tx-settings-fee-mode]
+ :<- [:wallet/tx-settings-gas-fees]
+ :<- [:wallet/tx-settings-priority-fee-user]
+ :<- [:wallet/tx-settings-suggested-min-priority-fee]
+ (fn [[fee-mode gas-fees value-set-by-user min-priority-fee]]
+   (cond
+     value-set-by-user                value-set-by-user
+     (= :tx-fee-mode/custom fee-mode) (:tx-priority-fee gas-fees)
+     :else                            min-priority-fee)))
+
 (rf/reg-sub
  :wallet/tx-settings-gas-amount
  :<- [:wallet/tx-settings-gas-amount-route]
@@ -1000,9 +1012,8 @@
 (rf/reg-sub
  :wallet/tx-settings-suggested-max-priority-fee
  :<- [:wallet/tx-settings-gas-fees]
- :<- [:wallet/tx-settings-max-base-fee]
- (fn [[gas-fees max-base-fee]]
-   (min max-base-fee (:suggested-max-priority-fee gas-fees))))
+ (fn [gas-fees]
+   (:suggested-max-priority-fee gas-fees)))
 
 (rf/reg-sub
  :wallet/tx-settings-suggested-min-priority-fee

translations/en.json

@@ -2096,7 +2096,7 @@
   "principles": "Principles",
   "priority": "Priority",
   "priority-fee": "Priority fee",
-  "priority-fee-current": "Current: {{current}}",
+  "priority-fee-current": "Current: {{low}} - {{high}}",
   "priority-fee-higher": "Higher than necessary: {{low}} - {{high}}",
   "priority-fee-higher-max-base": "Higher than max base fee: {{max-base-fee}}",
   "priority-fee-lower": "Lower than suggested: {{low}} - {{high}}",