Add RecvWithShieldedAddressMemo enum to TransactionRecord

Add new icon for memo and add to qrc/makefile

Remove CSS from RecvWithShieldedAddressMemo

Add css

Adjust CSS

src/Makefile.qt.include

@@ -452,7 +452,9 @@ RES_ICONS = \
  qt/pivx/res/img/ic-check-tor.svg \
  qt/pivx/res/img/ic-label.svg \
  qt/pivx/res/img/ic-transaction-received.svg \
+ qt/pivx/res/img/ic-transaction-received-memo.svg \
  qt/pivx/res/img/dark/ic-transaction-received.svg \
+ qt/pivx/res/img/dark/ic-transaction-received-memo.svg \
  qt/pivx/res/img/dark/ic-transaction-warning.svg \
  qt/pivx/res/img/dark/ic-transaction-mint.svg \
  qt/pivx/res/img/dark/ic-transaction-mint-inactive.svg \

src/qt/pivx.qrc

@@ -142,10 +142,12 @@
  <file alias="ic-transaction-warning">pivx/res/img/ic-transaction-warning.svg</file>
  <file alias="ic-transaction-mint">pivx/res/img/ic-transaction-mint.svg</file>
  <file alias="ic-transaction-received">pivx/res/img/ic-transaction-received.svg</file>
+ <file alias="ic-transaction-received-memo">pivx/res/img/ic-transaction-received-memo.svg</file>
  <file alias="ic-transaction-sent">pivx/res/img/ic-transaction-sent.svg</file>
  <file alias="ic-transaction-staked">pivx/res/img/ic-transaction-staked.svg</file>
  <file alias="ic-transaction-mint-dark">pivx/res/img/dark/ic-transaction-mint.svg</file>
  <file alias="ic-transaction-received-dark">pivx/res/img/dark/ic-transaction-received.svg</file>
+ <file alias="ic-transaction-received-memo-dark">pivx/res/img/dark/ic-transaction-received-memo.svg</file>
  <file alias="ic-transaction-sent-dark">pivx/res/img/dark/ic-transaction-sent.svg</file>
  <file alias="ic-transaction-staked-dark">pivx/res/img/dark/ic-transaction-staked.svg</file>
  <file alias="ic-transaction-mint-inactive">pivx/res/img/ic-transaction-mint-inactive.svg</file>

src/qt/pivx/qtutils.cpp

@@ -159,14 +159,16 @@ void setSortTxTypeFilter(QComboBox* filter, SortEdit* lineEditType)
  filter->addItem(QObject::tr("Received"),
  TransactionFilterProxy::TYPE(TransactionRecord::RecvWithAddress) |
  TransactionFilterProxy::TYPE(TransactionRecord::RecvFromOther) |
- TransactionFilterProxy::TYPE(TransactionRecord::RecvWithShieldedAddress));
+ TransactionFilterProxy::TYPE(TransactionRecord::RecvWithShieldedAddress) |
+ TransactionFilterProxy::TYPE(TransactionRecord::RecvWithShieldedAddressMemo));
  filter->addItem(QObject::tr("Sent"),
  TransactionFilterProxy::TYPE(TransactionRecord::SendToAddress) |
  TransactionFilterProxy::TYPE(TransactionRecord::SendToOther) |
  TransactionFilterProxy::TYPE(TransactionRecord::SendToShielded) |
  TransactionFilterProxy::TYPE(TransactionRecord::SendToNobody));
  filter->addItem(QObject::tr("Shield"),
  TransactionFilterProxy::TYPE(TransactionRecord::RecvWithShieldedAddress) |
+ TransactionFilterProxy::TYPE(TransactionRecord::RecvWithShieldedAddressMemo) |
  TransactionFilterProxy::TYPE(TransactionRecord::SendToShielded) |
  TransactionFilterProxy::TYPE(TransactionRecord::SendToSelfShieldToShieldChangeAddress) |
  TransactionFilterProxy::TYPE(TransactionRecord::SendToSelfShieldToTransparent) |

src/qt/pivx/txrow.cpp

@@ -89,6 +89,10 @@ void TxRow::setType(bool isLightTheme, int type, bool isConfirmed)
  path = "://ic-transaction-received";
  css = "text-list-amount-receive";
  break;
+ case TransactionRecord::RecvWithShieldedAddressMemo:
+ path = "://ic-transaction-received-memo";
+ css = "text-list-amount-receive";
+ break;
  case TransactionRecord::SendToAddress:
  case TransactionRecord::SendToOther:
  case TransactionRecord::ZerocoinSpend:

src/qt/transactionrecord.cpp

@@ -180,6 +180,9 @@ bool TransactionRecord::decomposeCreditTransaction(const CWallet* wallet, const
  sub.type = TransactionRecord::RecvWithShieldedAddress;
  sub.credit = sspkm->GetOutPointValue(wtx, out);
  sub.memo = sspkm->GetOutPointMemo(wtx, out);
+ if (!sub.memo->empty()) {
+ sub.type = TransactionRecord::RecvWithShieldedAddressMemo;
+ }
  sub.idx = i;
  parts.append(sub);
  }

src/qt/transactionrecord.h

@@ -98,6 +98,7 @@ class TransactionRecord
  P2CSUnlockStaker, // Staker watching the owner spent the delegated utxo
  SendToShielded, // Shielded send
  RecvWithShieldedAddress, // Shielded receive
+ RecvWithShieldedAddressMemo, // Shielded recieve with memo
  SendToSelfShieldedAddress, // Shielded send to self
  SendToSelfShieldToTransparent, // Unshield coins to self
  SendToSelfShieldToShieldChangeAddress, // Changing coins from one shielded address to another inside the wallet.

src/qt/transactiontablemodel.cpp

@@ -479,6 +479,8 @@ QString TransactionTableModel::formatTxType(const TransactionRecord* wtx) const
  return tr("Converted z%1 to %1").arg(CURRENCY_UNIT.c_str());
  case TransactionRecord::RecvWithShieldedAddress:
  return tr("Received with shielded");
+ case TransactionRecord::RecvWithShieldedAddressMemo:
+ return tr("Received shielded memo");
  case TransactionRecord::SendToShielded:
  return tr("Shielded send to");
  case TransactionRecord::SendToNobody:
@@ -532,6 +534,7 @@ QString TransactionTableModel::formatTxToAddress(const TransactionRecord* wtx, b
  case TransactionRecord::RecvFromZerocoinSpend:
  return lookupAddress(wtx->address, tooltip);
  case TransactionRecord::RecvWithShieldedAddress:
+ case TransactionRecord::RecvWithShieldedAddressMemo:
  case TransactionRecord::SendToShielded:
  // todo: add addressbook support for shielded addresses.
  return QString::fromStdString(wtx->address);
@@ -708,6 +711,7 @@ QVariant TransactionTableModel::data(const QModelIndex& index, int role) const
  return COLOR_ORPHAN;
  else
  return COLOR_STAKE;
+
  }
  // Conflicted tx
  if (rec->status.status == TransactionStatus::Conflicted || rec->status.status == TransactionStatus::NotAccepted) {