Merge pull request #285 from Adamant-im/develop

Release 3.1.0

Adamant.xcodeproj/xcshareddata/xcschemes/Adamant.Release.xcscheme

@@ -53,7 +53,7 @@
       buildConfiguration = "Release"
       selectedDebuggerIdentifier = ""
       selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
-      launchStyle = "1"
+      launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"

Adamant.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,6 +1,15 @@
 {
   "object": {
     "pins": [
+      {
+        "package": "abseil",
+        "repositoryURL": "https://github.com/firebase/abseil-cpp-SwiftPM.git",
+        "state": {
+          "branch": null,
+          "revision": "583de9bd60f66b40e78d08599cc92036c2e7e4e1",
+          "version": "0.20220203.2"
+        }
+      },
       {
         "package": "Alamofire",
         "repositoryURL": "https://github.com/Alamofire/Alamofire.git",
@@ -19,6 +28,15 @@
           "version": "5.3.0"
         }
       },
+      {
+        "package": "BoringSSL-GRPC",
+        "repositoryURL": "https://github.com/firebase/boringssl-SwiftPM.git",
+        "state": {
+          "branch": null,
+          "revision": "dd3eda2b05a3f459fc3073695ad1b28659066eab",
+          "version": "0.9.1"
+        }
+      },
       {
         "package": "CryptoSwift",
         "repositoryURL": "https://github.com/krzyzanowskim/CryptoSwift.git",
@@ -42,8 +60,8 @@
         "repositoryURL": "https://github.com/EFPrefix/EFQRCode.git",
         "state": {
           "branch": null,
-          "revision": "4a72d79f9cae6d2f189f768178cc8594b427c190",
-          "version": "6.1.0"
+          "revision": "2991c2f318ad9529d93b2a73a382a3f9c72c64ce",
+          "version": "6.2.2"
         }
       },
       {
@@ -55,6 +73,60 @@
           "version": "5.3.6"
         }
       },
+      {
+        "package": "Firebase",
+        "repositoryURL": "https://github.com/firebase/firebase-ios-sdk",
+        "state": {
+          "branch": null,
+          "revision": "7e80c25b51c2ffa238879b07fbfc5baa54bb3050",
+          "version": "9.6.0"
+        }
+      },
+      {
+        "package": "GoogleAppMeasurement",
+        "repositoryURL": "https://github.com/google/GoogleAppMeasurement.git",
+        "state": {
+          "branch": null,
+          "revision": "c1cfde8067668027b23a42c29d11c246152fe046",
+          "version": "9.6.0"
+        }
+      },
+      {
+        "package": "GoogleDataTransport",
+        "repositoryURL": "https://github.com/google/GoogleDataTransport.git",
+        "state": {
+          "branch": null,
+          "revision": "7874c1b48cbffd086ce8a052c4be873a78613775",
+          "version": "9.2.3"
+        }
+      },
+      {
+        "package": "GoogleUtilities",
+        "repositoryURL": "https://github.com/google/GoogleUtilities.git",
+        "state": {
+          "branch": null,
+          "revision": "871d43135925cde39ef7421d8723ce47edfdcc39",
+          "version": "7.11.1"
+        }
+      },
+      {
+        "package": "gRPC",
+        "repositoryURL": "https://github.com/grpc/grpc-ios.git",
+        "state": {
+          "branch": null,
+          "revision": "8440b914756e0d26d4f4d054a1c1581daedfc5b6",
+          "version": "1.44.3-grpc"
+        }
+      },
+      {
+        "package": "GTMSessionFetcher",
+        "repositoryURL": "https://github.com/google/gtm-session-fetcher.git",
+        "state": {
+          "branch": null,
+          "revision": "5ccda3981422a84186387dbb763ba739178b529c",
+          "version": "2.3.0"
+        }
+      },
       {
         "package": "InputBarAccessoryView",
         "repositoryURL": "https://github.com/nathantannar4/InputBarAccessoryView",
@@ -73,6 +145,15 @@
           "version": "4.2.2"
         }
       },
+      {
+        "package": "leveldb",
+        "repositoryURL": "https://github.com/firebase/leveldb.git",
+        "state": {
+          "branch": null,
+          "revision": "0706abcc6b0bd9cedfbb015ba840e4a780b5159b",
+          "version": "1.22.2"
+        }
+      },
       {
         "package": "MarkdownKit",
         "repositoryURL": "https://github.com/bmoliveira/MarkdownKit.git",
@@ -91,21 +172,30 @@
           "version": "4.1.1"
         }
       },
