displays usage bar for free and pro; threads start data balance

Author: stuartwk

app/network/Main/Account/AccountRootView.swift

@@ -119,33 +119,27 @@ struct AccountRootView: View {
                             }
 
                         }
+                            
+                        Spacer().frame(height: 8)
+                     
+                        UsageBar(
+                            availableByteCount: subscriptionBalanceViewModel.availableByteCount,
+                            pendingByteCount: subscriptionBalanceViewModel.pendingByteCount,
+                            usedByteCount: subscriptionBalanceViewModel.usedBalanceByteCount,
+                            meanReliabilityWeight: meanReliabilityWeight,
+                            totalReferrals: referralLinkViewModel.totalReferrals,
+                            dailyBalanceByteCount: subscriptionBalanceViewModel.startBalanceByteCount
+                        )
 
-                        /**
-                         * only display usage bar to users with basic plans
-                         */
-                        if (!isPro) {
+                        HStack {
 
-                            Spacer().frame(height: 8)
-                         
-                            UsageBar(
-                                availableByteCount: subscriptionBalanceViewModel.availableByteCount,
-                                pendingByteCount: subscriptionBalanceViewModel.pendingByteCount,
-                                usedByteCount: subscriptionBalanceViewModel.usedBalanceByteCount,
-                                meanReliabilityWeight: meanReliabilityWeight,
-                                totalReferrals: referralLinkViewModel.totalReferrals
-                            )
+                            Spacer()
 
-                            HStack {
-                                
-                                Spacer()
-                                
-                                Button(action: {
-                                    viewModel.isPresentedRedeemBalanceCodeSheet = true
-                                }) {
-                                    Text("Redeem Balance Code")
-                                        .font(themeManager.currentTheme.secondaryBodyFont)
-                                }
-                                
+                            Button(action: {
+                                viewModel.isPresentedRedeemBalanceCodeSheet = true
+                            }) {
+                                Text("Redeem Balance Code")
+                                    .font(themeManager.currentTheme.secondaryBodyFont)
                             }
 
                         }

app/network/Main/Account/TransferBalanceCodes/TransferBalanceCodesView.swift

@@ -57,7 +57,7 @@ struct TransferBalanceCodesView: View {
 
                                     Spacer()
 
-                                    Text("+\(formatBytes(balanceCode.balanceByteCount))")
+                                    Text("+\(formatBalanceBytes(Int(balanceCode.balanceByteCount)))")
 
                                     Spacer()
 
@@ -159,19 +159,6 @@ struct TransferBalanceCodesView: View {
         .background(themeManager.currentTheme.backgroundColor.ignoresSafeArea())
     }
 
-    private func formatBytes(_ bytes: Int64) -> String {
-        let oneTiB = 1024 * 1024 * 1024 * 1024
-        let oneGiB = 1024 * 1024 * 1024
-        let doubleBytes = Double(bytes)
-        if bytes >= oneTiB {
-            let value = doubleBytes / Double(oneTiB)
-            return String(format: "%.2f TiB", value)
-        } else {
-            let value = doubleBytes / Double(oneGiB)
-            return String(format: "%.2f GiB", value)
-        }
-    }
-    
     private func formatShortDate(unixMilli: Int64) -> String {
         let date = Date(timeIntervalSince1970: TimeInterval(unixMilli) / 1000)
         let formatter = DateFormatter()

app/network/Main/Connect/ConnectActions/ConnectActions.swift

@@ -28,6 +28,7 @@ struct ConnectActions: View {
     let meanReliabilityWeight: Double
     let totalReferrals: Int
     let isPro: Bool
+    let dailyBalanceByteCount: Int
 
     @EnvironmentObject var themeManager: ThemeManager
 
@@ -131,7 +132,8 @@ struct ConnectActions: View {
                                 pendingByteCount: pendingByteCount,
                                 usedByteCount: usedByteCount,
                                 meanReliabilityWeight: meanReliabilityWeight,
-                                totalReferrals: totalReferrals
+                                totalReferrals: totalReferrals,
+                                dailyBalanceByteCount: dailyBalanceByteCount
                             )
 
                         }

app/network/Main/Connect/ConnectView-iOS.swift

@@ -37,7 +37,7 @@ struct ConnectView_iOS: View {
     @GestureState private var sheetDragTranslation: CGFloat = 0
 
     private let sheetMinHeight: CGFloat   // collapsed peek height (adjust)
-    private let sheetMaxHeight: CGFloat = 480   // expanded height (adjust)
+    private let sheetMaxHeight: CGFloat = 500   // expanded height (adjust)
 
 
     init(
@@ -63,9 +63,7 @@ struct ConnectView_iOS: View {
 
 
         self.isPro = isPro
-
-        // we can remove this once pro is scrollable
-        self.sheetMinHeight = isPro ? 250 : 280
+        self.sheetMinHeight = 280
 
         // adds clear button to search providers text field
         UITextField.appearance().clearButtonMode = .whileEditing
@@ -208,7 +206,8 @@ struct ConnectView_iOS: View {
                                 },
                                 meanReliabilityWeight: meanReliabilityWeight,
                                 totalReferrals: referralLinkViewModel.totalReferrals,
-                                isPro: isPro
+                                isPro: isPro,
+                                dailyBalanceByteCount: subscriptionBalanceViewModel.startBalanceByteCount
                             )
                         }
                     }

app/network/Main/Connect/ConnectView-macOS.swift

@@ -102,7 +102,8 @@ import URnetworkSdk
                                 },
                                 meanReliabilityWeight: meanReliabilityWeight,
                                 totalReferrals: totalReferrals,
-                                isPro: isPro
+                                isPro: isPro,
+                                dailyBalanceByteCount: subscriptionBalanceViewModel.startBalanceByteCount
                             )
 
                         }