Merge branch 'feature/stability_improvements' into develop

kukai-wallet · Jun 26, 2024 · 740546a · 740546a
2 parents 35c132b + d5cb5ea
commit 740546a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 15 deletions.
diff --git a/Kukai Mobile.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Kukai Mobile.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -42,7 +42,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/torusresearch/fetch-node-details-swift",
       "state" : {
-        "revision" : "5f67cd080c26cf38ae91e7fe63e6217c6e401c07",
+        "revision" : "22bfadf7491d77a0bc1953af002cadbd61383e7d",
         "version" : "6.0.2"
       }
     },
@@ -70,7 +70,7 @@
       "location" : "https://github.com/kukai-wallet/kukai-core-swift",
       "state" : {
         "branch" : "develop",
-        "revision" : "922e83b63c68ac275182ae2df5dbf7ce0c4a3ae9"
+        "revision" : "b5f65d9e8f9a4041f74a7265be3e2e3a07212148"
       }
     },
     {
@@ -96,8 +96,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/SDWebImage/SDWebImage.git",
       "state" : {
-        "revision" : "59730af512c06fb569c119d737df4c1c499e001d",
-        "version" : "5.18.10"
+        "revision" : "b8523c1642f3c142b06dd98443ea7c48343a4dfd",
+        "version" : "5.19.3"
       }
     },
     {

diff --git a/Kukai Mobile/Modules/Collectibles/Cells/List/CollectiblesCollectionCell.swift b/Kukai Mobile/Modules/Collectibles/Cells/List/CollectiblesCollectionCell.swift
@@ -57,7 +57,7 @@ class CollectiblesCollectionCell: UICollectionViewCell, UITableViewCellImageDown
 	}
 
 	func setupCollectionImage(url: URL?) {
-		MediaProxyService.load(url: url, to: collectionIcon, withCacheType: .temporary, fallback: UIImage.unknownToken(), downSampleSize: nil)
+		MediaProxyService.load(url: url, to: collectionIcon, withCacheType: .temporary, fallback: UIImage.unknownToken(), downSampleSize: nil, maxAnimatedImageSize: 0)
 	}
 
 	func setupImages(imageURLs: [URL?]) {

diff --git a/Kukai Mobile/Modules/Collectibles/CollectiblesCollectionsViewModel.swift b/Kukai Mobile/Modules/Collectibles/CollectiblesCollectionsViewModel.swift
@@ -366,8 +366,11 @@ class CollectiblesCollectionsViewModel: ViewModel, UICollectionViewDiffableDataS
 	}
 
 	func willDisplayCollectionImage(forIndexPath: IndexPath) -> URL? {
+
 		if forIndexPath.row < imageURLsForCollectionGroups.count {
-			return imageURLsForCollectionGroups[forIndexPath.row]
+			let url = imageURLsForCollectionGroups[forIndexPath.row]
+			Logger.app.info("willDisplayCollectionImage: \(url?.absoluteString)")
+			return url
 		}
 
 		return nil
@@ -387,7 +390,7 @@ class CollectiblesCollectionsViewModel: ViewModel, UICollectionViewDiffableDataS
 			urls = [MediaProxyService.smallURL(forNFT: obj)]
 		}
 
-		//Logger.app.info("Urls: \(urls)")
+		Logger.app.info("willDisplayImages: \(urls)")
 		return urls
 	}
 

diff --git a/Kukai Mobile/SceneDelegate.swift b/Kukai Mobile/SceneDelegate.swift
@@ -21,7 +21,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
 	@Published var dismissedPrivacyProtectionWindow = false
 
-	private var privacyProtectionWindow: UIWindow?
+	private var privacyProtectionWindow: UIWindow = UIWindow()
 
 
 	func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
@@ -103,11 +103,11 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
 		SentrySDK.addBreadcrumb(Breadcrumb(level: .info, category: "kukai", message: "continuing showPrivacyProtectionWindow"))
 		privacyProtectionWindowVisible = true
-		privacyProtectionWindow?.rootViewController = UIStoryboard(name: "Login", bundle: nil).instantiateInitialViewController() ?? UIViewController()
-		privacyProtectionWindow?.windowLevel = .alert + 1
-		privacyProtectionWindow?.alpha = 1
-		privacyProtectionWindow?.isHidden = false
-		privacyProtectionWindow?.makeKeyAndVisible()
+		privacyProtectionWindow.rootViewController = UIStoryboard(name: "Login", bundle: nil).instantiateInitialViewController() ?? UIViewController()
+		privacyProtectionWindow.windowLevel = .alert + 1
+		privacyProtectionWindow.alpha = 1
+		privacyProtectionWindow.isHidden = false
+		privacyProtectionWindow.makeKeyAndVisible()
 	}
 
 
@@ -121,10 +121,10 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
 
 		SentrySDK.addBreadcrumb(Breadcrumb(level: .info, category: "kukai", message: "continuing hidePrivacyProtectionWindow"))
 		UIView.animate(withDuration: 0.3) { [weak self] in
-			self?.privacyProtectionWindow?.alpha = 0
+			self?.privacyProtectionWindow.alpha = 0
 
 		} completion: { [weak self] finish in
-			self?.privacyProtectionWindow?.isHidden = true
+			self?.privacyProtectionWindow.isHidden = true
 			self?.privacyProtectionWindowVisible = false
 			self?.dismissedPrivacyProtectionWindow = true
 			SentrySDK.addBreadcrumb(Breadcrumb(level: .info, category: "kukai", message: "done animating hidePrivacyProtectionWindow"))