Merge pull request #741 from Adamant-im/trello.com/c/Aw0Vfnmd

Lainaaa · web-flow · commit db7551d557ab · 2025-04-03T18:32:55.000+07:00
[trello.com/c/Aw0Vfnmd] {Secret wallets} UI: Show Transactions 🔐 1️⃣
diff --git a/Adamant/Adamant.xcdatamodeld/Adamant.xcdatamodel/contents b/Adamant/Adamant.xcdatamodeld/Adamant.xcdatamodel/contents
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23605" systemVersion="24D81" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23605" systemVersion="24D70" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="BaseAccount" representedClassName="BaseAccount" isAbstract="YES" syncable="YES">
         <attribute name="address" attributeType="String"/>
         <attribute name="avatar" optional="YES" attributeType="String"/>
@@ -53,6 +53,7 @@
         <attribute name="timestampMs" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="transactionId" attributeType="String" defaultValueString=""/>
         <attribute name="transactionStatusRaw" attributeType="String" defaultValueString=""/>
+        <attribute name="uniqueId" optional="YES" attributeType="String"/>
         <uniquenessConstraints>
             <uniquenessConstraint>
                 <constraint value="transactionId"/>
diff --git a/Adamant/Models/CoreData/CoinTransaction+CoreDataProperties.swift b/Adamant/Models/CoreData/CoinTransaction+CoreDataProperties.swift
@@ -19,6 +19,7 @@ extension CoinTransaction {
     @NSManaged public var amount: NSDecimalNumber?
     @NSManaged public var transactionId: String
     @NSManaged public var coinId: String?
+    @NSManaged public var uniqueId: String?
     @NSManaged public var senderId: String?
     @NSManaged public var recipientId: String?
     @NSManaged public var date: NSDate?
diff --git a/Adamant/Modules/Wallets/Adamant/AdmTransactionsViewController.swift b/Adamant/Modules/Wallets/Adamant/AdmTransactionsViewController.swift
@@ -42,7 +42,8 @@ final class AdmTransactionsViewController: TransactionsListViewControllerBase {
         screensFactory: ScreensFactory,
         addressBookService: AddressBookService,
         walletService: WalletService,
-        reachabilityMonitor: ReachabilityMonitor
+        reachabilityMonitor: ReachabilityMonitor,
+        secretWalletsViewModel: SecretWalletsViewModel
     ) {
         self.accountService = accountService
         self.transfersProvider = transfersProvider
@@ -54,7 +55,8 @@ final class AdmTransactionsViewController: TransactionsListViewControllerBase {
             walletService: walletService,
             dialogService: dialogService,
             reachabilityMonitor: reachabilityMonitor,
-            screensFactory: screensFactory
+            screensFactory: screensFactory,
+            secretWalletsViewModel: secretWalletsViewModel
         )
     }
     
diff --git a/Adamant/Modules/Wallets/Adamant/AdmWalletFactory.swift b/Adamant/Modules/Wallets/Adamant/AdmWalletFactory.swift
@@ -38,7 +38,8 @@ struct AdmWalletFactory: WalletFactory {
             screensFactory: screensFactory,
             addressBookService: assembler.resolve(AddressBookService.self)!,
             walletService: service,
-            reachabilityMonitor: assembler.resolve(ReachabilityMonitor.self)!
+            reachabilityMonitor: assembler.resolve(ReachabilityMonitor.self)!,
+            secretWalletsViewModel: assembler.resolve(SecretWalletsViewModel.self)!
         )
     }
     
diff --git a/Adamant/Modules/Wallets/Adamant/AdmWalletService.swift b/Adamant/Modules/Wallets/Adamant/AdmWalletService.swift
@@ -117,6 +117,7 @@ final class AdmWalletService: NSObject, WalletCoreProtocol, WalletStaticCoreProt
     
     private(set) lazy var coinStorage: CoinStorageService = AdamantCoinStorageService(
         coinId: tokenUniqueID,
+        coinAddress: wallet?.address ?? "",
         coreDataStack: coreDataStack,
         blockchainType: richMessageType
     )
diff --git a/Adamant/Modules/Wallets/Bitcoin/BtcTransactionsViewController.swift b/Adamant/Modules/Wallets/Bitcoin/BtcTransactionsViewController.swift
@@ -23,15 +23,17 @@ final class BtcTransactionsViewController: TransactionsListViewControllerBase {
         dialogService: DialogService,
         reachabilityMonitor: ReachabilityMonitor,
         screensFactory: ScreensFactory,
-        addressBook: AddressBookService
+        addressBook: AddressBookService,
+        secretWalletsViewModel: SecretWalletsViewModel
     ) {
         self.addressBook = addressBook
         
         super.init(
             walletService: walletService,
             dialogService: dialogService,
             reachabilityMonitor: reachabilityMonitor,
-            screensFactory: screensFactory
+            screensFactory: screensFactory,
+            secretWalletsViewModel: secretWalletsViewModel
         )
     }
     
