1.9.1 (388)

nicegram · Dec 4, 2024 · 16cd4b5 · 16cd4b5
1 parent 048dc29
commit 16cd4b5
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 13 deletions.
diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock
diff --git a/Package.resolved b/Package.resolved
@@ -113,17 +113,17 @@
       "kind" : "remoteSourceControl",
       "location" : "[email protected]:mobyrix/nicegram-assistant-ios.git",
       "state" : {
-        "branch" : "develop",
-        "revision" : "597a76fda9061acee5562a901ccabef38e37e034"
+        "branch" : "qa/build-388",
+        "revision" : "9f62dbae6f8bbd9b663d0b137a3ad802ff19e3e2"
       }
     },
     {
       "identity" : "nicegram-wallet-ios",
       "kind" : "remoteSourceControl",
       "location" : "[email protected]:mobyrix/nicegram-wallet-ios.git",
       "state" : {
-        "branch" : "develop",
-        "revision" : "0520ea0bbe945c808fd283d9977d06bd6a5e1ed3"
+        "branch" : "qa/build-388",
+        "revision" : "9b54cc30993442deaadd226d638bb8c1787fbf08"
       }
     },
     {

diff --git a/Package.swift b/Package.swift
@@ -5,7 +5,7 @@ import PackageDescription
 let package = Package(
     name: "nicegram-package",
     dependencies: [
-        .package(url: "[email protected]:mobyrix/nicegram-assistant-ios.git", branch: "develop"),
-        .package(url: "[email protected]:mobyrix/nicegram-wallet-ios.git", branch: "develop")
+        .package(url: "[email protected]:mobyrix/nicegram-assistant-ios.git", branch: "qa/build-388"),        
+        .package(url: "[email protected]:mobyrix/nicegram-wallet-ios.git", branch: "qa/build-388")
     ]
 )
diff --git a/ng-env.txt b/ng-env.txt
@@ -1 +1 @@
-prod
+test
diff --git a/submodules/ChatListUI/Sources/Node/ChatListNode.swift b/submodules/ChatListUI/Sources/Node/ChatListNode.swift
@@ -2381,8 +2381,8 @@ public final class ChatListNode: ListView {
 
             // MARK: Nicegram PinnedChats
             var nicegramItems = nicegramItems
-            if filter != nil {
-                nicegramItems = []
+            nicegramItems = nicegramItems.filter { item in
+                filter == nil || item.chat.showInAllFolders
             }
             if case .forum(_) = location {
                 nicegramItems = []

diff --git a/submodules/TelegramUI/Sources/AppDelegate.swift b/submodules/TelegramUI/Sources/AppDelegate.swift
@@ -444,6 +444,7 @@ private class UserInterfaceStyleObserverWindow: UIWindow {
             walletData: .init(
                 env: {
                     .init(
+                        appUniversalLinkDomain: NGCore.UrlUtils.ASSOCIATED_DOMAIN,
                         appUrlScheme: buildConfig.appSpecificUrlScheme,
                         enableLogging: ngEnableLogging,
                         keychainGroupIdentifier: NGENV.wallet.keychainGroupIdentifier,

diff --git a/submodules/TelegramUI/Sources/ChatHistoryListNode.swift b/submodules/TelegramUI/Sources/ChatHistoryListNode.swift
@@ -1684,6 +1684,12 @@ public final class ChatHistoryListNodeImpl: ListView, ChatHistoryNode, ChatHisto
                     forceRemove: forceRemove
                 )
             }
+            .prepend(
+                NicegramAdInChat(
+                    ad: nil,
+                    forceRemove: false
+                )
+            )
             .toSignal()
             .skipError()
 

diff --git a/submodules/TelegramUI/Sources/Nicegram/UrlOpenerImpl.swift b/submodules/TelegramUI/Sources/Nicegram/UrlOpenerImpl.swift
@@ -18,6 +18,8 @@ class UrlOpenerImpl {
 
 extension UrlOpenerImpl: UrlOpener {
     func open(_ url: URL) {
+        let url = prepare(url: url)
+
         let sharedContext = accountContext.sharedContext
         let navigationController = sharedContext.mainWindow?.viewController as? NavigationController
         let presentationData = sharedContext.currentPresentationData.with { $0 }
@@ -38,3 +40,16 @@ extension UrlOpenerImpl: UrlOpener {
         )
     }
 }
+
+private extension UrlOpenerImpl {
+    func prepare(url: URL) -> URL {
+        var result = url.absoluteString
+
+        let isSchemeEmpty = url.scheme?.isEmpty ?? true
+        if isSchemeEmpty {
+            result = "https://\(result)"
+        }
+
+        return URL(string: result) ?? url
+    }
+}