Fixing comments on MR

.swiftpm/xcode/xcshareddata/xcschemes/Integration.xcscheme

-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
-   LastUpgradeVersion = "1340"
-   version = "1.3">
-   <BuildAction
-      parallelizeBuildables = "YES"
-      buildImplicitDependencies = "YES">
-      <BuildActionEntries>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "Integration"
-               BuildableName = "Integration"
-               BlueprintName = "Integration"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </BuildActionEntry>
-      </BuildActionEntries>
-   </BuildAction>
-   <TestAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
-   </TestAction>
-   <LaunchAction
-      buildConfiguration = "Debug"
-      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
-      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      launchStyle = "0"
-      useCustomWorkingDirectory = "NO"
-      ignoresPersistentStateOnLaunch = "NO"
-      debugDocumentVersioning = "YES"
-      debugServiceExtension = "internal"
-      allowLocationSimulation = "YES">
-   </LaunchAction>
-   <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      savedToolIdentifier = ""
-      useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "Integration"
-            BuildableName = "Integration"
-            BlueprintName = "Integration"
-            ReferencedContainer = "container:">
-         </BuildableReference>
-      </MacroExpansion>
-   </ProfileAction>
-   <AnalyzeAction
-      buildConfiguration = "Debug">
-   </AnalyzeAction>
-   <ArchiveAction
-      buildConfiguration = "Release"
-      revealArchiveInOrganizer = "YES">
-   </ArchiveAction>
-</Scheme>

App/client-ios/Resources/GoogleService-Info.plist

@@ -3,34 +3,34 @@
 <plist version="1.0">
 <dict>
 	<key>CLIENT_ID</key>
-        <string>662236151640-herpu89qikpfs9m4kvbi9bs5fpdji5de.apps.googleusercontent.com</string>
+	<string></string>
 	<key>REVERSED_CLIENT_ID</key>
-        <string>com.googleusercontent.apps.662236151640-herpu89qikpfs9m4kvbi9bs5fpdji5de</string>
+	<string></string>
 	<key>ANDROID_CLIENT_ID</key>
-        <string>662236151640-2ughgo2dvc59dm4o39b45lbdungp2mct.apps.googleusercontent.com</string>
+	<string></string>
 	<key>API_KEY</key>
-        <string>AIzaSyCbI2yQ7pbuVSRvraqanjGcS9CDrjD7lNU</string>
+	<string></string>
 	<key>GCM_SENDER_ID</key>
-        <string>662236151640</string>
+	<string></string>
 	<key>PLIST_VERSION</key>
-        <string>1</string>
+	<string></string>
 	<key>BUNDLE_ID</key>
-        <string>io.xxlabs.messenger</string>
+	<string></string>
 	<key>PROJECT_ID</key>
-        <string>xx-messenger-6e03e</string>
+	<string></string>
 	<key>STORAGE_BUCKET</key>
-        <string>xx-messenger-6e03e.appspot.com</string>
+	<string></string>
 	<key>IS_ADS_ENABLED</key>
-        <false></false>
+	<false/>
 	<key>IS_ANALYTICS_ENABLED</key>
-        <false></false>
+	<false/>
 	<key>IS_APPINVITE_ENABLED</key>
-        <true></true>
+	<false/>
 	<key>IS_GCM_ENABLED</key>
-        <true></true>
+	<false/>
 	<key>IS_SIGNIN_ENABLED</key>
-        <true></true>
+	<false/>
 	<key>GOOGLE_APP_ID</key>
-        <string>1:662236151640:ios:24badb58ab07515d8cef2d</string>
+	<string></string>
 </dict>
 </plist>

Package.swift

@@ -53,7 +53,7 @@ let package = Package(
     dependencies: [
         .package(
             url: "https://git.xx.network/elixxir/client-ios-db.git",
-            revision: "452392e032d52b217a20cd0f9de3b289f12fe444"
+            revision: "eb071f08000b2b7646e45e7a5f55bdc9ad6dbcfa"
         ),
         .package(url: "https://github.com/Quick/Quick", from: "3.0.0"),
         .package(url: "https://github.com/Quick/Nimble", from: "9.0.0"),

Sources/App/AppDelegate.swift

@@ -93,10 +93,9 @@ public class AppDelegate: UIResponder, UIApplicationDelegate {
                     if !self.forceFailedPendingMessages {
                         self.forceFailedPendingMessages = true
 
-                        // TODO: We need a Message.Assignment for status
-//                        let query = Message.Query(status: [.sending])
-//                        let assignment = Message.Assignments(status: .sendingFailed)
-//                        _ = try? session.dbManager.bulkUpdateMessages(query, assignment)
+                        let query = Message.Query(status: [.sending])
+                        let assignment = Message.Assignments(status: .sendingFailed)
+                        _ = try? session.dbManager.bulkUpdateMessages(query, assignment)
                     }
 
                     return

Sources/ContactListFeature/Controllers/CreateGroupController.swift

@@ -183,9 +183,3 @@ extension CreateGroupController: UITableViewDelegate {
         }
     }
 }
-
-extension Contact: Hashable {
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(id)
-    }
-}

Sources/MenuFeature/ViewModels/MenuViewModel.swift

@@ -22,8 +22,8 @@ final class MenuViewModel {
         ])
 
         return Publishers.CombineLatest(
-            session.dbManager.fetchContactsPublisher(contactsQuery).catch { _ in Just([]) },
-            session.dbManager.fetchGroupsPublisher(groupQuery).catch { _ in Just([]) }
+            session.dbManager.fetchContactsPublisher(contactsQuery).assertNoFailure(),
+            session.dbManager.fetchGroupsPublisher(groupQuery).assertNoFailure()
         )
         .map { $0.0.count + $0.1.count }
         .eraseToAnyPublisher()

Sources/RequestsFeature/Models/Request.swift

@@ -67,15 +67,3 @@ extension Contact.AuthStatus {
         }
     }
 }
-
-extension Contact: Hashable {
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(id)
-    }
-}
-
-extension Group: Hashable {
-    public func hash(into hasher: inout Hasher) {
-        hasher.combine(id)
-    }
-}

client-ios.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -50,7 +50,7 @@
       "kind" : "remoteSourceControl",
       "location" : "https://git.xx.network/elixxir/client-ios-db.git",
       "state" : {
-        "revision" : "452392e032d52b217a20cd0f9de3b289f12fe444"
+        "revision" : "eb071f08000b2b7646e45e7a5f55bdc9ad6dbcfa"
       }
     },
     {