diff --git a/Adamant/Modules/Wallets/Bitcoin/BtcWalletFactory.swift b/Adamant/Modules/Wallets/Bitcoin/BtcWalletFactory.swift
@@ -34,7 +34,8 @@ struct BtcWalletFactory: WalletFactory {
             dialogService: assembler.resolve(DialogService.self)!,
             reachabilityMonitor: assembler.resolve(ReachabilityMonitor.self)!,
             screensFactory: screensFactory,
-            addressBook: assembler.resolve(AddressBookService.self)!
+            addressBook: assembler.resolve(AddressBookService.self)!,
+            secretWalletsViewModel: assembler.resolve(SecretWalletsViewModel.self)!
         )
     }
     
diff --git a/Adamant/Modules/Wallets/Bitcoin/BtcWalletService.swift b/Adamant/Modules/Wallets/Bitcoin/BtcWalletService.swift
@@ -202,6 +202,7 @@ final class BtcWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, @unc
     
     private(set) lazy var coinStorage: CoinStorageService = AdamantCoinStorageService(
         coinId: tokenUniqueID,
+        coinAddress: wallet?.address ?? "",
         coreDataStack: coreDataStack,
         blockchainType: richMessageType
     )
@@ -487,7 +488,8 @@ extension BtcWalletService {
         self.setState(.upToDate)
         
         Task {
-            self.update()
+            await self.update()
+            self.addTransactionObserver()
         }
         
         guard storeInKVS else { return eWallet }
@@ -547,8 +549,6 @@ extension BtcWalletService: SwinjectDependentService {
         btcTransactionFactory = container.resolve(BitcoinKitTransactionFactoryProtocol.self)
         vibroService = container.resolve(VibroService.self)
         coreDataStack = container.resolve(CoreDataStack.self)
-        
-        addTransactionObserver()
     }
 }
 
diff --git a/Adamant/Modules/Wallets/Dash/DashWalletFactory.swift b/Adamant/Modules/Wallets/Dash/DashWalletFactory.swift
@@ -33,7 +33,8 @@ struct DashWalletFactory: WalletFactory {
             walletService: service,
             dialogService: assembler.resolve(DialogService.self)!,
             reachabilityMonitor: assembler.resolve(ReachabilityMonitor.self)!,
-            screensFactory: screensFactory
+            screensFactory: screensFactory,
+            secretWalletsViewModel: assembler.resolve(SecretWalletsViewModel.self)!
         )
     }
     
diff --git a/Adamant/Modules/Wallets/Dash/DashWalletService.swift b/Adamant/Modules/Wallets/Dash/DashWalletService.swift
@@ -149,6 +149,7 @@ final class DashWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, @un
     
     private(set) lazy var coinStorage: CoinStorageService = AdamantCoinStorageService(
         coinId: tokenUniqueID,
+        coinAddress: wallet?.address ?? "",
         coreDataStack: coreDataStack,
         blockchainType: richMessageType
     )
@@ -345,7 +346,8 @@ extension DashWalletService {
         self.setState(.upToDate)
         
         Task {
-            self.update()
+            await self.update()
+            self.addTransactionObserver()
         }
         
         guard storeInKVS else { return eWallet }
@@ -406,8 +408,6 @@ extension DashWalletService: SwinjectDependentService {
         dashApiService = container.resolve(DashApiService.self)
         vibroService = container.resolve(VibroService.self)
         coreDataStack = container.resolve(CoreDataStack.self)
-        
-        addTransactionObserver()
     }
 }
 
diff --git a/Adamant/Modules/Wallets/Doge/DogeWalletFactory.swift b/Adamant/Modules/Wallets/Doge/DogeWalletFactory.swift
@@ -33,7 +33,8 @@ struct DogeWalletFactory: WalletFactory {
             walletService: service,
             dialogService: assembler.resolve(DialogService.self)!,
             reachabilityMonitor: assembler.resolve(ReachabilityMonitor.self)!,
-            screensFactory: screensFactory
+            screensFactory: screensFactory,
+            secretWalletsViewModel: assembler.resolve(SecretWalletsViewModel.self)!
         )
     }
     
