Merge pull request #126 from Adamant-im/develop

Develop to master. Version 2.8.0

Author: StanislavDevIOS

.swiftlint.yml

@@ -0,0 +1,22 @@
+disabled_rules:
+  - colon
+  - comma
+  - control_statement
+  - identifier_name
+  - line_length
+  - force_try
+  - type_name
+  - cyclomatic_complexity
+  - force_cast
+  - type_body_length
+  - trailing_whitespace
+  - function_body_length
+  - comment_spacing
+  - file_length
+  - large_tuple
+  - function_parameter_count
+  - shorthand_operator
+  - operator_whitespace
+  - no_fallthrough_only
+  - computed_accessors_order
+  - xctfail_message

Adamant.xcodeproj/project.pbxproj

@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/attaswift/BigInt.git",
         "state": {
           "branch": null,
-          "revision": "018a5925f60f9e0523edd261de394a0898fe95b7",
-          "version": "3.1.0"
+          "revision": "0ed110f7555c34ff468e72e1686e59721f2b0da6",
+          "version": "5.3.0"
         }
       },
       {
@@ -42,8 +42,8 @@
         "repositoryURL": "https://github.com/krzyzanowskim/CryptoSwift.git",
         "state": {
           "branch": null,
-          "revision": "5669f222e46c8134fb1f399c745fa6882b43532e",
-          "version": "1.3.8"
+          "revision": "039f56c5d7960f277087a0be51f5eb04ed0ec073",
+          "version": "1.5.1"
         }
       },
       {
@@ -78,8 +78,8 @@
         "repositoryURL": "https://github.com/xmartlabs/Eureka.git",
         "state": {
           "branch": null,
-          "revision": "975e8d5e0ea3c86aff828537b2d4abe4430d6312",
-          "version": "5.3.4"
+          "revision": "a7523afdfe38478c6d5706a8ac01d26590835493",
+          "version": "5.3.6"
         }
       },
       {
@@ -191,21 +191,21 @@
         }
       },
       {
-        "package": "Starscream",
-        "repositoryURL": "https://github.com/daltoniam/Starscream.git",
+        "package": "SocketIO",
+        "repositoryURL": "https://github.com/socketio/socket.io-client-swift",
         "state": {
-          "branch": null,
-          "revision": "e6b65c6d9077ea48b4a7bdda8994a1d3c6969c8d",
-          "version": "3.1.1"
+          "branch": "master",
+          "revision": "a1ed825835a2d8c2555938e96557ccc05e4bebf3",
+          "version": null
         }
       },
       {
-        "package": "swift-nio-zlib-support",
-        "repositoryURL": "https://github.com/apple/swift-nio-zlib-support.git",
+        "package": "Starscream",
+        "repositoryURL": "https://github.com/daltoniam/Starscream.git",
         "state": {
           "branch": null,
-          "revision": "37760e9a52030bb9011972c5213c3350fa9d41fd",
-          "version": "1.0.0"
+          "revision": "df8d82047f6654d8e4b655d1b1525c64e1059d21",
+          "version": "4.0.4"
         }
       },
       {
@@ -240,8 +240,8 @@
         "repositoryURL": "https://github.com/skywinder/web3swift.git",
         "state": {
           "branch": null,
-          "revision": "b060704c425ceb5b4c87ff8d8a2a9f0c0ae3bdc5",
-          "version": "2.2.2"
+          "revision": "4312a7178e1255c3ef65ac909657d29f6dd81bb6",
+          "version": "2.6.6"
         }
       }
     ]

Adamant.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -35,7 +35,6 @@ extension StoreKey {
     }
 }
 
-
 // MARK: - Application
 @UIApplicationMain
 class AppDelegate: UIResponder, UIApplicationDelegate {
@@ -120,8 +119,13 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                 tabBarAppearance.configureWithDefaultBackground()
                 UITabBar.appearance().standardAppearance = tabBarAppearance
 
+                let navigationBarAppearance = UINavigationBarAppearance()
+                navigationBarAppearance.configureWithDefaultBackground()
+                UINavigationBar.appearance().standardAppearance = navigationBarAppearance
+                        
                 if #available(iOS 15.0, *) {
                     UITabBar.appearance().scrollEdgeAppearance = tabBarAppearance
+                    UINavigationBar.appearance().scrollEdgeAppearance = navigationBarAppearance
                 }
             }
 
@@ -212,7 +216,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             dialogService.showError(withMessage: "Failed to register CurrencyInfoService autoupdate. Please, report a bug", error: nil)
         }
 
-        
         // MARK: 6. Logout reset
         NotificationCenter.default.addObserver(forName: Notification.Name.AdamantAccountService.userLoggedOut, object: nil, queue: OperationQueue.main) { [weak self] _ in
             // On logout, pop all navigators to root.
@@ -331,7 +334,7 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
         }
     }
 
-    //MARK: Open Chat From Notification
+    // MARK: Open Chat From Notification
     func application(_ application: UIApplication, didReceiveRemoteNotification userInfo: [AnyHashable : Any], fetchCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
         guard let transactionID = userInfo[AdamantNotificationUserInfoKeys.transactionId] as? String,
               let transactionRaw = userInfo[AdamantNotificationUserInfoKeys.transaction] as? String,
@@ -398,7 +401,6 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
     }
 }
 
