Fix signature and bugs

Author: blackFishX

.gitignore

@@ -104,3 +104,7 @@ xcuserdata/
 
 ### Here we store Release password. It's super-secret, not for git. ###
 AdamantSecret.swift
+runkit ex.rtf
+to do.rtf
+tz.rtf
+profiles

Adamant.xcodeproj/project.pbxproj

@@ -27,6 +27,15 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "E913C8ED1FFFA51D001A83F7"
+            BuildableName = "Adamant.app"
+            BlueprintName = "Adamant"
+            ReferencedContainer = "container:Adamant.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
       <Testables>
          <TestableReference
             skipped = "NO">
@@ -39,17 +48,6 @@
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "E913C8ED1FFFA51D001A83F7"
-            BuildableName = "Adamant.app"
-            BlueprintName = "Adamant"
-            ReferencedContainer = "container:Adamant.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Debug"
@@ -72,8 +70,6 @@
             ReferencedContainer = "container:Adamant.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"

Adamant.xcodeproj/xcshareddata/xcschemes/Adamant.Dev.xcscheme

@@ -115,6 +115,16 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
                 accounts.viewControllers = [account]
             }
 
+            if #available(iOS 13.0, *) {
+                let tabBarAppearance: UITabBarAppearance = UITabBarAppearance()
+                tabBarAppearance.configureWithDefaultBackground()
+                UITabBar.appearance().standardAppearance = tabBarAppearance
+
+                if #available(iOS 15.0, *) {
+                    UITabBar.appearance().scrollEdgeAppearance = tabBarAppearance
+                }
+            }
+            
             tabbar.setViewControllers([chats, accounts], animated: false)
         }
 

Adamant.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -733,6 +733,9 @@
 /* Transaction details: date row. */
 "TransactionDetailsScene.Row.Date" = "Datum";
 
+/* Transaction send: recipient minimum remaining balance requirement */
+"TransactionSend.Minimum.Balance" = "Der Empfänger muss mindestens 0,05 LSK haben – Senden Sie mehr Token";
+
 /* Transaction details: 'Open transaction in explorer' row. */
 "TransactionDetailsScene.Row.Explorer" = "Im Explorer öffnen";
 

Adamant/AppDelegate.swift

@@ -751,6 +751,9 @@
 /* TransactionList: 'Transactions not found' localize error message from API. */
 "No transactions found" = "Transactions not found";
 
+/* Transaction send: recipient minimum remaining balance requirement */
+"TransactionSend.Minimum.Balance" = "Recipient must have at least 0.05 LSK—Send more tokens";
+
 /* Transaction status: updating in progress */
 "TransactionStatus.Updating" = "Updating…";
 

Adamant/Assets/l18n/de.lproj/Localizable.strings

@@ -784,6 +784,9 @@
 /* Transaction details: 'Open transaction in explorer' row. */
 "TransactionDetailsScene.Row.Explorer" = "Открыть в Explorer";
 
+/* Transaction send: recipient minimum remaining balance requirement */
+"TransactionSend.Minimum.Balance" = "На кошельке получателя должно быть больше 0.05 LSK — Отправьте больше токенов";
+
 /* Transaction details: fee row. */
 "TransactionDetailsScene.Row.Fee" = "Комиссия";
 

Adamant/Assets/l18n/en.lproj/Localizable.strings

@@ -35,4 +35,8 @@ extension BaseTransaction: TransactionDetails {
             return 0
         }
     }
+    
+    var blockHeight: UInt64? {
+        return nil
+    }
 }

Adamant/Assets/l18n/ru.lproj/Localizable.strings

@@ -12,6 +12,7 @@ import UIKit
 struct AdamantAddress {
     let address: String
     let name: String?
+    let amount: String?
 }
 
 extension String {
@@ -26,8 +27,9 @@ extension String {
         }
 
         let name = queryItems.filter({$0.name == "label"}).first?.value
-
-        return AdamantAddress(address: address, name: name)
+        let amount = queryItems.filter({$0.name == "amount"}).first?.value
+        
+        return AdamantAddress(address: address, name: name, amount: amount)
     }
 
     func getLegacyAdamantAddress() -> AdamantAddress? {
@@ -65,7 +67,7 @@ extension String {
         }
 
         if let address = address {
-            return AdamantAddress(address: address, name: name)
+            return AdamantAddress(address: address, name: name, amount: "")
         } else {
             return nil
         }

Adamant/CoreData/BaseTransaction+TransactionDetails.swift

@@ -20,6 +20,8 @@
 	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>ITSAppUsesNonExemptEncryption</key>
+	<false/>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>

Adamant/Helpers/String+adamant.swift

@@ -25,6 +25,8 @@ class BaseBtcTransaction: TransactionDetails {
     let isOutgoing: Bool
     let transactionStatus: TransactionStatus?
 
+    var blockHeight: UInt64?
+    
     required init(txId: String, dateValue: Date?, blockValue: String?, senderAddress: String, recipientAddress: String, amountValue: Decimal, feeValue: Decimal?, confirmationsValue: String?, isOutgoing: Bool, transactionStatus: TransactionStatus?) {
         self.txId = txId
         self.dateValue = dateValue
@@ -36,5 +38,6 @@ class BaseBtcTransaction: TransactionDetails {
         self.confirmationsValue = confirmationsValue
         self.isOutgoing = isOutgoing
         self.transactionStatus = transactionStatus
+        self.blockHeight = nil
     }
 }

Adamant/Info.plist

@@ -155,6 +155,10 @@ extension EthTransaction: TransactionDetails {
     var transactionStatus: TransactionStatus? {
         return receiptStatus.asTransactionStatus()
     }
+    
+    var blockHeight: UInt64? {
+        return nil
+    }
 }
 
 // MARK: - From EthereumTransaction

Adamant/Models/BaseBtcTransaction.swift

@@ -30,4 +30,8 @@ struct SimpleTransactionDetails: TransactionDetails {
     var isOutgoing: Bool
 
     var transactionStatus: TransactionStatus?
+    
+    var blockHeight: UInt64? {
+        return nil
+    }
 }

Adamant/Models/EthTransaction.swift

@@ -115,8 +115,11 @@ class AdamantAccountService: AccountService {
         let erc20WalletServices = ERC20Token.supportedTokens.map { ERC20WalletService(token: $0) }
         wallets.append(contentsOf: erc20WalletServices)
 
+        
+        //LskWalletService(mainnet: false)
         // Testnet
-//        wallets.append(contentsOf: LskWalletService(mainnet: false))
+       // wallets.append(contentsOf: LskWalletService(mainnet: false))
+        
         return wallets
     }()
 

Adamant/Models/SimpleTransactionDetails.swift

@@ -22,6 +22,7 @@ class AdamantDialogService: DialogService {
     // Configure notifications
     init() {
         FTIndicator.setIndicatorStyle(.extraLight)
+        
         FTNotificationIndicator.setDefaultDismissTime(4)
     }
 }

Adamant/Services/AdamantAccountService.swift

@@ -215,6 +215,11 @@ class AdmTransferViewController: TransferViewControllerBase {
             }
 
             self?.validateForm()
+        }.onCellSelection { [weak self] (cell, row) in
+            if let recipient = self?.recipientAddress {
+                let text = recipient
+                self?.shareValue(text, from: cell)
+            }
         }
 
         return row
@@ -247,10 +252,29 @@ class AdmTransferViewController: TransferViewControllerBase {
             row.updateCell()
         }
 
+        if let row: TextRow = form.rowBy(tag: BaseRows.amount.tag) {
+            row.value = admAddress.amount
+            row.updateCell()
+        }
+        
         return true
     }
 
     override func defaultSceneTitle() -> String? {
         return String.adamantLocalized.wallets.sendAdm
     }
