Skip to content

Commit 837055d

Browse files
LainaaaLainaaa
committed
[trello.com/c/vawidi4o] Update labels for secret wallet options in the menu
1 parent 8603e31 commit 837055d

File tree

11 files changed

+34
-38
lines changed

11 files changed

+34
-38
lines changed

‎Adamant.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@
188188
41CE153A297FF98200CC9254 /* Web3Swift+Adamant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41CE1539297FF98200CC9254 /* Web3Swift+Adamant.swift */; };
189189
41E3C9CC2A0E20F500AF0985 /* AdamantCoinTools.swift in Sources */ = {isa = PBXBuildFile; fileRef = 41E3C9CB2A0E20F500AF0985 /* AdamantCoinTools.swift */; };
190190
48023DEF2D72EA7F00852961 /* AccountHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = 48023DEE2D72EA7F00852961 /* AccountHeader.xib */; };
191-
48023DF12D72FB3500852961 /* SecretWalletsAlertService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48023DF02D72FB3500852961 /* SecretWalletsAlertService.swift */; };
191+
48023DF12D72FB3500852961 /* SecretWalletsAlertMenuView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48023DF02D72FB3500852961 /* SecretWalletsAlertMenuView.swift */; };
192192
4803FC9A2D6715AF00452D2C /* SecretWalletsFactory.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4803FC992D6715AF00452D2C /* SecretWalletsFactory.swift */; };
193193
481558702D65A7660011B470 /* SecretWalletsManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4815586F2D65A7660011B470 /* SecretWalletsManager.swift */; };
194194
481558722D65A7BD0011B470 /* SecretWalletsManagerProtocol.swift in Sources */ = {isa = PBXBuildFile; fileRef = 481558712D65A7BD0011B470 /* SecretWalletsManagerProtocol.swift */; };
@@ -923,7 +923,7 @@
923923
41CE1539297FF98200CC9254 /* Web3Swift+Adamant.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Web3Swift+Adamant.swift"; sourceTree = "<group>"; };
924924
41E3C9CB2A0E20F500AF0985 /* AdamantCoinTools.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdamantCoinTools.swift; sourceTree = "<group>"; };
925925
48023DEE2D72EA7F00852961 /* AccountHeader.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = AccountHeader.xib; sourceTree = "<group>"; };
926-
48023DF02D72FB3500852961 /* SecretWalletsAlertService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecretWalletsAlertService.swift; sourceTree = "<group>"; };
926+
48023DF02D72FB3500852961 /* SecretWalletsAlertMenuView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecretWalletsAlertMenuView.swift; sourceTree = "<group>"; };
927927
4803FC992D6715AF00452D2C /* SecretWalletsFactory.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecretWalletsFactory.swift; sourceTree = "<group>"; };
928928
4815586F2D65A7660011B470 /* SecretWalletsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecretWalletsManager.swift; sourceTree = "<group>"; };
929929
481558712D65A7BD0011B470 /* SecretWalletsManagerProtocol.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SecretWalletsManagerProtocol.swift; sourceTree = "<group>"; };
@@ -1807,7 +1807,7 @@
18071807
children = (
18081808
488C1E892D7150F900E955E8 /* SecretWalletsState.swift */,
18091809
482231202D714C3D00D592D8 /* SecretWalletsViewModel.swift */,
1810-
48023DF02D72FB3500852961 /* SecretWalletsAlertService.swift */,
1810+
48023DF02D72FB3500852961 /* SecretWalletsAlertMenuView.swift */,
18111811
);
18121812
path = SecretWallets;
18131813
sourceTree = "<group>";
@@ -3901,7 +3901,7 @@
39013901
AAB01CAD2D3AE44B007D6BF4 /* BitcoinKitTransactionFactory.swift in Sources */,
39023902
648CE3A222999CE70070A2CC /* BTCRawTransaction.swift in Sources */,
39033903
648DD79E2236A0B500B811FD /* DogeTransactionsViewController.swift in Sources */,
3904-
48023DF12D72FB3500852961 /* SecretWalletsAlertService.swift in Sources */,
3904+
48023DF12D72FB3500852961 /* SecretWalletsAlertMenuView.swift in Sources */,
39053905
3A26D9392C3C1C62003AD832 /* KlyWalletFactory.swift in Sources */,
39063906
3A299C6B2B838F2300B54C61 /* ChatMediaContainerView.swift in Sources */,
39073907
64B5736F2209B892005DC968 /* BtcTransactionDetailsViewController.swift in Sources */,

