From fb41982a5ce626c0b655f3b940c941d551f06f40 Mon Sep 17 00:00:00 2001
From: Zafar Ivaev <zafarivaev@gmail.com>
Date: Wed, 26 Jul 2023 11:47:05 +0500
Subject: [PATCH] fix: show custom format for total balance on wallet when
 balance < 0.01

---
 .../xcshareddata/swiftpm/Package.resolved             |  4 ++--
 p2p_wallet/Common/Extensions/Double+Extensions.swift  | 11 ++++++-----
 .../Subview/AccountList/HomeAccountsViewModel.swift   |  7 ++++++-
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/p2p_wallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/p2p_wallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
index 7eaaea1de9..745d328e08 100644
--- a/p2p_wallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+++ b/p2p_wallet.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -356,8 +356,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/apple/swift-nio.git",
       "state" : {
-        "revision" : "a2e487b77f17edbce9a65f2b7415f2f479dc8e48",
-        "version" : "2.57.0"
+        "revision" : "324bc65a28323660fad8a36a7a37f0c2c78eeb9a",
+        "version" : "2.55.0"
       }
     },
     {
diff --git a/p2p_wallet/Common/Extensions/Double+Extensions.swift b/p2p_wallet/Common/Extensions/Double+Extensions.swift
index 8b790a6ae5..ab42abd6b0 100644
--- a/p2p_wallet/Common/Extensions/Double+Extensions.swift
+++ b/p2p_wallet/Common/Extensions/Double+Extensions.swift
@@ -113,14 +113,15 @@ extension Double {
         maximumFractionDigits: Int = 2,
         currency: Fiat = Defaults.fiat,
         roundingMode: NumberFormatter.RoundingMode? = nil,
-        customFormattForLessThan1E_2: Bool = false
+        customFormattForLessThan1E_2: Bool = false,
+        spacing: String = " "
     ) -> String {
         // amount < 0.01
         if customFormattForLessThan1E_2 && self > 0 && self < 0.01 {
             if currency == .usd {
-                return "< \(currency.symbol) 0.01"
+                return "<\(spacing)\(currency.symbol)\(spacing)0.01"
             } else {
-                return "< 0.01 \(currency.symbol)"
+                return "<\(spacing)0.01\(spacing)\(currency.symbol)"
             }
         }
 
@@ -129,9 +130,9 @@ extension Double {
             let formattedString = toString(maximumFractionDigits: maximumFractionDigits, roundingMode: roundingMode)
 
             if currency == .usd {
-                return "\(currency.symbol) \(formattedString)"
+                return "\(currency.symbol)\(spacing)\(formattedString)"
             } else {
-                return "\(formattedString) \(currency.symbol)"
+                return "\(formattedString)\(spacing)\(currency.symbol)"
             }
         }
     }
diff --git a/p2p_wallet/Scenes/Main/NewHome/Subview/AccountList/HomeAccountsViewModel.swift b/p2p_wallet/Scenes/Main/NewHome/Subview/AccountList/HomeAccountsViewModel.swift
index 35c208bae4..8a339d413a 100644
--- a/p2p_wallet/Scenes/Main/NewHome/Subview/AccountList/HomeAccountsViewModel.swift
+++ b/p2p_wallet/Scenes/Main/NewHome/Subview/AccountList/HomeAccountsViewModel.swift
@@ -112,7 +112,12 @@ final class HomeAccountsViewModel: BaseViewModel, ObservableObject {
                             return $0 + $1.amountInFiatDouble
                         }
                     }
-                return "\(Defaults.fiat.symbol)\(equityValue.toString(maximumFractionDigits: 2, roundingMode: .down))"
+                return equityValue.fiatAmountFormattedString(
+                    maximumFractionDigits: 2,
+                    roundingMode: .down,
+                    customFormattForLessThan1E_2: true,
+                    spacing: ""
+                )
             }
             .receive(on: RunLoop.main)
             .assignWeak(to: \.balance, on: self)