+      {
+        "package": "nanopb",
+        "repositoryURL": "https://github.com/firebase/nanopb.git",
+        "state": {
+          "branch": null,
+          "revision": "819d0a2173aff699fb8c364b6fb906f7cdb1a692",
+          "version": "2.30909.0"
+        }
+      },
       {
         "package": "OpenSSL",
         "repositoryURL": "https://github.com/krzyzanowskim/OpenSSL.git",
         "state": {
           "branch": null,
-          "revision": "52db2ab9de7f78d1dea0d728fddd47fb133e25b7",
-          "version": "1.1.1900"
+          "revision": "0c70e4b7d22411a7fe3ff59b913d5b760b735ce1",
+          "version": "1.1.2100"
         }
       },
       {
         "package": "Parchment",
         "repositoryURL": "https://github.com/rechsteiner/Parchment",
         "state": {
           "branch": "main",
-          "revision": "ee81b508ab5926b7253779d029b0d9af2dd4ee2b",
+          "revision": "13aad3e9308e8a4e38cb579430dbf66465418777",
           "version": null
         }
       },
@@ -118,6 +208,15 @@
           "version": "5.2.0"
         }
       },
+      {
+        "package": "Promises",
+        "repositoryURL": "https://github.com/google/promises.git",
+        "state": {
+          "branch": null,
+          "revision": "ec957ccddbcc710ccc64c9dcbd4c7006fcf8b73a",
+          "version": "2.2.0"
+        }
+      },
       {
         "package": "QRCodeReader",
         "repositoryURL": "https://github.com/yannickl/QRCodeReader.swift.git",
@@ -181,6 +280,15 @@
           "version": "4.0.4"
         }
       },
+      {
+        "package": "SwiftProtobuf",
+        "repositoryURL": "https://github.com/apple/swift-protobuf.git",
+        "state": {
+          "branch": null,
+          "revision": "f25867a208f459d3c5a06935dceb9083b11cd539",
+          "version": "1.22.0"
+        }
+      },
       {
         "package": "Sodium",
         "repositoryURL": "https://github.com/jedisct1/swift-sodium.git",
@@ -213,8 +321,8 @@
         "repositoryURL": "https://github.com/skywinder/web3swift.git",
         "state": {
           "branch": null,
-          "revision": "edfe6240efcc6710d88b370ab1a3375e51dbe62f",
-          "version": "3.1.0"
+          "revision": "16a2915ebd1a0fd33bf0a0ed5a9874909a6e187d",
+          "version": "3.1.2"
         }
       }
     ]

Adamant/AppDelegate.swift

@@ -65,7 +65,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         pushNotificationsTokenService = container.resolve(PushNotificationsTokenService.self)
         visibleWalletsService = container.resolve(VisibleWalletsService.self)
 
-        // MARK: 1.1. First run flag
+        // MARK: 1.1 Configure Firebase if needed
+
+        container
+            .resolve(CrashlyticsService.self)?
+            .configureIfNeeded()
+
+        // MARK: 1.2 First run flag
         let firstRun = UserDefaults.standard.bool(forKey: StoreKey.application.firstRun)
 
         if !firstRun {
@@ -202,6 +208,11 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             Task { await service.startObserving() }
         }
 
+        // Setup transactions reply observing
+        if let service = container.resolve(RichTransactionReplyService.self) {
+            Task { await service.startObserving() }
+        }
+
         // Register repeater services
         if let chatsProvider = container.resolve(ChatsProvider.self) {
             repeater.registerForegroundCall(label: "chatsProvider", interval: 10, queue: .global(qos: .utility), callback: {
@@ -350,7 +361,7 @@ extension AppDelegate {
         chatListNav.dismiss(animated: true, completion: nil)
         tabbar.selectedIndex = 0
 
-        let vc = chatListVC.chatViewController(for: chatroom)
+        let vc = chatListVC.chatViewController(for: chatroom, with: transactionID)
 
         vc.hidesBottomBarWhenPushed = true
 

Adamant/Assets/Assets.xcassets/Row/azbit_logo.imageset/Contents.json

@@ -1,23 +1,26 @@
 {
   "images" : [
     {
-      "filename" : "azbit-logo-3_21x21.png",
+      "filename" : "azbit-logo.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "azbit-logo-3_1_42x42.png",
+      "filename" : "azbit-logo@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "azbit-logo-3_2_63x63.png",
+      "filename" : "azbit-logo@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }

Adamant/Assets/Assets.xcassets/Row/row_contribute.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "filename" : "contribute.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Adamant/Assets/Assets.xcassets/Row/row_crashlytics.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "filename" : "crashlytics.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Adamant/Assets/Assets.xcassets/Row/row_stakecube.imageset/Contents.json

@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "filename" : "stakecube.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}

Adamant/Assets/Assets.xcassets/Row/row_twitter.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "twitter-16.png",
+      "filename" : "twitter.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "twitter-17.png",
+      "filename" : "twitter@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "twitter-18.png",
+      "filename" : "twitter@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }
@@ -21,6 +21,6 @@
     "version" : 1
   },
   "properties" : {
-    "template-rendering-intent" : "original"
+    "template-rendering-intent" : "template"
   }
 }

Adamant/Assets/Assets.xcassets/Swipe actions/Contents.json

@@ -1,6 +1,6 @@
 {
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}