‎Adamant/App/DI/AppAssembly.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -492,8 +492,8 @@ struct AppAssembly: MainThreadAssembly {
492492
}.inObjectScope(.container)
493493

494494
// MARK: SecretWalletsAlertService
495-
container.register(SecretWalletsAlertService.self) { r in
496-
SecretWalletsAlertService(
495+
container.register(SecretWalletsAlertMenuView.self) { r in
496+
SecretWalletsAlertMenuView(
497497
dialogService: r.resolve(DialogService.self)!,
498498
secretWalletsManager: r.resolve(SecretWalletsManagerProtocol.self)!
499499
)

‎Adamant/Modules/Account/AccountFactory.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ struct AccountFactory {
2828
walletServiceCompose: assembler.resolve(WalletServiceCompose.self)!,
2929
apiServiceCompose: assembler.resolve(ApiServiceComposeProtocol.self)!,
3030
secretWalletsManager: assembler.resolve(SecretWalletsManagerProtocol.self)!,
31-
secretWalletsAlertService: assembler.resolve(SecretWalletsAlertService.self)!
31+
secretWalletsAlertService: assembler.resolve(SecretWalletsAlertMenuView.self)!
3232
)
3333
}
3434
}

‎Adamant/Modules/Account/AccountViewController/AccountViewController.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ final class AccountViewController: FormViewController {
4747
private let apiServiceCompose: ApiServiceComposeProtocol
4848
private let secretWalletsManager: SecretWalletsManagerProtocol
4949
private lazy var walletsViewModel: AccountWalletsViewModel = .init(walletsStoreService: walletStoreServiceProvider)
50-
private let secretWalletsAlertService: SecretWalletsAlertService
50+
private let secretWalletsAlertService: SecretWalletsAlertMenuView
5151

5252
let accountService: AccountService
5353
let dialogService: DialogService
@@ -115,7 +115,7 @@ final class AccountViewController: FormViewController {
115115
walletServiceCompose: WalletServiceCompose,
116116
apiServiceCompose: ApiServiceComposeProtocol,
117117
secretWalletsManager: SecretWalletsManagerProtocol,
118-
secretWalletsAlertService: SecretWalletsAlertService
118+
secretWalletsAlertService: SecretWalletsAlertMenuView
119119
) {
120120
self.walletStoreServiceProvider = walletStoreServiceProvider
121121
self.accountService = accountService

‎Adamant/Modules/SecretWallets/SecretWalletsAlertService.swift‎ renamed to ‎Adamant/Modules/SecretWallets/SecretWalletsAlertMenuView.swift‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import UIKit
1010

1111
@MainActor
12-
final class SecretWalletsAlertService {
12+
final class SecretWalletsAlertMenuView {
1313
private let dialogService: DialogService
1414
private let secretWalletsViewModel: SecretWalletsViewModel
1515

@@ -26,12 +26,8 @@ final class SecretWalletsAlertService {
2626
let state = secretWalletsViewModel.state
2727

2828
for (index, wallet) in state.wallets.enumerated() {
29-
let isSelected = (index == state.currentActiveIndex)
30-
var walletName = wallet.name
31-
if isSelected {
32-
walletName.insert("[", at: walletName.index(walletName.startIndex, offsetBy: 0))
33-
walletName.insert("]", at: walletName.index(walletName.startIndex, offsetBy: index == 0 ? 2 : 3))
34-
}
29+
let isSelected = index == state.currentActiveIndex
30+
var walletName = isSelected ? "[ " + wallet.name + " ]" : wallet.name
3531

3632
let action = AdamantAlertAction(
3733
title: walletName,

‎Adamant/Modules/SecretWallets/SecretWalletsState.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import Foundation
1010

11-
extension SecretWalletsAlertService {
11+
extension SecretWalletsAlertMenuView {
1212
struct SecretWalletsState: Equatable {
1313
var wallets: [WalletItem]
1414
var currentActiveIndex: Int

‎Adamant/Modules/SecretWallets/SecretWalletsViewModel.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import Combine
1111

1212
//TODO: Consider logout
1313

14-
extension SecretWalletsAlertService {
14+
extension SecretWalletsAlertMenuView {
1515
@MainActor
1616
final class SecretWalletsViewModel: ObservableObject {
1717
@Published private(set) var state: SecretWalletsState = .default

‎CommonKit/Sources/CommonKit/Assets/Localization/de.lproj/Localizable.strings‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1388,11 +1388,11 @@
13881388

13891389
/* Secret Wallets */
13901390
"SecretWallets.Menu.Regular" = "Normal";
1391-
"SecretWallets.Menu.Secret" = "🔐1️⃣ Geheim";
1392-
"SecretWallets.Menu.Secret" = "🔐2️⃣ Geheim";
1393-
"SecretWallets.Menu.Secret" = "🔐3️⃣ Geheim";
1394-
"SecretWallets.Menu.Secret" = "🔐4️⃣ Geheim";
1395-
"SecretWallets.Menu.Secret" = "🔐5️⃣ Geheim";
1391+
"SecretWallets.Menu.Secret" = "🔐1️⃣ Geheim 1";
1392+
"SecretWallets.Menu.Secret" = "🔐2️⃣ Geheim 2";
1393+
"SecretWallets.Menu.Secret" = "🔐3️⃣ Geheim 3";
1394+
"SecretWallets.Menu.Secret" = "🔐4️⃣ Geheim 4";
1395+
"SecretWallets.Menu.Secret" = "🔐5️⃣ Geheim 5";
13961396
"SecretWallets.Menu.AddSecretWallet" = "Geheimen hinzufügen";
13971397
"SecretWallets.Menu.TellMeMore" = "Über Wallets";
13981398
"SecretWallets.Menu.Title" = "Aktive Wallets";

‎CommonKit/Sources/CommonKit/Assets/Localization/en.lproj/Localizable.strings‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1364,11 +1364,11 @@
13641364

13651365
/* Secret Wallets */
13661366
"SecretWallets.Menu.Regular" = "💰 Regular";
1367-
"SecretWallets.Menu.Secret1" = "🔐1️⃣ Secret";
1368-
"SecretWallets.Menu.Secret2" = "🔐2️⃣ Secret";
1369-
"SecretWallets.Menu.Secret3" = "🔐3️⃣ Secret";
1370-
"SecretWallets.Menu.Secret4" = "🔐4️⃣ Secret";
1371-
"SecretWallets.Menu.Secret5" = "🔐5️⃣ Secret";
1367+
"SecretWallets.Menu.Secret1" = "🔐1️⃣ Secret 1";
1368+
"SecretWallets.Menu.Secret2" = "🔐2️⃣ Secret 2";
1369+
"SecretWallets.Menu.Secret3" = "🔐3️⃣ Secret 3";
1370+
"SecretWallets.Menu.Secret4" = "🔐4️⃣ Secret 4";
1371+
"SecretWallets.Menu.Secret5" = "🔐5️⃣ Secret 5";
13721372
"SecretWallets.Menu.AddSecretWallet" = "🪄 Add secret wallet";
13731373
"SecretWallets.Menu.TellMeMore" = "💡 Tell me more";
13741374
"SecretWallets.Menu.Title" = "Active wallets";

‎CommonKit/Sources/CommonKit/Assets/Localization/ru.lproj/Localizable.strings‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1365,11 +1365,11 @@
13651365

13661366
/* Secret Wallets */
13671367
"SecretWallets.Menu.Regular" = "Обычный";
1368-
"SecretWallets.Menu.Secret" = "🔐1️⃣ Секретный";
1369-
"SecretWallets.Menu.Secret" = "🔐2️⃣ Секретный";
1370-
"SecretWallets.Menu.Secret" = "🔐3️⃣ Секретный";
1371-
"SecretWallets.Menu.Secret" = "🔐4️⃣ Секретный";
1372-
"SecretWallets.Menu.Secret" = "🔐5️⃣ Секретный";
1368+
"SecretWallets.Menu.Secret" = "🔐1️⃣ Секретный 1";
1369+
"SecretWallets.Menu.Secret" = "🔐2️⃣ Секретный 2";
1370+
"SecretWallets.Menu.Secret" = "🔐3️⃣ Секретный 3";
1371+
"SecretWallets.Menu.Secret" = "🔐4️⃣ Секретный 4";
1372+
"SecretWallets.Menu.Secret" = "🔐5️⃣ Секретный 5";
13731373
"SecretWallets.Menu.AddSecretWallet" = "Добавить секретный";
13741374
"SecretWallets.Menu.TellMeMore" = "О кошельках";
13751375
"SecretWallets.Menu.Title" = "Активные кошельки";

0 commit comments

Comments
 (0)