[#21167] chore: resolve conflicts

Author: mohsen-ghafouri

src/status_im/contexts/wallet/wallet_connect/events/core.cljs

@@ -70,9 +70,12 @@
    (if (networks/event-should-be-handled? db event)
      {:fx [[:dispatch [:wallet-connect/process-session-request event]]]}
      {:fx [[:dispatch
+            [:wallet-connect/show-session-networks-unsupported-toast event]]
+           [:dispatch
             [:wallet-connect/send-response
-             {:error (wallet-connect/get-sdk-error
-                      constants/wallet-connect-user-rejected-chains-error-key)}]]]})))
+             {:request event
+              :error   (wallet-connect/get-sdk-error
+                        constants/wallet-connect-user-rejected-chains-error-key)}]]]})))
 
 (rf/reg-event-fx
  :wallet-connect/reset-current-request

src/status_im/contexts/wallet/wallet_connect/events/session_proposals.cljs

@@ -71,7 +71,9 @@
                     :request                         proposal
                     :session-networks                session-networks
                     :address                         (or current-viewing-address
-                                                         (first available-accounts)))
+                                                         (-> available-accounts
+                                                             first
+                                                             :address)))
         :fx [[:dispatch [:open-modal :screen/wallet.wallet-connect-session-proposal]]]}
        {:fx [[:dispatch [:wallet-connect/show-session-networks-unsupported-toast proposal]]
              [:dispatch [:wallet-connect/reject-session-proposal proposal]]]}))))

src/status_im/subs/wallet/dapps/transactions.cljs

@@ -58,8 +58,7 @@
            max-fees-fiat           (wallet-utils/calculate-token-fiat-value {:currency currency
                                                                              :balance  max-fees-ether
                                                                              :token    eth-token})
-           max-fees-fiat-formatted (-> max-fees-ether
-                                       (wallet-utils/get-standard-crypto-format eth-token)
+           max-fees-fiat-formatted (-> (wallet-utils/get-standard-crypto-format eth-token max-fees-ether)
                                        (wallet-utils/get-standard-fiat-format currency-symbol
                                                                               max-fees-fiat))
            balance                 (-> eth-token