Skip to content

Commit 5af8ab3

Browse files
committed
Prevent hanging promise when enrollment VC is already presented
Also fix incorrect return (cherry picked from commit 2b348bf288258243ec962857a420243b89446b45)
1 parent a17cde7 commit 5af8ab3

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

ios/WalletManager.swift

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,10 @@ open class WalletManager: UIViewController {
126126
RCTPresentedViewController()?.present(enrollViewController, animated: true, completion: nil)
127127
} else {
128128
self.logInfo(message: "EnrollViewController is already presented.")
129+
self.presentAddPaymentPassCompletionHandler = nil
130+
completion(.error, [
131+
"errorMessage": "EnrollViewController is already presented."
132+
])
129133
}
130134
}
131135
}
@@ -165,7 +169,7 @@ open class WalletManager: UIViewController {
165169
let paymentPasses = passLibrary.passes(of: .payment)
166170
if paymentPasses.isEmpty {
167171
self.logInfo(message: "No passes found in Wallet.")
168-
return -1
172+
return NSNumber(value: -1)
169173
}
170174

171175
for pass in paymentPasses {
@@ -174,7 +178,7 @@ open class WalletManager: UIViewController {
174178
return NSNumber(value: securePassElement.passActivationState.rawValue)
175179
}
176180
}
177-
return -1
181+
return NSNumber(value: -1)
178182
}
179183

180184
@objc public func getCardStatusBySuffix(last4Digits: NSString) -> NSNumber {

0 commit comments

Comments
 (0)