+    
+    // MARK: - Tools
+    
+    func shareValue(_ value: String, from: UIView) {
+        dialogService.presentShareAlertFor(string: value, types: [.copyToPasteboard, .share], excludedActivityTypes: nil, animated: true, from: from) { [weak self] in
+            guard let tableView = self?.tableView else {
+                return
+            }
+            
+            if let indexPath = tableView.indexPathForSelectedRow {
+                tableView.deselectRow(at: indexPath, animated: true)
+            }
+        }
+    }
 }

Adamant/Services/AdamantDialogService.swift

@@ -12,6 +12,7 @@ class AdmWallet: WalletAccount {
     let address: String
     var balance: Decimal = 0
     var notifications: Int = 0
+    var minBalance: Decimal = 0
 
     init(address: String) {
         self.address = address

Adamant/Wallets/Adamant/AdmTransferViewController.swift

@@ -201,6 +201,11 @@ class DashTransferViewController: TransferViewControllerBase {
                 }
 
                 self?.validateForm()
+        }.onCellSelection { [weak self] (cell, row) in
+            if let recipient = self?.recipientAddress {
+                let text = recipient
+                self?.shareValue(text, from: cell)
+            }
         }
 
         return row
@@ -248,4 +253,18 @@ class DashTransferViewController: TransferViewControllerBase {
     override func defaultSceneTitle() -> String? {
         return String.adamantLocalized.sendDash
     }
+    
+    // MARK: - Tools
+    
+    func shareValue(_ value: String, from: UIView) {
+        dialogService.presentShareAlertFor(string: value, types: [.copyToPasteboard, .share], excludedActivityTypes: nil, animated: true, from: from) { [weak self] in
+            guard let tableView = self?.tableView else {
+                return
+            }
+            
+            if let indexPath = tableView.indexPathForSelectedRow {
+                tableView.deselectRow(at: indexPath, animated: true)
+            }
+        }
+    }
 }

Adamant/Wallets/Adamant/AdmWallet.swift

@@ -19,6 +19,7 @@ class DashWallet: WalletAccount {
     }()
     var balance: Decimal = 0.0
     var notifications: Int = 0
+    var minBalance: Decimal = 0
 
     init(privateKey: PrivateKey) {
         self.privateKey = privateKey

Adamant/Wallets/Dash/DashTransferViewController.swift

@@ -258,7 +258,6 @@ extension DashWalletService: InitiatedWithPassphraseService {
                     service.initialBalanceCheck = true
                     service.setState(.upToDate, silent: true)
                     service.update()
-                    
                     completion(.success(result: eWallet))
 
                 case .failure(let error):

Adamant/Wallets/Dash/DashWallet.swift

@@ -187,6 +187,11 @@ class DogeTransferViewController: TransferViewControllerBase {
             }
 
             self?.validateForm()
+        }.onCellSelection { [weak self] (cell, row) in
+            if let recipient = self?.recipientAddress {
+                let text = recipient
+                self?.shareValue(text, from: cell)
+            }
         }
 
         return row
@@ -234,4 +239,18 @@ class DogeTransferViewController: TransferViewControllerBase {
     override func defaultSceneTitle() -> String? {
         return String.adamantLocalized.sendDoge
     }
+    
+    // MARK: - Tools
+    
+    func shareValue(_ value: String, from: UIView) {
+        dialogService.presentShareAlertFor(string: value, types: [.copyToPasteboard, .share], excludedActivityTypes: nil, animated: true, from: from) { [weak self] in
+            guard let tableView = self?.tableView else {
+                return
+            }
+            
+            if let indexPath = tableView.indexPathForSelectedRow {
+                tableView.deselectRow(at: indexPath, animated: true)
+            }
+        }
+    }
 }