diff --git a/Adamant/Modules/Wallets/Doge/DogeWalletService.swift b/Adamant/Modules/Wallets/Doge/DogeWalletService.swift
@@ -170,6 +170,7 @@ final class DogeWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, @un
     
     private(set) lazy var coinStorage: CoinStorageService = AdamantCoinStorageService(
         coinId: tokenUniqueID,
+        coinAddress: wallet?.address ?? "",
         coreDataStack: coreDataStack,
         blockchainType: richMessageType
     )
@@ -363,6 +364,7 @@ extension DogeWalletService {
         
         Task {
             await self.update()
+            self.addTransactionObserver()
         }
         
         guard storeInKVS else { return eWallet }
@@ -421,8 +423,6 @@ extension DogeWalletService: SwinjectDependentService {
         vibroService = container.resolve(VibroService.self)
         coreDataStack = container.resolve(CoreDataStack.self)
         chatsProvider = container.resolve(ChatsProvider.self)
-        
-        addTransactionObserver()
     }
 }
 
diff --git a/Adamant/Modules/Wallets/ERC20/ERC20WalletFactory.swift b/Adamant/Modules/Wallets/ERC20/ERC20WalletFactory.swift
@@ -33,7 +33,8 @@ struct ERC20WalletFactory: WalletFactory {
             walletService: service,
             dialogService: assembler.resolve(DialogService.self)!,
             reachabilityMonitor: assembler.resolve(ReachabilityMonitor.self)!,
-            screensFactory: screensFactory
+            screensFactory: screensFactory,
+            secretWalletsViewModel: assembler.resolve(SecretWalletsViewModel.self)!
         )
     }
     
diff --git a/Adamant/Modules/Wallets/ERC20/ERC20WalletService.swift b/Adamant/Modules/Wallets/ERC20/ERC20WalletService.swift
@@ -187,6 +187,7 @@ final class ERC20WalletService: WalletCoreProtocol, @unchecked Sendable {
     
     private(set) lazy var coinStorage: CoinStorageService = AdamantCoinStorageService(
         coinId: tokenUniqueID,
+        coinAddress: wallet?.address ?? "",
         coreDataStack: coreDataStack,
         blockchainType: dynamicRichMessageType
     )
@@ -410,7 +411,8 @@ extension ERC20WalletService {
         
         self.setState(.upToDate, silent: true)
         Task {
-            await update()
+            await self.update()
+            self.addTransactionObserver()
         }
         return eWallet
     }
@@ -433,8 +435,6 @@ extension ERC20WalletService: SwinjectDependentService {
         vibroService = container.resolve(VibroService.self)
         coreDataStack = container.resolve(CoreDataStack.self)
         ethBIP32Service = container.resolve(EthBIP32ServiceProtocol.self)
-        
-        addTransactionObserver()
     }
 }
 
diff --git a/Adamant/Modules/Wallets/Ethereum/EthWalletFactory.swift b/Adamant/Modules/Wallets/Ethereum/EthWalletFactory.swift
@@ -33,7 +33,8 @@ struct EthWalletFactory: WalletFactory {
             walletService: service,
             dialogService: assembler.resolve(DialogService.self)!,
             reachabilityMonitor: assembler.resolve(ReachabilityMonitor.self)!,
-            screensFactory: screensFactory
+            screensFactory: screensFactory,
+            secretWalletsViewModel: assembler.resolve(SecretWalletsViewModel.self)!
         )
     }
     
diff --git a/Adamant/Modules/Wallets/Ethereum/EthWalletService.swift b/Adamant/Modules/Wallets/Ethereum/EthWalletService.swift
@@ -191,6 +191,7 @@ final class EthWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, @unc
     
     private(set) lazy var coinStorage: CoinStorageService = AdamantCoinStorageService(
         coinId: tokenUniqueID,
+        coinAddress: wallet?.address ?? "",
         coreDataStack: coreDataStack,
         blockchainType: richMessageType
     )
@@ -448,6 +449,7 @@ extension EthWalletService {
         
         Task {
             await self.update()
+            self.addTransactionObserver()
         }
         
         guard storeInKVS else { return eWallet }
@@ -536,8 +538,6 @@ extension EthWalletService: SwinjectDependentService {
         vibroService = container.resolve(VibroService.self)
         coreDataStack = container.resolve(CoreDataStack.self)
         ethBIP32Service = container.resolve(EthBIP32ServiceProtocol.self)
-        
-        addTransactionObserver()
     }
 }
 
