diff --git a/cw_ethereum/lib/ethereum_client.dart b/cw_ethereum/lib/ethereum_client.dart
index e10e79f1e..c2639827f 100644
--- a/cw_ethereum/lib/ethereum_client.dart
+++ b/cw_ethereum/lib/ethereum_client.dart
@@ -65,13 +65,11 @@ class EthereumClient {
 
     bool _isEthereum = currency == CryptoCurrency.eth;
 
-    final price = await _client!.getGasPrice();
+    final price = _client!.getGasPrice();
 
     final Transaction transaction = Transaction(
       from: privateKey.address,
       to: EthereumAddress.fromHex(toAddress),
-      maxGas: gas,
-      gasPrice: price,
       maxPriorityFeePerGas: EtherAmount.fromInt(EtherUnit.gwei, priority.tip),
       value: _isEthereum ? EtherAmount.inWei(BigInt.parse(amount)) : EtherAmount.zero(),
     );
@@ -101,7 +99,7 @@ class EthereumClient {
     return PendingEthereumTransaction(
       signedTransaction: signedTransaction,
       amount: amount,
-      fee: BigInt.from(gas) * price.getInWei,
+      fee: BigInt.from(gas) * (await price).getInWei,
       sendTransaction: _sendTransaction,
       exponent: exponent,
     );
diff --git a/lib/src/screens/trade_details/trade_details_page.dart b/lib/src/screens/trade_details/trade_details_page.dart
index 17683c600..1bb8872e8 100644
--- a/lib/src/screens/trade_details/trade_details_page.dart
+++ b/lib/src/screens/trade_details/trade_details_page.dart
@@ -51,10 +51,11 @@ class TradeDetailsPageBodyState extends State<TradeDetailsPageBody> {
   @override
   Widget build(BuildContext context) {
     return Observer(builder: (_) {
-      // FIX-ME: Added `context` it was not used here before, maby bug ?
+      int itemsCount = tradeDetailsViewModel.items.length;
+
       return SectionStandardList(
           sectionCount: 1,
-          itemCounter: (int _) => tradeDetailsViewModel.items.length,
+          itemCounter: (int _) => itemsCount,
           itemBuilder: (__, index) {
             final item = tradeDetailsViewModel.items[index];
 
diff --git a/lib/utils/exception_handler.dart b/lib/utils/exception_handler.dart
index 5c51a8757..b9c659872 100644
--- a/lib/utils/exception_handler.dart
+++ b/lib/utils/exception_handler.dart
@@ -161,6 +161,7 @@ class ExceptionHandler {
     "Handshake error in client",
     "Error while launching http",
     "OS Error: Network is unreachable",
+    "ClientException: Write failed, uri=https:",
   ];
 
   static Future<void> _addDeviceInfo(File file) async {