Skip to content

Commit 2346aac

Browse files
boyarkin-antonboyarkin-anton
committed
Merge branch 'release/1.8.0'
2 parents a0f9f77 + 3940056 commit 2346aac

File tree

64 files changed

+2762
-317
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+2762
-317
lines changed

‎Adamant.xcodeproj/project.pbxproj

Lines changed: 76 additions & 8 deletions
Large diffs are not rendered by default.

‎Adamant/AppDelegate.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,9 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
6868
if !firstRun {
6969
UserDefaults.standard.set(true, forKey: StoreKey.application.firstRun)
7070

71-
/* For future updates
7271
if let securedStore = container.resolve(SecuredStore.self) {
7372
securedStore.purgeStore()
7473
}
75-
*/
7674
}
7775

7876
// MARK: 2. Init UI

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

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "wallet_dash.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"filename" : "wallet_dash@2x.png",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"filename" : "wallet_dash@3x.png",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
}
23+
}

‎Adamant/Assets/Assets.xcassets/Wallets/wallet_dash.imageset/wallet_dash.png

917 Bytes
Loading

‎Adamant/Assets/Assets.xcassets/Wallets/wallet_dash.imageset/wallet_dash@2x.png

1.85 KB
Loading

‎Adamant/Assets/Assets.xcassets/Wallets/wallet_dash.imageset/wallet_dash@3x.png

2.94 KB
Loading

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"images" : [
3+
{
4+
"idiom" : "universal",
5+
"filename" : "wallet_dash_row.png",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"filename" : "wallet_dash_row@2x.png",
11+
"scale" : "2x"
12+
},
13+
{
14+
"idiom" : "universal",
15+
"filename" : "wallet_dash_row@3x.png",
16+
"scale" : "3x"
17+
}
18+
],
19+
"info" : {
20+
"version" : 1,
21+
"author" : "xcode"
22+
},
23+
"properties" : {
24+
"template-rendering-intent" : "template"
25+
}
26+
}

‎Adamant/Assets/Assets.xcassets/Wallets/wallet_dash_row.imageset/wallet_dash_row.png

427 Bytes
Loading

‎Adamant/Assets/Assets.xcassets/Wallets/wallet_dash_row.imageset/wallet_dash_row@2x.png

732 Bytes
Loading

‎Adamant/Assets/Assets.xcassets/Wallets/wallet_dash_row.imageset/wallet_dash_row@3x.png

1.05 KB
Loading

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,9 @@
136136
/* Account tab: 'Send DOGE tokens' button */
137137
"AccountTab.Row.SendDoge" = "DOGE senden";
138138

139+
/* Account tab: 'Send DASH tokens' button */
140+
"AccountTab.Row.SendDash" = "DASH senden";
141+
139142
/* Account tab: Anonymously buy ADM tokens */
140143
"AccountTab.Row.AnonymouslyBuyADM" = "Kaufen Sie ADM anonym";
141144

@@ -181,6 +184,9 @@
181184
/* Account tab: Doge wallet */
182185
"AccountTab.Wallets.doge_wallet" = "Doge Wallet";
183186

187+
/* Account tab: Dash wallet */
188+
"AccountTab.Wallets.dash_wallet" = "Dash Wallet";
189+
184190
/* Account page: scene title */
185191
"AccountTab.Title" = "Konto";
186192

@@ -724,6 +730,9 @@
724730
/* Transfer: Amount is zero, or even negative notification */
725731
"TransferScene.Error.TooLittleMoney" = "Sie müssen mehr Tokens senden";
726732

733+
/* Transfer: Minimal transaction amount is 0.00001 */
734+
"TransferScene.Error.MinAmount" = "Der Mindesttransaktionsbetrag beträgt 0,00001";
735+
727736
/* Transfer: Alert title: Account not found or not initiated. Alert user that he still can send money, but need to double ckeck address */
728737
"TransferScene.unsafeTransferAlert.title" = "Adresse %@ konnte nicht überprüft werden";
729738

@@ -801,6 +810,13 @@
801810

802811
/* Wallet Services: Shared error, transaction not found */
803812
"WalletServices.SharedErrors.TransactionNotFound" = "Transaktion nicht gefunden";
813+
814+
/* Wallet Services: Wait until other transactions approved */
815+
"WalletServices.SharedErrors.walletFrezzed" = "Warten Sie, bis andere Transaktionen genehmigt wurden";
816+
817+
/* Wallet Services: Transaction unavailable */
818+
"WalletServices.SharedErrors.transactionUnavailable" = "Transaktion nicht verfügbar";
819+
804820
/* Welcome: Skip button */
805821
"WelcomeScene.Skip" = "überspringen";
806822

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,9 @@
136136
/* Account tab: 'Send DOGE tokens' button */
137137
"AccountTab.Row.SendDoge" = "Send DOGE";
138138

139+
/* Account tab: 'Send DASH tokens' button */
140+
"AccountTab.Row.SendDash" = "Send DASH";
141+
139142
/* Account tab: Anonymously buy ADM tokens */
140143
"AccountTab.Row.AnonymouslyBuyADM" = "Buy ADM anonymously";
141144