diff --git a/Adamant/Modules/Wallets/Klayr/KlyWalletFactory.swift b/Adamant/Modules/Wallets/Klayr/KlyWalletFactory.swift
@@ -34,7 +34,8 @@ struct KlyWalletFactory: WalletFactory {
             walletService: service,
             dialogService: assembler.resolve(DialogService.self)!,
             reachabilityMonitor: assembler.resolve(ReachabilityMonitor.self)!,
-            screensFactory: screensFactory
+            screensFactory: screensFactory,
+            secretWalletsViewModel: assembler.resolve(SecretWalletsViewModel.self)!
         )
     }
     
diff --git a/Adamant/Modules/Wallets/Klayr/WalletService/KlyWalletService.swift b/Adamant/Modules/Wallets/Klayr/WalletService/KlyWalletService.swift
@@ -80,6 +80,7 @@ final class KlyWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, @unc
     
     private(set) lazy var coinStorage: CoinStorageService = AdamantCoinStorageService(
         coinId: tokenUniqueID,
+        coinAddress: wallet?.address ?? "",
         coreDataStack: coreDataStack,
         blockchainType: richMessageType
     )
@@ -201,8 +202,6 @@ extension KlyWalletService: SwinjectDependentService {
         klyNodeApiService = container.resolve(KlyNodeApiService.self)
         vibroService = container.resolve(VibroService.self)
         coreDataStack = container.resolve(CoreDataStack.self)
-        
-        addTransactionObserver()
     }
     
     func addTransactionObserver() {
@@ -478,7 +477,8 @@ private extension KlyWalletService {
         setState(.upToDate)
         
         Task {
-            await update()
+            await self.update()
+            self.addTransactionObserver()
         }
         
         guard storeInKVS else { return eWallet }
diff --git a/Adamant/Modules/Wallets/TransactionsListViewControllerBase.swift b/Adamant/Modules/Wallets/TransactionsListViewControllerBase.swift
@@ -55,6 +55,7 @@ class TransactionsListViewControllerBase: UIViewController {
     let dialogService: DialogService
     let reachabilityMonitor: ReachabilityMonitor
     let screensFactory: ScreensFactory
+    let secretWalletsViewModel: SecretWalletsViewModel
     
     // MARK: - Proprieties
     
@@ -94,12 +95,14 @@ class TransactionsListViewControllerBase: UIViewController {
         walletService: WalletService,
         dialogService: DialogService,
         reachabilityMonitor: ReachabilityMonitor,
-        screensFactory: ScreensFactory
+        screensFactory: ScreensFactory,
+        secretWalletsViewModel: SecretWalletsViewModel
     ) {
         self.walletService = walletService
         self.dialogService = dialogService
         self.reachabilityMonitor = reachabilityMonitor
         self.screensFactory = screensFactory
+        self.secretWalletsViewModel = secretWalletsViewModel
         
         super.init(nibName: String(describing: TransactionsListViewControllerBase.self), bundle: nil)
     }
@@ -114,7 +117,7 @@ class TransactionsListViewControllerBase: UIViewController {
         super.viewDidLoad()
 
         navigationItem.largeTitleDisplayMode = .never
-        navigationItem.title = String.adamant.transactionList.title
+        navigationItem.title = String.adamant.transactionList.title + (secretWalletsViewModel.state.currentWallet?.name ?? "")
         emptyLabel.text = String.adamant.transactionList.noTransactionYet
         
         update(walletService.core.getLocalTransactionHistory())
diff --git a/Adamant/Services/AdamantCoinStorageService.swift b/Adamant/Services/AdamantCoinStorageService.swift

Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,8 @@ struct AdmWalletFactory: WalletFactory {`
`38`	`38`	`screensFactory: screensFactory,`
`39`	`39`	`addressBookService: assembler.resolve(AddressBookService.self)!,`
`40`	`40`	`walletService: service,`
`41`		`- reachabilityMonitor: assembler.resolve(ReachabilityMonitor.self)!`
	`41`	`+ reachabilityMonitor: assembler.resolve(ReachabilityMonitor.self)!,`
	`42`	`+ secretWalletsViewModel: assembler.resolve(SecretWalletsViewModel.self)!`
`42`	`43`	`)`
`43`	`44`	`}`
`44`	`45`
Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,7 @@ final class AdmWalletService: NSObject, WalletCoreProtocol, WalletStaticCoreProt`
`117`	`117`
`118`	`118`	`private(set) lazy var coinStorage: CoinStorageService = AdamantCoinStorageService(`
`119`	`119`	`coinId: tokenUniqueID,`
	`120`	`+ coinAddress: wallet?.address ?? "",`
`120`	`121`	`coreDataStack: coreDataStack,`
`121`	`122`	`blockchainType: richMessageType`
`122`	`123`	`)`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,8 @@ struct BtcWalletFactory: WalletFactory {`
`34`	`34`	`dialogService: assembler.resolve(DialogService.self)!,`
`35`	`35`	`reachabilityMonitor: assembler.resolve(ReachabilityMonitor.self)!,`
`36`	`36`	`screensFactory: screensFactory,`
`37`		`- addressBook: assembler.resolve(AddressBookService.self)!`
	`37`	`+ addressBook: assembler.resolve(AddressBookService.self)!,`
	`38`	`+ secretWalletsViewModel: assembler.resolve(SecretWalletsViewModel.self)!`
`38`	`39`	`)`
`39`	`40`	`}`
`40`	`41`
Original file line number	Diff line number	Diff line change
`@@ -202,6 +202,7 @@ final class BtcWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, @unc`
`202`	`202`
`203`	`203`	`private(set) lazy var coinStorage: CoinStorageService = AdamantCoinStorageService(`
`204`	`204`	`coinId: tokenUniqueID,`
	`205`	`+ coinAddress: wallet?.address ?? "",`
`205`	`206`	`coreDataStack: coreDataStack,`
`206`	`207`	`blockchainType: richMessageType`
`207`	`208`	`)`
`@@ -487,7 +488,8 @@ extension BtcWalletService {`
`487`	`488`	`self.setState(.upToDate)`
`488`	`489`
`489`	`490`	`Task {`
`490`		`- self.update()`
	`491`	`+ await self.update()`
	`492`	`+ self.addTransactionObserver()`
`491`	`493`	`}`
`492`	`494`
`493`	`495`	`guard storeInKVS else { return eWallet }`
`@@ -547,8 +549,6 @@ extension BtcWalletService: SwinjectDependentService {`
`547`	`549`	`btcTransactionFactory = container.resolve(BitcoinKitTransactionFactoryProtocol.self)`
`548`	`550`	`vibroService = container.resolve(VibroService.self)`
`549`	`551`	`coreDataStack = container.resolve(CoreDataStack.self)`
`550`		`-`
`551`		`- addTransactionObserver()`
`552`	`552`	`}`
`553`	`553`	`}`
`554`	`554`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,8 @@ struct DashWalletFactory: WalletFactory {`
`33`	`33`	`walletService: service,`
`34`	`34`	`dialogService: assembler.resolve(DialogService.self)!,`
`35`	`35`	`reachabilityMonitor: assembler.resolve(ReachabilityMonitor.self)!,`
`36`		`- screensFactory: screensFactory`
	`36`	`+ screensFactory: screensFactory,`
	`37`	`+ secretWalletsViewModel: assembler.resolve(SecretWalletsViewModel.self)!`
`37`	`38`	`)`
`38`	`39`	`}`
`39`	`40`
Original file line number	Diff line number	Diff line change
`@@ -149,6 +149,7 @@ final class DashWalletService: WalletCoreProtocol, WalletStaticCoreProtocol, @un`
`149`	`149`
`150`	`150`	`private(set) lazy var coinStorage: CoinStorageService = AdamantCoinStorageService(`
`151`	`151`	`coinId: tokenUniqueID,`
	`152`	`+ coinAddress: wallet?.address ?? "",`
`152`	`153`	`coreDataStack: coreDataStack,`
`153`	`154`	`blockchainType: richMessageType`
`154`	`155`	`)`
`@@ -345,7 +346,8 @@ extension DashWalletService {`
`345`	`346`	`self.setState(.upToDate)`
`346`	`347`
`347`	`348`	`Task {`
`348`		`- self.update()`
	`349`	`+ await self.update()`
	`350`	`+ self.addTransactionObserver()`
`349`	`351`	`}`
`350`	`352`
`351`	`353`	`guard storeInKVS else { return eWallet }`
`@@ -406,8 +408,6 @@ extension DashWalletService: SwinjectDependentService {`
`406`	`408`	`dashApiService = container.resolve(DashApiService.self)`
`407`	`409`	`vibroService = container.resolve(VibroService.self)`
`408`	`410`	`coreDataStack = container.resolve(CoreDataStack.self)`
`409`		`-`
`410`		`- addTransactionObserver()`
`411`	`411`	`}`
`412`	`412`	`}`
`413`	`413`