From 143ffe2ffd5075b655855473386b24441393204d Mon Sep 17 00:00:00 2001 From: Alan Maynard Date: Mon, 8 Apr 2019 19:57:20 -0400 Subject: [PATCH 1/9] SWE-24 change context type to support passing account - we require the `accountAlias` of the current account in order to cancel a payment - changed the type of dictionary passed through Transactions functionality to support getting the account to transaction details, so we can ultimate use to cancel a pending payment --- .../AccountDetailsInterfaceController.swift | 5 ++++- .../TransactionDetailsInterfaceController.swift | 5 ++++- .../TransactionsInterfaceController.swift | 14 ++++++++++---- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/AccountDetailsInterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/AccountDetailsInterfaceController.swift index f7e28bd..fe30f0b 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/AccountDetailsInterfaceController.swift +++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/AccountDetailsInterfaceController.swift @@ -12,7 +12,7 @@ import Foundation class AccountDetailsInterfaceController: WKInterfaceController { var selectedAccount: Account? var dictForAcct: [String: Account] = [:] - var transactionDict: [String: [Transaction]] = [:] + var transactionDict: [String: Any] = [:] @IBOutlet var loadingLabel: WKInterfaceLabel! @IBOutlet var activityIndicator: WKInterfaceImage! @@ -41,6 +41,9 @@ class AccountDetailsInterfaceController: WKInterfaceController { return } + if let acct = self.selectedAccount { + self.transactionDict.updateValue(acct, forKey: "acct") + } self.transactionDict.updateValue(transactions, forKey: "transactions") self.pushController(withName: "Transactions", context: self.transactionDict) self.configureInterfaceObjects(false) diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionDetailsInterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionDetailsInterfaceController.swift index 492d71b..96995fb 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionDetailsInterfaceController.swift +++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionDetailsInterfaceController.swift @@ -14,6 +14,7 @@ class TransactionDetailsInterfaceController: WKInterfaceController { @IBOutlet var dateLabel: WKInterfaceLabel! @IBOutlet var amountLabel: WKInterfaceLabel! @IBOutlet var cancelButton: WKInterfaceButton! + var account: Account? override func awake(withContext context: Any?) { super.awake(withContext: context) @@ -21,12 +22,14 @@ class TransactionDetailsInterfaceController: WKInterfaceController { let transaction = data["transaction"] as? Transaction, let merchant = data["merchant"] as? String, let date = data["date"] as? Date, - let amount = data["amount"] as? Double else { + let amount = data["amount"] as? Double, + let acct = data["acct"] as? Account else { NSLog("Error receiving context in TransactionDetails.") return } setTitle("Dismiss") + account = acct transactionName.setText(merchant) dateLabel.setText("Date: \(DateFormatter.localizedString(from: date, dateStyle: .short, timeStyle: .none))") amountLabel.setText(String(format: "Amount: $%.2f", amount)) diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionsInterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionsInterfaceController.swift index b23c115..b070e2f 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionsInterfaceController.swift +++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionsInterfaceController.swift @@ -12,15 +12,19 @@ import Foundation class TransactionsInterfaceController: WKInterfaceController { @IBOutlet weak var transactionsTable: WKInterfaceTable! var transactions: [Transaction] = [] + var account: Account? override func awake(withContext context: Any?) { super.awake(withContext: context) - guard let data = context as? [String: [Transaction]], let trans = data["transactions"] else { - NSLog("Error receiving context containing transactions in TransactionsInterfaceController") - return + guard let data = context as? [String: Any], + let trans = data["transactions"] as? [Transaction], + let acct = data["acct"] as? Account else { + NSLog("Error receiving context containing transactions in TransactionsInterfaceController") + return } + account = acct transactions = trans configureRows() } @@ -36,11 +40,13 @@ class TransactionsInterfaceController: WKInterfaceController { } override func table(_ table: WKInterfaceTable, didSelectRowAt rowIndex: Int) { + guard let acct = account else { return } let transaction = transactions[rowIndex] let context: [String: Any] = ["transaction": transaction, "merchant": transaction.merchantID, "date": transaction.date, - "amount": transaction.amount] + "amount": transaction.amount, + "acct": acct] presentController(withName: "TransactionDetails", context: context) } From f48164ba9191ac010bcab6d01ed1395d4343fb23 Mon Sep 17 00:00:00 2001 From: Alan Maynard Date: Mon, 8 Apr 2019 20:14:41 -0400 Subject: [PATCH 2/9] SWE-24 New class to display payment cancellation --- .../Base.lproj/Interface.storyboard | 7 +++++ .../CancellationInterfaceController.swift | 31 +++++++++++++++++++ .../project.pbxproj | 5 ++- 3 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 SynchronyFinancial/SynchronyFinancial WatchKit Extension/CancellationInterfaceController.swift diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard b/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard index 49f67ae..72fd8a4 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard +++ b/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard @@ -311,6 +311,13 @@ + + + + + + + diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/CancellationInterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/CancellationInterfaceController.swift new file mode 100644 index 0000000..d49c2a6 --- /dev/null +++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/CancellationInterfaceController.swift @@ -0,0 +1,31 @@ +// +// CancellationInterfaceController.swift +// SynchronyFinancial WatchKit Extension +// +// Created by Alan Maynard on 4/8/19. +// Copyright © 2019 Alan Maynard. All rights reserved. +// + +import WatchKit +import Foundation + + +class CancellationInterfaceController: WKInterfaceController { + + override func awake(withContext context: Any?) { + super.awake(withContext: context) + + // Configure interface objects here. + } + + override func willActivate() { + // This method is called when watch view controller is about to be visible to user + super.willActivate() + } + + override func didDeactivate() { + // This method is called when watch view controller is no longer visible + super.didDeactivate() + } + +} diff --git a/SynchronyFinancial/SynchronyFinancial.xcodeproj/project.pbxproj b/SynchronyFinancial/SynchronyFinancial.xcodeproj/project.pbxproj index 4662621..642df94 100644 --- a/SynchronyFinancial/SynchronyFinancial.xcodeproj/project.pbxproj +++ b/SynchronyFinancial/SynchronyFinancial.xcodeproj/project.pbxproj @@ -30,6 +30,7 @@ 678C3885223098C400FEAAF6 /* Account.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48F2430B2214CBF700B9C894 /* Account.swift */; }; 678C388622309F7D00FEAAF6 /* AccountCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48DA0057221D12E70081A500 /* AccountCell.swift */; }; 678C62BA224ECDFD0007AD53 /* PaymentResultInterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 678C62B9224ECDFD0007AD53 /* PaymentResultInterfaceController.swift */; }; + 679A9069225C1B0E00247F39 /* CancellationInterfaceController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 679A9068225C1B0E00247F39 /* CancellationInterfaceController.swift */; }; 67BAC269219E254700713FEF /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 67BAC268219E254700713FEF /* AppDelegate.swift */; }; 67BAC26E219E254700713FEF /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 67BAC26C219E254700713FEF /* Main.storyboard */; }; 67BAC270219E254800713FEF /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 67BAC26F219E254800713FEF /* Assets.xcassets */; }; @@ -107,6 +108,7 @@ 676392B52242A3F800740A8C /* TransactionCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TransactionCell.swift; sourceTree = ""; }; 678C38832230950100FEAAF6 /* AccountDetailsInterfaceController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountDetailsInterfaceController.swift; sourceTree = ""; }; 678C62B9224ECDFD0007AD53 /* PaymentResultInterfaceController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PaymentResultInterfaceController.swift; sourceTree = ""; }; + 679A9068225C1B0E00247F39 /* CancellationInterfaceController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CancellationInterfaceController.swift; sourceTree = ""; }; 67BAC265219E254700713FEF /* SynchronyFinancial.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = SynchronyFinancial.app; sourceTree = BUILT_PRODUCTS_DIR; }; 67BAC268219E254700713FEF /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 67BAC26D219E254700713FEF /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; @@ -207,6 +209,7 @@ 67BAC28A219E254900713FEF /* SynchronyFinancial WatchKit Extension */ = { isa = PBXGroup; children = ( + 679A9068225C1B0E00247F39 /* CancellationInterfaceController.swift */, 678C62B9224ECDFD0007AD53 /* PaymentResultInterfaceController.swift */, 67293CF022542F15009E0E7A /* TransactionDetailsInterfaceController.swift */, 674BD1522239A39D0076AFD6 /* PayBillInterfaceController.swift */, @@ -476,7 +479,6 @@ 674BD1532239A39D0076AFD6 /* PayBillInterfaceController.swift in Sources */, 48F2430D2214CBF700B9C894 /* Account.swift in Sources */, 678C388622309F7D00FEAAF6 /* AccountCell.swift in Sources */, - 481864A8224802BB0059CF7A /* PaymentDetailInterfaceController.swift in Sources */, 11E6ADB92253FA050009922E /* BankAcct.swift in Sources */, 48F2430E2214CBF700B9C894 /* Transaction.swift in Sources */, 67BAC269219E254700713FEF /* AppDelegate.swift in Sources */, @@ -497,6 +499,7 @@ 67E17B87223812C2008871FE /* Defaults.swift in Sources */, 67293CF122542F15009E0E7A /* TransactionDetailsInterfaceController.swift in Sources */, 1123372E223ABD6400B70925 /* FetchData.swift in Sources */, + 679A9069225C1B0E00247F39 /* CancellationInterfaceController.swift in Sources */, 48F243072214C98600B9C894 /* AccountTableInterfaceController.swift in Sources */, 676392B62242A3F800740A8C /* TransactionCell.swift in Sources */, 48F2430F2214CC2200B9C894 /* Transaction.swift in Sources */, From 7ed54df793a551ee712c30bc476947c05bcf6070 Mon Sep 17 00:00:00 2001 From: Alan Maynard Date: Mon, 8 Apr 2019 20:29:17 -0400 Subject: [PATCH 3/9] SWE-24 Configure cancellation success screen --- .../Base.lproj/Interface.storyboard | 14 +++++++++++++- .../CancellationInterfaceController.swift | 13 +++++++++---- 2 files changed, 22 insertions(+), 5 deletions(-) diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard b/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard index 72fd8a4..81d6131 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard +++ b/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard @@ -314,7 +314,19 @@ - + + + + + + + + + diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/CancellationInterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/CancellationInterfaceController.swift index d49c2a6..465753a 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/CancellationInterfaceController.swift +++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/CancellationInterfaceController.swift @@ -9,13 +9,18 @@ import WatchKit import Foundation - class CancellationInterfaceController: WKInterfaceController { - + @IBOutlet var confirmationLabel: WKInterfaceLabel! + override func awake(withContext context: Any?) { super.awake(withContext: context) - - // Configure interface objects here. + + guard let data = context as? [String: String], let confirmation = data["cancellation_confirm"] else { + NSLog("Error receiving context for payment cancellation") + return + } + + confirmationLabel.setText(confirmation) } override func willActivate() { From 71e5caf742fc09bd2343321a82ad4e135f809c5d Mon Sep 17 00:00:00 2001 From: Alan Maynard Date: Mon, 8 Apr 2019 20:40:50 -0400 Subject: [PATCH 4/9] SWE-24 keep transaction variable - we need to have the transaction locally so we can pass its members to our API to cancel payment - added outlet for cancel button --- .../TransactionDetailsInterfaceController.swift | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionDetailsInterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionDetailsInterfaceController.swift index 96995fb..626ab56 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionDetailsInterfaceController.swift +++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionDetailsInterfaceController.swift @@ -14,7 +14,9 @@ class TransactionDetailsInterfaceController: WKInterfaceController { @IBOutlet var dateLabel: WKInterfaceLabel! @IBOutlet var amountLabel: WKInterfaceLabel! @IBOutlet var cancelButton: WKInterfaceButton! + var transaction: Transaction? var account: Account? + override func awake(withContext context: Any?) { super.awake(withContext: context) @@ -29,6 +31,7 @@ class TransactionDetailsInterfaceController: WKInterfaceController { } setTitle("Dismiss") + self.transaction = transaction account = acct transactionName.setText(merchant) dateLabel.setText("Date: \(DateFormatter.localizedString(from: date, dateStyle: .short, timeStyle: .none))") @@ -36,6 +39,8 @@ class TransactionDetailsInterfaceController: WKInterfaceController { cancelButton.setHidden(!transaction.isModifiable) } + @IBAction func cancelButtonTapped() { + } override func willActivate() { // This method is called when watch view controller is about to be visible to user super.willActivate() From 3ef5a67f88d66718c8099399f2819bb45e657649 Mon Sep 17 00:00:00 2001 From: Alan Maynard Date: Mon, 8 Apr 2019 20:49:43 -0400 Subject: [PATCH 5/9] SWE-24 add activity indicator and embed screen contents in group --- .../Base.lproj/Interface.storyboard | 31 +++++++++++++------ ...ransactionDetailsInterfaceController.swift | 3 ++ 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard b/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard index 81d6131..bcf2421 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard +++ b/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard @@ -289,27 +289,40 @@ - - - + + + + - + diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionDetailsInterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionDetailsInterfaceController.swift index 626ab56..45123aa 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionDetailsInterfaceController.swift +++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionDetailsInterfaceController.swift @@ -10,6 +10,9 @@ import WatchKit import Foundation class TransactionDetailsInterfaceController: WKInterfaceController { + @IBOutlet var contentGroup: WKInterfaceGroup! + @IBOutlet var activityIndicator: WKInterfaceImage! + @IBOutlet var activityIndicatorLabel: WKInterfaceLabel! @IBOutlet var transactionName: WKInterfaceLabel! @IBOutlet var dateLabel: WKInterfaceLabel! @IBOutlet var amountLabel: WKInterfaceLabel! From f111f7a80a11c842b1c7b2bd56a3846318285e1d Mon Sep 17 00:00:00 2001 From: Alan Maynard Date: Tue, 9 Apr 2019 11:48:45 -0400 Subject: [PATCH 6/9] SWE-24 change presentation of transaction details to push MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - this will help us provide a better user experience and aesthetic in regards to showing “cancel payment” flow --- .../TransactionDetailsInterfaceController.swift | 1 - .../TransactionsInterfaceController.swift | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionDetailsInterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionDetailsInterfaceController.swift index 45123aa..d08e4fb 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionDetailsInterfaceController.swift +++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionDetailsInterfaceController.swift @@ -33,7 +33,6 @@ class TransactionDetailsInterfaceController: WKInterfaceController { return } - setTitle("Dismiss") self.transaction = transaction account = acct transactionName.setText(merchant) diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionsInterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionsInterfaceController.swift index b070e2f..6b77d9d 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionsInterfaceController.swift +++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionsInterfaceController.swift @@ -47,8 +47,7 @@ class TransactionsInterfaceController: WKInterfaceController { "date": transaction.date, "amount": transaction.amount, "acct": acct] - - presentController(withName: "TransactionDetails", context: context) + pushController(withName: "TransactionDetails", context: context) } private func configureRows() { From b8da22e1192772fe57395937123b214f29e322ae Mon Sep 17 00:00:00 2001 From: Alan Maynard Date: Tue, 9 Apr 2019 12:15:35 -0400 Subject: [PATCH 7/9] SWE-24 make call to web service to cancel payment --- .../Base.lproj/Interface.storyboard | 8 +++---- ...ransactionDetailsInterfaceController.swift | 22 ++++++++++++++++++- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard b/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard index bcf2421..2d1440e 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard +++ b/SynchronyFinancial/SynchronyFinancial WatchKit App/Base.lproj/Interface.storyboard @@ -289,8 +289,8 @@ - - - + + diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionDetailsInterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionDetailsInterfaceController.swift index d08e4fb..37713e0 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionDetailsInterfaceController.swift +++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionDetailsInterfaceController.swift @@ -10,13 +10,14 @@ import WatchKit import Foundation class TransactionDetailsInterfaceController: WKInterfaceController { - @IBOutlet var contentGroup: WKInterfaceGroup! @IBOutlet var activityIndicator: WKInterfaceImage! @IBOutlet var activityIndicatorLabel: WKInterfaceLabel! + @IBOutlet weak var contentGroup: WKInterfaceGroup! @IBOutlet var transactionName: WKInterfaceLabel! @IBOutlet var dateLabel: WKInterfaceLabel! @IBOutlet var amountLabel: WKInterfaceLabel! @IBOutlet var cancelButton: WKInterfaceButton! + var transaction: Transaction? var account: Account? @@ -42,7 +43,26 @@ class TransactionDetailsInterfaceController: WKInterfaceController { } @IBAction func cancelButtonTapped() { + guard let t = transaction, let acct = account else { + NSLog("Error: no values for transaction or account.") + return + } + + activityIndicator.configureForActivityIndicator() + activityIndicatorLabel.setHidden(false) + contentGroup.setHidden(true) + + FetchData.cancelPayment(accountAlias: acct.accountAlias, confirmationNum: t.confirmationNum, paymentId: t.paymentId) { conf, error in + guard error == nil else { return } + self.activityIndicatorLabel.setHidden(true) + self.activityIndicator.stopAnimating() + self.contentGroup.setHidden(false) + let context: [String: String] = ["cancellation_confirm": conf] + self.presentController(withName: "Cancellation", context: context) + self.popToRootController() + } } + override func willActivate() { // This method is called when watch view controller is about to be visible to user super.willActivate() From dbf152b30890f37560310959c3832df75481e6be Mon Sep 17 00:00:00 2001 From: Alan Maynard Date: Tue, 9 Apr 2019 12:16:25 -0400 Subject: [PATCH 8/9] SWE-24 set title in cancellation screen - also remove boilerplate template code --- .../CancellationInterfaceController.swift | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/CancellationInterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/CancellationInterfaceController.swift index 465753a..f904d37 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/CancellationInterfaceController.swift +++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/CancellationInterfaceController.swift @@ -11,7 +11,7 @@ import Foundation class CancellationInterfaceController: WKInterfaceController { @IBOutlet var confirmationLabel: WKInterfaceLabel! - + override func awake(withContext context: Any?) { super.awake(withContext: context) @@ -20,17 +20,15 @@ class CancellationInterfaceController: WKInterfaceController { return } + setTitle("Done") confirmationLabel.setText(confirmation) } override func willActivate() { - // This method is called when watch view controller is about to be visible to user super.willActivate() } override func didDeactivate() { - // This method is called when watch view controller is no longer visible super.didDeactivate() } - } From 017b7827f5f6a9499e2a1cb4fdaf71bea7dd1e28 Mon Sep 17 00:00:00 2001 From: Alan Maynard Date: Tue, 9 Apr 2019 12:20:40 -0400 Subject: [PATCH 9/9] SWE-24 add some basic error handling for the user --- .../TransactionDetailsInterfaceController.swift | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionDetailsInterfaceController.swift b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionDetailsInterfaceController.swift index 37713e0..62698e0 100644 --- a/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionDetailsInterfaceController.swift +++ b/SynchronyFinancial/SynchronyFinancial WatchKit Extension/TransactionDetailsInterfaceController.swift @@ -53,7 +53,11 @@ class TransactionDetailsInterfaceController: WKInterfaceController { contentGroup.setHidden(true) FetchData.cancelPayment(accountAlias: acct.accountAlias, confirmationNum: t.confirmationNum, paymentId: t.paymentId) { conf, error in - guard error == nil else { return } + guard error == nil else { + self.presentAlert(withTitle: "Error", message: "We were unable to process your cancellation at this time. Please try again later.", preferredStyle: .alert, actions: [WKAlertAction(title: "Dismiss", style: .default, handler:{})]) + return + } + self.activityIndicatorLabel.setHidden(true) self.activityIndicator.stopAnimating() self.contentGroup.setHidden(false)