@@ -178,6 +181,9 @@
178181
/* Account tab: Doge wallet */
179182
"AccountTab.Wallets.doge_wallet" = "Doge Wallet";
180183

184+
/* Account tab: Dash wallet */
185+
"AccountTab.Wallets.dash_wallet" = "Dash Wallet";
186+
181187
/* Account page: scene title */
182188
"AccountTab.Title" = "Account";
183189

@@ -760,6 +766,9 @@
760766
/* TransfersProvider: Transaction not found error. %@ for transaction's ID */
761767
"TransfersProvider.Error.TransactionNotFoundFormat" = "Transaction with ID %@ not found";
762768

769+
/* Transfer: Minimal transaction amount is 0.00001 */
770+
"TransferScene.Error.MinAmount" = "Minimum transaction amount is 0.00001";
771+
763772
/* Transfer: transfer amount placeholder */
764773
"TransferScene.Amount.Placeholder" = "to send";
765774

@@ -853,6 +862,12 @@
853862
/* Wallet Services: Shared error, transaction not found */
854863
"WalletServices.SharedErrors.TransactionNotFound" = "Transaction not found";
855864

865+
/* Wallet Services: Wait until other transactions approved */
866+
"WalletServices.SharedErrors.walletFrezzed" = "Wait until other transactions will be approved";
867+
868+
/* Wallet Services: Transaction unavailable */
869+
"WalletServices.SharedErrors.transactionUnavailable" = "Transaction unavailable";
870+
856871
/* Welcome: Skip button */
857872
"WelcomeScene.Skip" = "skip";
858873

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,9 @@
133133
/* Account tab: 'Send DOGE tokens' button */
134134
"AccountTab.Row.SendDoge" = "Отправить DOGE";
135135

136+
/* Account tab: 'Send DASH tokens' button */
137+
"AccountTab.Row.SendDash" = "Отправить DASH";
138+
136139
/* Account tab: Anonymously buy ADM tokens */
137140
"AccountTab.Row.AnonymouslyBuyADM" = "Купить ADM анонимно";
138141

@@ -178,6 +181,9 @@
178181
/* Account tab: Doge wallet */
179182
"AccountTab.Wallets.doge_wallet" = "Кошелек Doge";
180183

184+
/* Account tab: Dash wallet */
185+
"AccountTab.Wallets.dash_wallet" = "Кошелек Dash";
186+
181187
/* Account tab: Delegates section title */
182188
"AccountTab.Section.Delegates" = "Делегаты";
183189

@@ -775,6 +781,9 @@
775781
/* Transfer: Amount is zero, or even negative notification */
776782
"TransferScene.Error.TooLittleMoney" = "Вам следует отправить больше токенов";
777783

784+
/* Transfer: Minimal transaction amount is 0.00001 */
785+
"TransferScene.Error.MinAmount" = "Минимальная сумма перевода 0.00001";
786+
778787
/* Transfer: Alert title: Account not found or not initiated. Alert user that he still can send money, but need to double ckeck address */
779788
"TransferScene.unsafeTransferAlert.title" = "Не удалось проверить адрес %@";
780789

@@ -853,6 +862,12 @@
853862
/* Wallet Services: Shared error, transaction not found */
854863
"WalletServices.SharedErrors.TransactionNotFound" = "Транзакция не найдена";
855864

865+
/* Wallet Services: Wait until other transactions approved */
866+
"WalletServices.SharedErrors.walletFrezzed" = "Подождите, пока не будут одобрены другие транзакции";
867+
868+
/* Wallet Services: Transaction unavailable */
869+
"WalletServices.SharedErrors.transactionUnavailable" = "Транзакция недоступна";
870+
856871
/* Welcome: Skip button */
857872
"WelcomeScene.Skip" = "пропустить";
858873

‎Adamant/Helpers/String+localized.swift

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ extension String.adamantLocalized {
5555

5656
static let notEnoughMoney = NSLocalizedString("WalletServices.SharedErrors.notEnoughMoney", comment: "Wallet Services: Shared error, user do not have enought money.")
5757

58+
static let transactionUnavailable = NSLocalizedString("WalletServices.SharedErrors.transactionUnavailable", comment: "Wallet Services: Transaction unavailable")
59+
60+
static let walletFrezzed = NSLocalizedString("WalletServices.SharedErrors.walletFrezzed", comment: "Wallet Services: Wait until other transactions approved")
61+
5862
static func internalError(message: String) -> String {
5963
return String.localizedStringWithFormat(NSLocalizedString("Error.InternalErrorFormat", comment: "Shared error: Internal error format, %@ for message"), message)
6064
}

‎Adamant/Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
<key>CFBundlePackageType</key>
1818
<string>APPL</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.7.2</string>
20+
<string>1.8.0</string>
2121
<key>CFBundleVersion</key>
22-
<string>87</string>
22+
<string>92</string>
2323
<key>LSRequiresIPhoneOS</key>
2424
<true/>
2525
<key>NSAppTransportSecurity</key>

0 commit comments

Comments
 (0)