diff --git a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard
index e31ac1f5..ada59554 100644
--- a/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard
+++ b/GME Remit/Modules/RemittanceModules/OverseasModules/SendMoneyReceipt/User Interface/View/SendMoneyReceipt.storyboard
@@ -139,13 +139,6 @@ notices to get JME Number for this transfer.
-
-
-
-
-
-
-
@@ -251,11 +244,17 @@ notices to get JME Number for this transfer.
-
+
+
+
+
+
+
+
@@ -311,7 +310,7 @@ notices to get JME Number for this transfer.
-
+
diff --git a/GME Remit/Modules/SideMenu/SettingViewController.swift b/GME Remit/Modules/SideMenu/SettingViewController.swift
index 72caf6ab..b6c012dc 100644
--- a/GME Remit/Modules/SideMenu/SettingViewController.swift
+++ b/GME Remit/Modules/SideMenu/SettingViewController.swift
@@ -313,6 +313,9 @@ class SettingViewController: UIViewController {
let referAndEarn = UITapGestureRecognizer(target: self, action: #selector(self.referAndEarn(_:)))
referAndEarnView.addGestureRecognizer(referAndEarn)
+ let accountStatementTap = UITapGestureRecognizer(target: self, action: #selector(self.accountStatement(_:)))
+ accountStatementStackView.addGestureRecognizer(accountStatementTap)
+
let renewId = UITapGestureRecognizer(target: self, action: #selector(self.renewId(_:)))
renewIdView.addGestureRecognizer(renewId)
@@ -344,6 +347,13 @@ class SettingViewController: UIViewController {
}
}
+ @objc func accountStatement(_ sender: UITapGestureRecognizer) {
+ if let naviVC = navigationController {
+ WalletStatementWireframe().pushMainView(in: naviVC)
+ }
+ }
+
+
@objc func renewId(_ sender: UITapGestureRecognizer) {
RenewIDWireframe().pushMainView(on: self)
}
diff --git a/GME Remit/Modules/WalletStatement/User Interface/View/Cell/WalletStatementTableViewCell.swift b/GME Remit/Modules/WalletStatement/User Interface/View/Cell/WalletStatementTableViewCell.swift
index 79a85a20..1fdf76ed 100644
--- a/GME Remit/Modules/WalletStatement/User Interface/View/Cell/WalletStatementTableViewCell.swift
+++ b/GME Remit/Modules/WalletStatement/User Interface/View/Cell/WalletStatementTableViewCell.swift
@@ -47,17 +47,22 @@ class WalletStatementTableViewCell: UITableViewCell {
let type: WalletInOutType = getType()
- self.walletAmountLabel.layer.cornerRadius = 4
+ self.particularLabel.font = .sanfrancisco(.semibold, size: 16)
+
+
+ self.walletAmountLabel.font = .sanfrancisco(.semibold, size: 16)
+ self.closingAmountLabel.font = .sanfrancisco(.medium, size: 16)
+ self.walletAmountLabel.layer.cornerRadius = 8
self.walletAmountLabel.clipsToBounds = true
walletAmountLabel.textColor = .white
switch type {
case .walletIn:
self.walletAmountLabel.backgroundColor = .themeBlue
- self.walletAmountLabel.text = "\(StringConstants().in): \(self.model?.walletIn ?? "")"
+ self.walletAmountLabel.text = " \(StringConstants().in): \(self.model?.walletIn ?? "") "
case .walletOut:
self.walletAmountLabel.backgroundColor = .themeRed
- self.walletAmountLabel.text = "\(StringConstants().out): \(model?.walletOut ?? "")"
+ self.walletAmountLabel.text = " \(StringConstants().out): \(model?.walletOut ?? "") "
case .closingAmount:
self.walletAmountLabel.text = ""
self.walletAmountLabel.backgroundColor = .themeWhite
diff --git a/GME Remit/Modules/WalletStatement/User Interface/View/WalletStatement.storyboard b/GME Remit/Modules/WalletStatement/User Interface/View/WalletStatement.storyboard
index c05735b9..bf0d6cef 100644
--- a/GME Remit/Modules/WalletStatement/User Interface/View/WalletStatement.storyboard
+++ b/GME Remit/Modules/WalletStatement/User Interface/View/WalletStatement.storyboard
@@ -1,9 +1,9 @@
-
+
-
+
@@ -15,6 +15,9 @@
SanFranciscoDisplay-Regular
+
+ .SFUI-Regular
+
@@ -37,13 +40,13 @@
-
+
-
+
@@ -56,30 +59,30 @@
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
-
+
@@ -89,16 +92,16 @@
-
+
-
+
-
+
@@ -142,7 +145,7 @@
-
+
@@ -204,6 +207,7 @@
+
@@ -211,7 +215,6 @@
-
@@ -226,6 +229,7 @@
+
@@ -237,5 +241,4 @@
-