Backend,Frontend.XF: refactor CryptoSubUnit

Move it to Backend in case we use it in Frontend.Console, respect DRY (for the caption) and improve func name.
nblockchain · Feb 8, 2024 · b0f066b · b0f066b
1 parent e9b862b
commit b0f066b
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 27 deletions.
diff --git a/src/GWallet.Backend/UtxoCoin/TransactionTypes.fs b/src/GWallet.Backend/UtxoCoin/TransactionTypes.fs
@@ -4,6 +4,22 @@ open GWallet.Backend
 
 open NBitcoin
 
+type SubUnit =
+    {
+        Multiplier: int
+        Caption: string
+    }
+    static member Bits =
+        {
+            Multiplier = 1000000
+            Caption = "bits"
+        }
+    static member Sats =
+        {
+            Multiplier = 100000000
+            Caption = "sats"
+        }
+
 type TransactionInputOutpointInfo =
     {
         TransactionHash: string;

diff --git a/src/GWallet.Frontend.XF/FrontendHelpers.fs b/src/GWallet.Frontend.XF/FrontendHelpers.fs
@@ -38,15 +38,6 @@ type internal CurrencyImageSize =
 
 module FrontendHelpers =
 
-    type CryptoSubUnit =
-    | No
-    | Specific of multiplier:int * caption:string
-
-    let Sats =
-        CryptoSubUnit.Specific(100_000_000, "sats")
-    let Bits =
-        CryptoSubUnit.Specific(1_000_000, "bits")
-
     type IGlobalAppState =
         [<CLIEvent>]
         abstract member Resumed: IEvent<unit> with get
@@ -118,7 +109,7 @@ module FrontendHelpers =
 
     let UpdateBalance (balance: MaybeCached<decimal>) currency usdRate
                       (maybeFrame: Option<Frame>) (balanceLabel: Label) (fiatBalanceLabel: Label)
-                      (cryptoSubUnit: CryptoSubUnit)
+                      (cryptoSubUnit: Option<UtxoCoin.SubUnit>)
                           : MaybeCached<decimal> =
         let maybeBalanceAmount =
             match balance with
@@ -141,16 +132,16 @@ module FrontendHelpers =
             | Some balanceAmount ->
                 let adjustedBalance =
                     match cryptoSubUnit with
-                    | No -> balanceAmount
-                    | Specific (multiplier, _caption) ->
-                        balanceAmount * decimal multiplier
+                    | None -> balanceAmount
+                    | Some unit ->
+                        balanceAmount * decimal unit.Multiplier
                 let cryptoAmount = Formatting.DecimalAmountRounding CurrencyType.Crypto adjustedBalance
                 let cryptoAmountStr =
                     match cryptoSubUnit with
-                    | No ->
+                    | None ->
                         SPrintF2 "%A %s" currency cryptoAmount
-                    | Specific (_multiplier, caption) ->
-                        SPrintF2 "%s %A" cryptoAmount caption
+                    | Some unit ->
+                        SPrintF2 "%s %A" cryptoAmount unit.Caption
                 let fiatAmount,fiatAmountStr = BalanceInUsdString balanceAmount usdRate
                 cryptoAmountStr,fiatAmount,fiatAmountStr
         MainThread.BeginInvokeOnMainThread(fun _ ->
@@ -179,7 +170,7 @@ module FrontendHelpers =
                               (Some balanceSet.Widgets.Frame)
                               balanceSet.Widgets.CryptoLabel
                               balanceSet.Widgets.FiatLabel
-                              CryptoSubUnit.No
+                              None
             return {
                 BalanceSet = balanceSet
                 FiatAmount = fiatAmount
@@ -208,7 +199,7 @@ module FrontendHelpers =
                                       (Some balanceSet.Widgets.Frame)
                                       balanceSet.Widgets.CryptoLabel
                                       balanceSet.Widgets.FiatLabel
-                                      CryptoSubUnit.No
+                                      None
                     return {
                         BalanceSet = balanceSet
                         FiatAmount = fiatAmount

diff --git a/src/GWallet.Frontend.XF/ReceivePage.xaml.fs b/src/GWallet.Frontend.XF/ReceivePage.xaml.fs
@@ -36,14 +36,14 @@ type ReceivePage(account: IAccount,
     let balanceLabel = mainLayout.FindByName<Label> "balanceLabel"
     let fiatBalanceLabel = mainLayout.FindByName<Label> "fiatBalanceLabel"
 
-    let tapCryptoLabel accountBalance =
+    let TapCryptoAmountLabel accountBalance =
         let cryptoSubUnit =
-            if balanceLabel.Text.StartsWith "BTC" then
-                FrontendHelpers.Bits
-            elif balanceLabel.Text.EndsWith "bits" then
-                FrontendHelpers.Sats
+            if balanceLabel.Text.Contains UtxoCoin.SubUnit.Bits.Caption then
+                Some UtxoCoin.SubUnit.Sats
+            elif balanceLabel.Text.Contains UtxoCoin.SubUnit.Sats.Caption then
+                None
             else
-                FrontendHelpers.CryptoSubUnit.No
+                Some UtxoCoin.SubUnit.Bits
         FrontendHelpers.UpdateBalance
             (NotFresh accountBalance)
             account.Currency
@@ -75,7 +75,7 @@ type ReceivePage(account: IAccount,
             None
             balanceLabel
             fiatBalanceLabel
-            FrontendHelpers.CryptoSubUnit.No
+            None
             |> ignore
 
         // this below is for the case when a new ReceivePage() instance is suddenly created after sending a transaction
@@ -86,7 +86,7 @@ type ReceivePage(account: IAccount,
                                       (Some balanceWidgetsFromBalancePage.Frame)
                                       balanceWidgetsFromBalancePage.CryptoLabel
                                       balanceWidgetsFromBalancePage.FiatLabel
-                                      FrontendHelpers.CryptoSubUnit.No
+                                      None
             |> ignore
 
         balanceLabel.FontSize <- FrontendHelpers.BigFontSize
@@ -95,7 +95,7 @@ type ReceivePage(account: IAccount,
         if account.Currency = Currency.BTC then
             let cryptoTapGestureRecognizer = TapGestureRecognizer()
             cryptoTapGestureRecognizer.Tapped.Subscribe(
-                fun _ -> tapCryptoLabel accountBalance
+                fun _ -> TapCryptoAmountLabel accountBalance
             ) |> ignore
             balanceLabel.GestureRecognizers.Add cryptoTapGestureRecognizer