Merge branch 'version/0.42'

Author: esen

UnstoppableWallet/UnstoppableWallet.xcodeproj/project.pbxproj

@@ -12550,7 +12550,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.42;
+				MARKETING_VERSION = 0.42.1;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				OfficeMode = true;
@@ -12622,7 +12622,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.42;
+				MARKETING_VERSION = 0.42.1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				OfficeMode = false;
 				SDKROOT = iphoneos;

UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Icons/question_24.imageset/Contents.json

@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Icons/question_24.imageset/[email protected]

@@ -13,7 +13,8 @@ class WatchlistManager {
     private var cancellables = Set<AnyCancellable>()
 
     private let coinUidsSubject = PassthroughSubject<[String], Never>()
-
+    private let showSignalsUpdatedSubject = PassthroughSubject<(), Never>()
+    
     var coinUids: [String] {
         didSet {
             coinUidSet = Set(coinUids)
@@ -48,6 +49,7 @@ class WatchlistManager {
     var showSignals: Bool {
         didSet {
             storage.set(value: showSignals, for: keyShowSignals)
+            showSignalsUpdatedSubject.send()
             // WidgetCenter.shared.reloadTimelines(ofKind: AppWidgetConstants.watchlistWidgetKind)
         }
     }
@@ -86,6 +88,10 @@ extension WatchlistManager {
         coinUidsSubject.eraseToAnyPublisher()
     }
 
+    var showSignalsUpdatedPublisher: AnyPublisher<(), Never> {
+        showSignalsUpdatedSubject.eraseToAnyPublisher()
+    }
+
     var timePeriods: [WatchlistTimePeriod] {
         [priceChangeModeManager.day1WatchlistPeriod, .week1, .month1, .month3]
     }

UnstoppableWallet/UnstoppableWallet/Assets.xcassets/Icons/question_24.imageset/[email protected]

@@ -3,25 +3,14 @@ import Foundation
 import MarketKit
 
 class MarketAdvancedSearchResultsViewModel: ObservableObject {
-    private static let showSignalKey = "advanced_search_show_signal_key"
-
     private let currencyManager = App.shared.currencyManager
     private let purchaseManager = App.shared.purchaseManager
-    private let userDefaultsStorage = App.shared.userDefaultsStorage
+    private let watchlistManager = App.shared.watchlistManager
     private var cancellables = Set<AnyCancellable>()
 
     private let internalMarketInfos: [MarketInfo]
     let timePeriod: HsTimePeriod
 
-    private var showSignalsVar: Bool {
-        get {
-            userDefaultsStorage.value(for: Self.showSignalKey) ?? false
-        }
-        set {
-            userDefaultsStorage.set(value: newValue, for: Self.showSignalKey)
-        }
-    }
-
     @Published private(set) var premiumEnabled: Bool = false
     @Published var marketInfos: [MarketInfo] = []
     @Published var showSignals: Bool = false
@@ -38,7 +27,7 @@ class MarketAdvancedSearchResultsViewModel: ObservableObject {
         internalMarketInfos = marketInfos
         self.timePeriod = timePeriod
 
-        showSignals = premiumEnabled && showSignalsVar
+        showSignals = premiumEnabled && watchlistManager.showSignals
         self.premiumEnabled = premiumEnabled
 
         purchaseManager.$activeFeatures
@@ -53,7 +42,7 @@ class MarketAdvancedSearchResultsViewModel: ObservableObject {
     }
 
     private func syncShowSignals() {
-        showSignals = premiumEnabled && showSignalsVar
+        showSignals = premiumEnabled && watchlistManager.showSignals
     }
 
     private func syncState() {
@@ -73,7 +62,7 @@ extension MarketAdvancedSearchResultsViewModel {
     func set(showSignals: Bool) {
         stat(page: .markets, section: .searchResults, event: .showSignals(shown: showSignals))
         syncState()
-        showSignalsVar = showSignals
+        watchlistManager.showSignals = showSignals
 
         self.showSignals = premiumEnabled && showSignals
     }

UnstoppableWallet/UnstoppableWallet/Core/Managers/WatchlistManager.swift

@@ -59,6 +59,12 @@ class MarketWatchlistViewModel: ObservableObject {
             }
             .store(in: &cancellables)
 
+        watchlistManager.showSignalsUpdatedPublisher
+            .sink { [weak self] in
+                self?.syncShowSignals()
+            }
+            .store(in: &cancellables)
+
         purchaseManager.$activeFeatures
             .receive(on: DispatchQueue.main)
             .sink { [weak self] activeFeatures in

UnstoppableWallet/UnstoppableWallet/Modules/Market/AdvancedSearch/MarketAdvancedSearchResultsViewModel.swift

@@ -40,8 +40,8 @@ struct PurchaseBottomSheetView: View {
 
             subscribedDescription()
                 .multilineTextAlignment(.center)
+                .frame(height: 64)
                 .padding(.horizontal, .margin32)
-                .padding(.vertical, .margin12)
 
             VStack(spacing: .margin12) {
                 Button(action: {

UnstoppableWallet/UnstoppableWallet/Modules/Market/Watchlist/MarketWatchlistViewModel.swift

@@ -169,7 +169,7 @@ extension PurchaseBottomSheetViewModel {
                         let discountPrecentage = ((monthlyPrice - realMonthlyPrice) / monthlyPrice) * 100
                         discountBadge = ["purchase.period.save".localized.uppercased(), "\(discountPrecentage.rounded(decimal: 0))%"].joined(separator: " ")
 
-                        priceDescription = "(\([realMonthlyPrice.rounded(decimal: 2).description, period.pricePeriod].joined(separator: "/")))"
+                        priceDescription = "(\([realMonthlyPrice.rounded(decimal: 2).description, "purchase.period.month".localized].joined(separator: "/")))"
                         priceDescripionAccented = true
                     } else {
                         discountBadge = nil

UnstoppableWallet/UnstoppableWallet/Modules/Purchases/PurchaseBottomSheet/PurchaseBottomSheetView.swift

@@ -415,13 +415,25 @@ class MainSettingsViewController: ThemeViewController {
                 image: .local(UIImage(named: "academy_1_24")),
                 title: .body("education.title".localized),
                 accessoryType: .disclosure,
-                isLast: true,
                 action: { [weak self] in
                     self?.navigationController?.pushViewController(EducationView().toViewController(title: "education.title".localized), animated: true)
 
                     stat(page: .settings, event: .open(page: .education))
                 }
             ),
+            tableView.universalRow48(
+                id: "quiz",
+                image: .local(UIImage(named: "question_24")),
+                title: .body("quiz.title".localized),
+                accessoryType: .disclosure,
+                autoDeselect: true,
+                isLast: true,
+                action: {
+                    UrlManager.open(url: "https://t.me/\(AppConfig.appTokenTelegramAccount)/app")
+
+                    stat(page: .settings, event: .open(page: .externalTelegram))
+                }
+            ),
         ]
     }
 
@@ -524,6 +536,7 @@ class MainSettingsViewController: ThemeViewController {
                 title: .body("settings.tell_friends".localized),
                 accessoryType: .disclosure,
                 autoDeselect: true,
+                isLast: true,
                 action: { [weak self] in
                     self?.openTellFriends()
                 }