Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add wallet name badge to overview transaction row #776

Merged
merged 4 commits into from
May 28, 2021
Merged

Add wallet name badge to overview transaction row #776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d9ac8fc
Fix row constriant
beansgum May 28, 2021
d015a40
Fix constraint issues with transaction row
beansgum May 28, 2021
de751b7
Add wallet name badge to overview transaction row
beansgum May 28, 2021
9e793f9
overview: declare multiwallet globally
beansgum May 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
50 changes: 26 additions & 24 deletions Decred Wallet/Features/Overview/OverviewViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@ class OverviewViewController: UIViewController {
@IBOutlet weak var multipleWalletsPeerCountTitleLabel: UILabel!
@IBOutlet weak var multipleWalletsSyncDetailsTableView: UITableView!
@IBOutlet weak var multipleWalletsSyncDetailsTableViewHeightConstraint: NSLayoutConstraint!

private var multiWallet = WalletLoader.shared.multiWallet!

var hideSeedBackupPrompt: Bool = false
var hideAccountMixingPrompt: Bool = false
Expand Down Expand Up @@ -107,15 +109,15 @@ class OverviewViewController: UIViewController {
// If sync is not ongoing, registering this listener enables us to get notified when a peer
// is connected or disconnected, so we can update the peer count label appropriately.
let syncProgressListener = self as DcrlibwalletSyncProgressListenerProtocol
try? WalletLoader.shared.multiWallet.add(syncProgressListener, uniqueIdentifier: "\(self)")
try? multiWallet.add(syncProgressListener, uniqueIdentifier: "\(self)")

// Register tx notification listener to update recent activity table for new txs.
let txNotificationListener = self as DcrlibwalletTxAndBlockNotificationListenerProtocol
try? WalletLoader.shared.multiWallet.add(txNotificationListener, uniqueIdentifier: "\(self)")
try? multiWallet.add(txNotificationListener, uniqueIdentifier: "\(self)")

WalletLoader.shared.multiWallet.setBlocksRescanProgressListener(self)
multiWallet.setBlocksRescanProgressListener(self)

WalletLoader.shared.multiWallet.setAccountMixerNotification(self)
multiWallet.setAccountMixerNotification(self)

// Display latest block and connected peer count if there's no ongoing sync.
if !SyncManager.shared.isSyncing {
Expand All @@ -132,7 +134,7 @@ class OverviewViewController: UIViewController {
self.checkWhetherToPromptForSeedBackup()
self.checkWhetherToPromptForAccountMixing()

if !WalletLoader.shared.multiWallet.isSyncing() {
if !multiWallet.isSyncing() {
self.refreshLatestBlockInfoPeriodically()
}

Expand Down Expand Up @@ -169,7 +171,7 @@ class OverviewViewController: UIViewController {

self.exchangeRate = newExchangeRate ?? self.exchangeRate // maintain current value if new value is nil

let dcrAmount = WalletLoader.shared.multiWallet.totalBalance
let dcrAmount = multiWallet.totalBalance
let usdAmount = NSDecimalNumber(value: dcrAmount).multiplying(by: exchangeRate!)
self.exchangeValue = usdAmount
self.usdBalanceLabel.isHidden = false
Expand Down Expand Up @@ -220,15 +222,15 @@ class OverviewViewController: UIViewController {
}

func updateMultiWalletBalance() {
let totalWalletAmount = WalletLoader.shared.multiWallet.totalBalance
let totalWalletAmount = multiWallet.totalBalance
let totalAmountRoundedOff = (Decimal(totalWalletAmount) as NSDecimalNumber).round(8)
self.balanceLabel.attributedText = Utils.getAttributedString(str: "\(totalAmountRoundedOff)", siz: 17.0, TexthexColor: UIColor.appColors.darkBlue)
self.setMixerStatus()
}

func updateRecentActivity() {
// Fetch 3 most recent transactions
guard let transactions = WalletLoader.shared.multiWallet.transactionHistory(offset: 0, count: 3),
guard let transactions = multiWallet.transactionHistory(offset: 0, count: 3),
!transactions.isEmpty
else {
self.recentTransactionsTableView.isHidden = true
Expand Down Expand Up @@ -284,7 +286,7 @@ class OverviewViewController: UIViewController {

// show appropriate view section depending on how many wallets are being synced
if isSyncing {
let nOpenedWallets = WalletLoader.shared.multiWallet.openedWalletsCount()
let nOpenedWallets = multiWallet.openedWalletsCount()
let isMultipleWalletsSync = nOpenedWallets > 1

if isMultipleWalletsSync {
Expand Down Expand Up @@ -344,14 +346,14 @@ class OverviewViewController: UIViewController {
self.syncCurrentStepTitleLabel.text = ""
self.syncCurrentStepReportLabel.text = ""
self.syncCurrentStepProgressLabel.text = ""
self.peerCountLabel.text = "\(WalletLoader.shared.multiWallet.connectedPeers())"
self.peerCountLabel.text = "\(multiWallet.connectedPeers())"

self.multipleWalletsPeerCountLabel.text = "\(WalletLoader.shared.multiWallet.connectedPeers())"
self.multipleWalletsPeerCountLabel.text = "\(multiWallet.connectedPeers())"
MultiWalletSyncDetailsLoader.setup(for: self.multipleWalletsSyncDetailsTableView)
}

private func displayLatestBlockHeightAndAge() {
guard let bestBlockInfo = WalletLoader.shared.multiWallet.getBestBlock() else { return }
guard let bestBlockInfo = multiWallet.getBestBlock() else { return }

let bestBlockHeight = bestBlockInfo.height
let bestBlockAge = Int64(Date().timeIntervalSince1970) - bestBlockInfo.timestamp
Expand All @@ -374,7 +376,7 @@ class OverviewViewController: UIViewController {
}

private func displayConnectedPeersCount() {
let peerCount = WalletLoader.shared.multiWallet.connectedPeers()
let peerCount = multiWallet.connectedPeers()
if peerCount == 0 {
self.connectedPeersLabel.attributedText = NSMutableAttributedString(string: LocalizedStrings.noConnectedPeer)
return
Expand All @@ -392,7 +394,7 @@ class OverviewViewController: UIViewController {
}

func checkWhetherToPromptForSeedBackup() {
let numWalletsNeedingSeedBackup = WalletLoader.shared.multiWallet.numWalletsNeedingSeedBackup()
let numWalletsNeedingSeedBackup = multiWallet.numWalletsNeedingSeedBackup()
if self.hideSeedBackupPrompt || numWalletsNeedingSeedBackup == 0 {
self.seedBackupSectionView.isHidden = true
return
Expand All @@ -408,7 +410,7 @@ class OverviewViewController: UIViewController {
}

func checkWhetherToPromptForAccountMixing() {
if !WalletLoader.shared.multiWallet.readBoolConfigValue(forKey: "has_setup_privacy", defaultValue: false) && !self.hideAccountMixingPrompt {
if !multiWallet.readBoolConfigValue(forKey: "has_setup_privacy", defaultValue: false) && !self.hideAccountMixingPrompt {
self.accountMixingPromptSectionView.isHidden = false
}
}
Expand All @@ -421,7 +423,7 @@ class OverviewViewController: UIViewController {
if wallet.isAccountMixerActive() {
activeMixers += 1
WalletID = wallet.id_
let wallet = WalletLoader.shared.multiWallet.wallet(withID: WalletID)
let wallet = multiWallet.wallet(withID: WalletID)
if let unmixedAccountNumber = wallet?.readInt32ConfigValue(forKey: Dcrlibwallet.DcrlibwalletAccountMixerUnmixedAccount, defaultValue: -1) {
do {
if let balance = try wallet?.getAccountBalance(unmixedAccountNumber) {
Expand Down Expand Up @@ -460,7 +462,7 @@ class OverviewViewController: UIViewController {

@IBAction func setupAccountMixingTapped(_ sender: Any) {
if let walletsTabIndex = NavigationMenuTabBarController.tabItems.firstIndex(of: .wallets) {
WalletLoader.shared.multiWallet.setBoolConfigValueForKey(GlobalConstants.Strings.SHOWN_PRIVACY_TOOLTIP, value: false)
multiWallet.setBoolConfigValueForKey(GlobalConstants.Strings.SHOWN_PRIVACY_TOOLTIP, value: false)
NavigationMenuTabBarController.instance?.navigateToTab(index: walletsTabIndex)
}
}
Expand Down Expand Up @@ -494,11 +496,11 @@ class OverviewViewController: UIViewController {
@IBAction func syncConnectionButtonTap(_ sender: Any) {
if SyncManager.shared.isRescanning {
DispatchQueue.global(qos: .userInitiated).async {
WalletLoader.shared.multiWallet.cancelRescan()
self.multiWallet.cancelRescan()
}
} else if SyncManager.shared.isSynced || SyncManager.shared.isSyncing {
DispatchQueue.global(qos: .userInitiated).async {
WalletLoader.shared.multiWallet.cancelSync()
self.multiWallet.cancelSync()
}
} else {
SyncManager.shared.startSync(allowSyncOnCellular: Settings.syncOnCellular)
Expand Down Expand Up @@ -587,7 +589,7 @@ extension OverviewViewController: UITableViewDelegate, UITableViewDataSource {

let cell = tableView.dequeueReusableCell(withIdentifier: TransactionTableViewCell.identifier) as! TransactionTableViewCell
let tx = self.recentTransactions[indexPath.row]
cell.displayInfo(for: tx)
cell.displayInfo(for: tx, hideWalletLabel: multiWallet.loadedWalletsCount() == 1)
return cell
}

Expand Down Expand Up @@ -646,7 +648,7 @@ extension OverviewViewController: DcrlibwalletSyncProgressListenerProtocol {

func onPeerConnectedOrDisconnected(_ numberOfConnectedPeers: Int32) {
DispatchQueue.main.async {
if WalletLoader.shared.multiWallet.isSyncing() {
if self.multiWallet.isSyncing() {
self.peerCountLabel.text = "\(numberOfConnectedPeers)"
self.multipleWalletsPeerCountLabel.text = "\(numberOfConnectedPeers)"
} else {
Expand Down Expand Up @@ -789,9 +791,9 @@ extension OverviewViewController: DcrlibwalletBlocksRescanProgressListenerProtoc
self.toggleSingleWalletSyncDetailsViewHeight(isRescanning: true)
self.multipleWalletsPeerCountLabel.superview?.isHidden = true

let nOpenedWallets = WalletLoader.shared.multiWallet.openedWalletsCount()
let nOpenedWallets = self.multiWallet.openedWalletsCount()
if nOpenedWallets > 1 {
let wallet = WalletLoader.shared.multiWallet.wallet(withID: walletID)
let wallet = self.multiWallet.wallet(withID: walletID)
self.rescanWalletNameLabel.superview?.isHidden = false
self.rescanWalletNameLabel.text = wallet?.name
} else {
Expand All @@ -808,7 +810,7 @@ extension OverviewViewController: DcrlibwalletBlocksRescanProgressListenerProtoc
self.displayGeneralSyncProgress(report.generalSyncProgress)

self.syncCurrentStepNumberLabel.text = LocalizedStrings.connectedPeersCount
self.syncCurrentStepSummaryLabel.text = "\(WalletLoader.shared.multiWallet.connectedPeers())"
self.syncCurrentStepSummaryLabel.text = "\(self.multiWallet.connectedPeers())"

self.syncCurrentStepTitleLabel.text = LocalizedStrings.scannedBlocks
self.syncCurrentStepReportLabel.text = "\(report.currentRescanHeight)"
Expand Down
20 changes: 13 additions & 7 deletions Decred Wallet/Features/Transactions/TransactionTableViewCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ class TransactionTableViewCell: UITableViewCell {
@IBOutlet weak var txDateLabel: UILabel!
@IBOutlet weak var daysCounterLabel: UILabel! // voted, revoked and expired tickets only
@IBOutlet weak var txStatusIconImageView: UIImageView!

@IBOutlet weak var walletNameLabel: Label!

override class func height() -> CGFloat {
return 56
}

func displayInfo(for transaction: Transaction) {
func displayInfo(for transaction: Transaction, hideWalletLabel: Bool = true) {
let txConfirmations = transaction.confirmations
let isConfirmed = Settings.spendUnconfirmed || txConfirmations > 1

Expand All @@ -47,7 +48,13 @@ class TransactionTableViewCell: UITableViewCell {
self.stakingTxAmountLabel.isHidden = transaction.type == DcrlibwalletTxTypeRegular
self.daysCounterLabel.isHidden = !(transaction.type == DcrlibwalletTxTypeVote || transaction.type == DcrlibwalletTxTypeRevocation)
self.voteRewardLabel.isHidden = !(transaction.type == DcrlibwalletTxTypeVote || transaction.type == DcrlibwalletTxTypeRevocation)
self.voteRewardLabelPadding.isHidden = !(transaction.type == DcrlibwalletTxTypeVote || transaction.type == DcrlibwalletTxTypeRevocation)

self.walletNameLabel.isHidden = hideWalletLabel

let wallet = WalletLoader.shared.multiWallet.wallet(withID: transaction.walletID)!
if !hideWalletLabel {
self.walletNameLabel.text = wallet.name
}

if transaction.type == DcrlibwalletTxTypeRegular {
self.displayRegularTxInfo(transaction)
Expand All @@ -58,7 +65,7 @@ class TransactionTableViewCell: UITableViewCell {
self.displayRevocationTxInfo(transaction, ageInDays: transaction.daysToVoteOrRevoke)

} else if transaction.type == DcrlibwalletTxTypeTicketPurchase {
self.displayTicketPurchaseInfo(transaction)
self.displayTicketPurchaseInfo(transaction, wallet: wallet)
}
}

Expand Down Expand Up @@ -104,7 +111,7 @@ class TransactionTableViewCell: UITableViewCell {
self.daysCounterLabel.text = String(format: (ageInDays > 1 ? LocalizedStrings.days : LocalizedStrings.day), ageInDays)
}

func displayTicketPurchaseInfo(_ transaction: Transaction) {
func displayTicketPurchaseInfo(_ transaction: Transaction, wallet: DcrlibwalletWallet) {
self.txAmountOrTicketStatusLabel.text = "\(LocalizedStrings.ticket)"
self.txTypeIconImageView?.image = UIImage(named: "ic_ticketImmature")
self.stakingTxAmountLabel.attributedText = Utils.getAttributedString(str: transaction.dcrAmount.round(8).description, siz: 11.0, TexthexColor: UIColor.appColors.lightBluishGray)
Expand All @@ -116,10 +123,9 @@ class TransactionTableViewCell: UITableViewCell {
self.txDateLabel.textColor = UIColor.appColors.lightBluishGray
self.txDateLabel.text = LocalizedStrings.pending
} else if txConfirmations > BuildConfig.TicketMaturity {
let wallet = WalletLoader.shared.multiWallet.wallet(withID: transaction.walletID)
var errorValue: ObjCBool = false
do {
try wallet?.ticketHasVotedOrRevoked(transaction.hash, ret0_: &errorValue)
try wallet.ticketHasVotedOrRevoked(transaction.hash, ret0_: &errorValue)
if errorValue.boolValue {
self.txAmountOrTicketStatusLabel.text = LocalizedStrings.purchased
} else {
Expand Down