Merge branch 'release/1.8.0'

Adamant/AppDelegate.swift

@@ -68,11 +68,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         if !firstRun {
             UserDefaults.standard.set(true, forKey: StoreKey.application.firstRun)
 
-            /* For future updates
             if let securedStore = container.resolve(SecuredStore.self) {
                 securedStore.purgeStore()
             }
-             */
         }
 
 		// MARK: 2. Init UI

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

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

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

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

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

@@ -136,6 +136,9 @@
 /* Account tab: 'Send DOGE tokens' button */
 "AccountTab.Row.SendDoge" = "DOGE senden";
 
+/* Account tab: 'Send DASH tokens' button */
+"AccountTab.Row.SendDash" = "DASH senden";
+
 /* Account tab: Anonymously buy ADM tokens */
 "AccountTab.Row.AnonymouslyBuyADM" = "Kaufen Sie ADM anonym";
 
@@ -181,6 +184,9 @@
 /* Account tab: Doge wallet */
 "AccountTab.Wallets.doge_wallet" = "Doge Wallet";
 
+/* Account tab: Dash wallet */
+"AccountTab.Wallets.dash_wallet" = "Dash Wallet";
+
 /* Account page: scene title */
 "AccountTab.Title" = "Konto";
 
@@ -724,6 +730,9 @@
 /* Transfer: Amount is zero, or even negative notification */
 "TransferScene.Error.TooLittleMoney" = "Sie müssen mehr Tokens senden";
 
+/* Transfer: Minimal transaction amount is 0.00001 */
+"TransferScene.Error.MinAmount" = "Der Mindesttransaktionsbetrag beträgt 0,00001";
+
 /* Transfer: Alert title: Account not found or not initiated. Alert user that he still can send money, but need to double ckeck address */
 "TransferScene.unsafeTransferAlert.title" = "Adresse %@ konnte nicht überprüft werden";
 
@@ -801,6 +810,13 @@
 
 /* Wallet Services: Shared error, transaction not found */
 "WalletServices.SharedErrors.TransactionNotFound" = "Transaktion nicht gefunden";
+
+/* Wallet Services: Wait until other transactions approved */
+"WalletServices.SharedErrors.walletFrezzed" = "Warten Sie, bis andere Transaktionen genehmigt wurden";
+
+/* Wallet Services: Transaction unavailable */
+"WalletServices.SharedErrors.transactionUnavailable" = "Transaktion nicht verfügbar";
+
 /* Welcome: Skip button */
 "WelcomeScene.Skip" = "überspringen";
 

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

@@ -136,6 +136,9 @@
 /* Account tab: 'Send DOGE tokens' button */
 "AccountTab.Row.SendDoge" = "Send DOGE";
 
+/* Account tab: 'Send DASH tokens' button */
+"AccountTab.Row.SendDash" = "Send DASH";
+
 /* Account tab: Anonymously buy ADM tokens */
 "AccountTab.Row.AnonymouslyBuyADM" = "Buy ADM anonymously";
 
@@ -178,6 +181,9 @@
 /* Account tab: Doge wallet */
 "AccountTab.Wallets.doge_wallet" = "Doge Wallet";
 
+/* Account tab: Dash wallet */
+"AccountTab.Wallets.dash_wallet" = "Dash Wallet";
+
 /* Account page: scene title */
 "AccountTab.Title" = "Account";
 
@@ -760,6 +766,9 @@
 /* TransfersProvider: Transaction not found error. %@ for transaction's ID */
 "TransfersProvider.Error.TransactionNotFoundFormat" = "Transaction with ID %@ not found";
 
+/* Transfer: Minimal transaction amount is 0.00001 */
+"TransferScene.Error.MinAmount" = "Minimum transaction amount is 0.00001";
+
 /* Transfer: transfer amount placeholder */
 "TransferScene.Amount.Placeholder" = "to send";
 
@@ -853,6 +862,12 @@
 /* Wallet Services: Shared error, transaction not found */
 "WalletServices.SharedErrors.TransactionNotFound" = "Transaction not found";
 
+/* Wallet Services: Wait until other transactions approved */
+"WalletServices.SharedErrors.walletFrezzed" = "Wait until other transactions will be approved";
+
+/* Wallet Services: Transaction unavailable */
+"WalletServices.SharedErrors.transactionUnavailable" = "Transaction unavailable";
+
 /* Welcome: Skip button */
 "WelcomeScene.Skip" = "skip";
 

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

@@ -133,6 +133,9 @@
 /* Account tab: 'Send DOGE tokens' button */
 "AccountTab.Row.SendDoge" = "Отправить DOGE";
 
+/* Account tab: 'Send DASH tokens' button */
+"AccountTab.Row.SendDash" = "Отправить DASH";
+
 /* Account tab: Anonymously buy ADM tokens */
 "AccountTab.Row.AnonymouslyBuyADM" = "Купить ADM анонимно";
 
@@ -178,6 +181,9 @@
 /* Account tab: Doge wallet */
 "AccountTab.Wallets.doge_wallet" = "Кошелек Doge";
 
+/* Account tab: Dash wallet */
+"AccountTab.Wallets.dash_wallet" = "Кошелек Dash";
+
 /* Account tab: Delegates section title */
 "AccountTab.Section.Delegates" = "Делегаты";
 
@@ -775,6 +781,9 @@
 /* Transfer: Amount is zero, or even negative notification */
 "TransferScene.Error.TooLittleMoney" = "Вам следует отправить больше токенов";
 
+/* Transfer: Minimal transaction amount is 0.00001 */
+"TransferScene.Error.MinAmount" = "Минимальная сумма перевода 0.00001";
+
 /* Transfer: Alert title: Account not found or not initiated. Alert user that he still can send money, but need to double ckeck address */
 "TransferScene.unsafeTransferAlert.title" = "Не удалось проверить адрес %@";
 
@@ -853,6 +862,12 @@
 /* Wallet Services: Shared error, transaction not found */
 "WalletServices.SharedErrors.TransactionNotFound" = "Транзакция не найдена";
 
+/* Wallet Services: Wait until other transactions approved */
+"WalletServices.SharedErrors.walletFrezzed" = "Подождите, пока не будут одобрены другие транзакции";
+
+/* Wallet Services: Transaction unavailable */
+"WalletServices.SharedErrors.transactionUnavailable" = "Транзакция недоступна";
+
 /* Welcome: Skip button */
 "WelcomeScene.Skip" = "пропустить";
 

Adamant/Helpers/String+localized.swift

@@ -55,6 +55,10 @@ extension String.adamantLocalized {
 
         static let notEnoughMoney = NSLocalizedString("WalletServices.SharedErrors.notEnoughMoney", comment: "Wallet Services: Shared error, user do not have enought money.")
 
+        static let transactionUnavailable = NSLocalizedString("WalletServices.SharedErrors.transactionUnavailable", comment: "Wallet Services: Transaction unavailable")
+
+        static let walletFrezzed = NSLocalizedString("WalletServices.SharedErrors.walletFrezzed", comment: "Wallet Services: Wait until other transactions approved")
+
         static func internalError(message: String) -> String {
             return String.localizedStringWithFormat(NSLocalizedString("Error.InternalErrorFormat", comment: "Shared error: Internal error format, %@ for message"), message)
         }

Adamant/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.7.2</string>
+	<string>1.8.0</string>
 	<key>CFBundleVersion</key>
-	<string>87</string>
+	<string>92</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>