-
 // MARK: - Background Fetch
 extension AppDelegate {
     func application(_ application: UIApplication, performFetchWithCompletionHandler completionHandler: @escaping (UIBackgroundFetchResult) -> Void) {
@@ -458,7 +460,6 @@ extension AppDelegate {
     }
 }
 
-
 // MARK: - Welcome messages
 extension AppDelegate {
     private func handleWelcomeMessages(notification: Notification) {

Adamant/AppDelegate.swift

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

Adamant/Assets/Assets.xcassets/Wallets/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "wallet_btc_row.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "wallet_btc_row@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "wallet_btc_row@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Adamant/Assets/Assets.xcassets/Wallets/wallet_btc_row.imageset/Contents.json

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

Adamant/Assets/Assets.xcassets/Wallets/wallet_btc_row.imageset/wallet_btc_row.png

@@ -1,23 +1,23 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "img-infocards-1.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "img-infocards-1@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "img-infocards-1@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

Adamant/Assets/Assets.xcassets/Wallets/wallet_btc_row.imageset/wallet_btc_row@2x.png

@@ -148,6 +148,9 @@
 /* Account tab: 'Send LSK tokens' button */
 "AccountTab.Row.SendLsk" = "LSK senden";
 
+/* Account tab: 'Send BTC tokens' button */
+"AccountTab.Row.SendBtc" = "BTC ";
+
 /* Account tab: 'Send DOGE tokens' button */
 "AccountTab.Row.SendDoge" = "DOGE senden";
 
@@ -199,6 +202,9 @@
 /* Account tab: Lisk wallet */
 "AccountTab.Wallets.lisk_wallet" = "Lisk Wallet";
 
+/* Account tab: Bitcoin wallet */
+"AccountTab.Wallets.bitcoin_wallet" = "Bitcoin Wallet";
+
 /* Account tab: Doge wallet */
 "AccountTab.Wallets.doge_wallet" = "Doge Wallet";
 
@@ -325,6 +331,9 @@
 /* Chat: 'Sent funds' bubble title */
 "ChatScene.Sent" = "Versendet";
 
+/* Chat: 'Received funds' bubble title */
+"ChatScene.Received" = "Erhalten";
+
 /* Chat: 'Sent funds' buble 'Tap for details' tip */
 "ChatScene.tapForDetails" = "Tap for details";
 
@@ -625,6 +634,12 @@
 /* Security: About Notification types */
 "SecurityPage.Section.AboutNotificationTypes" = "Über Benachrichtigungsoptionen";
 
+/* Security: Messages Notification sound */
+"SecurityPage.Section.Messages" = "Mitteilungen";
+
+/* Security: Settings Notification */
+"SecurityPage.Section.Settings" = "Einstellungen";
+
 /* Notifications: Disable notifications */
 "Notifications.Mode.NotificationsDisabled" = "Deaktiviert";
 
@@ -637,6 +652,21 @@
 /* Security: Visit Github */
 "SecurityPage.Row.VisitGithub" = "Zu GitHub";
 
+/* Notifications: Open system Settings */
+"Notifications.Settings.System" = "Systemeinstellungen";
+
+/* Notifications: Select Sound */
+"Notifications.Sound.Name" = "Klang";
+
+/* Notifications: Select Sounds */
+"Notifications.Sounds.Name" = "Geräusche";
+
+/* Notifications: Select Alert Save */
+"Notifications.Alert.Save" = "Speichern";
+
+/* Notifications: Alerts Cancel */
+"Notifications.Alert.Cancel" = "Absagen";
+
 /* Notifications: Something went wrong while registering remote notifications. %@ for description */
 "NotificationsService.Error.RegistrationRemotesFormat" = "Registrierung in ANS fehlgeschlagen. Bitte erneut versuchen. Ursache %@";
 
@@ -742,9 +772,6 @@
 /* Shared alert notification: body message for no internet connection. */
 "Shared.NoInternet.Body" = "Bitte überprüfen Sie Ihre Internetverbindung und versuchen Sie es erneut";
 
-/* Shared alert notification: message for no Mail services. */
-"Shared.NoMail" = "Mail services are not available";
-
 /* Shared alert 'Ok' button. Used anywhere */
 "Shared.Ok" = "Ok";
 
@@ -958,6 +985,9 @@
 /* Tranfser: Confirm using maximum available for transfer tokens as amount to transfer. */
 "TransferScene.UseMaxToTransfer" = "Alle verfügbaren Tokens versenden?";
 
+/* Tranfser: Dust error. */
+"TransferScene.Dust.Error" = "Staubmenge – Senden Sie mehr Token";
+
 /* Transfer: Confirm transfer %1$@ tokens to %2$@ message. Note two variables: at runtime %1$@ will be amount (with ADM suffix), and %2$@ will be recipient address. You can use address before amount with this so called 'position tokens'. */
 "TransferScene.SendConfirmFormat" = "%1$@ zu %2$@? senden";