IME-LONDON
/
LONDON-IOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/dev-swift-dibya' into mergeConflictSolving

v0.17
stepie.ub 1 year ago
parent
a4cc4fd3a3 46049db7ee
commit
870461c2c8
5 changed files with 29 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetail.storyboard
  2. 1
      GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailViewController.swift
  3. 2
      GME Remit/Modules/RecipientModules/Recipients/User Interface/Presenter/RecipientsPresenter.swift
  4. 50
      GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift
  5. 1
      GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/ViewModel/SetupRecipientViewModel.swift

9
GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetail.storyboard
View File

@ -10,9 +10,6 @@
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<customFonts key="customFonts">
<array key="SanFranciscoText-Semibold.otf">
<string>SanFranciscoText-Semibold</string>
</array>
<array key="volte-semibold.otf">
<string>FONTSPRINGDEMO-VolteSemiboldRegular</string>
</array>
@ -103,7 +100,7 @@
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="IME Pay Mobile Wallet" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ae7-L0-gY3">
<rect key="frame" x="0.0" y="0.0" width="161" height="17"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Semibold" family="San Francisco Text" pointSize="14"/>
<fontDescription key="fontDescription" type="boldSystem" pointSize="14"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
@ -112,13 +109,13 @@
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ID: 9841303676" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9uL-wQ-mZd">
<rect key="frame" x="0.0" y="0.0" width="161" height="14.5"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Semibold" family="San Francisco Text" pointSize="12"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ID: 9841303676" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jsp-NN-jLM">
<rect key="frame" x="0.0" y="18.5" width="161" height="14.5"/>
<fontDescription key="fontDescription" name="SanFranciscoText-Semibold" family="San Francisco Text" pointSize="12"/>
<fontDescription key="fontDescription" type="system" weight="semibold" pointSize="12"/>
<color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.59999999999999998" colorSpace="custom" customColorSpace="sRGB"/>
<nil key="highlightedColor"/>
</label>

1
GME Remit/Modules/BeneficiaryDetail/User Interface/View/BeneficiaryDetailViewController.swift
View File

@ -213,6 +213,7 @@ extension BeneficiaryDetailViewController: BeneficiaryDetailViewInterface {
okTitle: "Ok"
) {
self.navigationController?.popViewController(animated: true)
NotificationCenter.default.post(name: Notification.Name("RefreshTransactionData"), object: nil)
}
}
}

2
GME Remit/Modules/RecipientModules/Recipients/User Interface/Presenter/RecipientsPresenter.swift
View File

@ -51,7 +51,7 @@ extension RecipientsPresenter: RecipientsModuleInterface {
}
func fetchRecipients(isRefresh: Bool, fromDate: String, toDate: String, pageCount: String, countryCode: String) {
viewModel?.progress(isShow: true)
self.viewModel?.progress(isShow: true)
interactor?.fetchRecipients(isRefresh: isRefresh, fromDate: fromDate, toDate: toDate, pageCount: pageCount, countryCode: countryCode)
}
}

50
GME Remit/Modules/RecipientModules/Recipients/User Interface/View/RecipientsViewController.swift
View File

@ -91,6 +91,10 @@ class RecipientsViewController: UIViewController {
}
override func viewDidAppear(_ animated: Bool) {
super.viewDidAppear(animated)
}
private func addRefreshControl() {
let colorOption = [NSAttributedString.Key.foregroundColor : UIColor.themeWhite]
@ -160,6 +164,13 @@ class RecipientsViewController: UIViewController {
)
}
@objc func refreshData(_ notification: NSNotification){
DispatchQueue.main.asyncAfter(deadline: .now() + 0.3) {
self.viewModel.fetchTransaction(fromDate: self.from?.converToString(dateFormat: "yyyy-MM-dd") ?? "", toDate: self.to?.converToString(dateFormat: "yyyy-MM-dd") ?? "", pageCount: "", countryCode: "")
}
}
@objc func updateTabBarTitle() {
self.tabBarItem.title = "Search your transfers"
}
@ -202,6 +213,14 @@ extension RecipientsViewController {
object: nil
)
NotificationCenter.default.addObserver(
self,
selector: #selector(refreshData(_:)),
name: Notification.Name("RefreshTransactionData"),
object: nil
)
setUIBinding()
addRefreshControl()
}
@ -283,7 +302,7 @@ extension RecipientsViewController {
cell.selectionStyle = .none
cell.setModel(with: element)
cell.didTappedEditDetails = { [weak self] model in
if var selectedTransaction = model {
if let selectedTransaction = model {
let displayStatus = model?.displayActions?.lowercased()
if displayStatus == DisplayOption.amend.rawValue {
@ -296,26 +315,12 @@ extension RecipientsViewController {
self?.viewModel.presenter?.openReceipt(model: selectedTransaction)
}
// if selectedTransaction.displayActions?.uppercased() == "PAYMENT" {
// if let navigation = self?.navigationController {
// SendMoneyReceiptWireframe().openReciept(transactionId: selectedTransaction.tranId ?? "", source: navigation)
// }
// } else if selectedTransaction.displayActions?.uppercased() == "PENDING" {
// self?.editTrigger.onNext(selectedTransaction)
// }else {
//
// }
// self?.editTrigger.onNext(selectedTransaction)
}
}
cell.didTappedResendDetails = { [weak self] model in
if var selectedTransaction = model {
if let selectedTransaction = model {
let displayStatus = model?.displayActions?.lowercased()
if displayStatus == DisplayOption.reject.rawValue {
selectedTransaction.mailType = MailBoxType.pending
@ -327,19 +332,10 @@ extension RecipientsViewController {
selectedTransaction.mailType = MailBoxType.edit
self?.editTrigger.onNext(selectedTransaction)
} else if displayStatus == DisplayOption.cancelamend.rawValue {
selectedTransaction.mailType = MailBoxType.pending
selectedTransaction.mailType = MailBoxType.cancel
self?.editTrigger.onNext(selectedTransaction)
}
// if selectedTransaction.displayActions?.uppercased() == "PAYMENT" {
// if let navigation = self?.navigationController {
// SendMoneyReceiptWireframe().openReciept(transactionId: selectedTransaction.tranId ?? "", source: navigation)
// }
// } else if selectedTransaction.displayActions?.uppercased() == "PENDING" {
// self?.editTrigger.onNext(selectedTransaction)
// }else {
//
// }
}
}
// cell.hero.modifiers = [.fade, .scale(0.7)]

1
GME Remit/Modules/RecipientModules/SetupRecipient/User Interface/View/ViewModel/SetupRecipientViewModel.swift
View File

@ -451,6 +451,7 @@ extension SetupRecipientViewModel: SetupRecipientViewModelInterface {
}
func success(with model: ResponseContainerObject<Recipient>) {
NotificationCenter.default.post(name: Notification.Name("RefreshTransactionData"), object: nil)
successLinker.onNext(model)
}
}
Write Preview
Loading…
Cancel
Save