Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,16 @@ struct BankTransferConfig: Equatable {
let transactionId: Int

let availableProviders: [String]

let provider: BankTransferProvider

init(fulfilLateNotification: Bool,
transactionId: Int,
availableProviders: [String],
provider: BankTransferProvider = .standard) {
self.fulfilLateNotification = fulfilLateNotification
self.transactionId = transactionId
self.availableProviders = availableProviders
self.provider = provider
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import Foundation

enum BankTransferProvider: Equatable {
case standard
case pesalink
}
Original file line number Diff line number Diff line change
Expand Up @@ -120,8 +120,6 @@ class BankTransferViewModel: ObservableObject {
await provisionVirtualAccount()
}

// MARK: - Bank picker

var availableBankSlugs: [String] {
config.availableProviders
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ struct BankTransferAccountDetailsView: View {

let details: BankTransferDetails
let amount: AmountCurrency
let onChangeBank: (() -> Void)?
let provider: BankTransferProvider
let onIveSentTheMoney: () async -> Void

@State private var provisionedAt: Date = Date()
Expand All @@ -15,11 +15,11 @@ struct BankTransferAccountDetailsView: View {

init(details: BankTransferDetails,
amount: AmountCurrency,
onChangeBank: (() -> Void)? = nil,
provider: BankTransferProvider,
onIveSentTheMoney: @escaping () async -> Void) {
self.details = details
self.amount = amount
self.onChangeBank = onChangeBank
self.provider = provider
self.onIveSentTheMoney = onIveSentTheMoney
}

Expand Down Expand Up @@ -48,8 +48,7 @@ struct BankTransferAccountDetailsView: View {
private var accountCard: some View {
VStack(spacing: 0) {
AccountDetailRow(label: "BANK NAME",
value: details.bankName,
trailing: bankNameTrailing)
value: details.bankName)
divider
AccountDetailRow(label: "ACCOUNT NUMBER",
value: details.accountNumber,
Expand All @@ -58,20 +57,20 @@ struct BankTransferAccountDetailsView: View {
AccountDetailRow(label: "AMOUNT",
value: amount.description,
trailing: .copy)

if provider == .pesalink {
divider
AccountDetailRow(label: "NARRATION / REASON",
value: details.transactionReference,
trailing: .copy)
}
}
.overlay(
RoundedRectangle(cornerRadius: .cornerRadius)
.stroke(Color.navy05, lineWidth: 1)
)
}

private var bankNameTrailing: AccountDetailRow.Trailing {
if let handler = onChangeBank {
return .text("Change bank", handler)
}
return .none
}

private var divider: some View {
Rectangle()
.fill(Color.navy05)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@ struct BankTransferView: View {
@StateObject
var viewModel: BankTransferViewModel

@State private var showBankPicker = false

init(chargeContainer: ChargeContainer,
transactionDetails: VerifyAccessCode,
config: BankTransferConfig) {
Expand All @@ -26,9 +24,7 @@ struct BankTransferView: View {
BankTransferAccountDetailsView(
details: details,
amount: viewModel.transactionDetails.amountCurrency,
onChangeBank: viewModel.availableBankSlugs.isEmpty
? nil
: { showBankPicker = true },
provider: viewModel.config.provider,
onIveSentTheMoney: { await viewModel.userTappedIveSentTheMoney() })
.id(details.transactionReference)
case .confirmingPayment(let details, let phase):
Expand Down Expand Up @@ -70,18 +66,6 @@ struct BankTransferView: View {
}
}
.task(viewModel.provisionVirtualAccount)
.sheet(isPresented: $showBankPicker) {
BankPickerSheet(
availableSlugs: viewModel.availableBankSlugs,
currentSlug: viewModel.currentBankSlug,
onSelect: { slug in
Task { @MainActor [viewModel] in
await viewModel.userSelectedBank(slug: slug)
}
showBankPicker = false
},
onCancel: { showBankPicker = false })
}
}

private var showsChangePaymentMethodFooter: Bool {
Expand Down
7 changes: 6 additions & 1 deletion Sources/PaystackUI/Charge/ChargeViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,15 @@ class ChargeViewModel: ObservableObject {

if response.paymentChannels.contains(.bankTransfer),
let transactionId = response.transactionId {
let provider: BankTransferProvider =
Self.pesalinkCurrencyCodes.contains(response.currency)
? .pesalink : .standard
let config = BankTransferConfig(
fulfilLateNotification: response
.merchantChannelSettings?.bankTransfer?.fulfilLateNotification ?? false,
transactionId: transactionId,
availableProviders: response.channelOptions?.bankTransfer ?? [])
availableProviders: response.channelOptions?.bankTransfer ?? [],
provider: provider)
result.append(.bankTransfer(config))
}

Expand Down Expand Up @@ -126,6 +130,7 @@ extension ChargeViewModel {
]

static var promotedSupportedBankCodes: Set<String> = ["00zap"]
static var pesalinkCurrencyCodes: Set<String> = ["KES"]
}

extension ChargeViewModel: ChargeContainer {
Expand Down
18 changes: 10 additions & 8 deletions Sources/PaystackUI/Charge/Models/SupportedChannel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ enum SupportedChannel: Equatable, Identifiable {
case mobileMoney(MobileMoneyChannel)
case bankTransfer(BankTransferConfig)
case zap(ZapConfig)

var id: String {
switch self {
case .card:
Expand All @@ -19,33 +19,35 @@ enum SupportedChannel: Equatable, Identifiable {
return "zap"
}
}

var displayTitle: String {
switch self {
case .card:
return "Card"
case .mobileMoney(let channel):
return channel.value
case .bankTransfer:
return "Bank Transfer"
case .bankTransfer(let config):
return config.provider == .pesalink ? "Pesalink" : "Bank Transfer"
case .zap:
return "Zap"
}
}

var image: Image {
switch self {
case .card:
return Image("cardLogo", bundle: .current)
case .mobileMoney(let channel):
return Self.image(forMobileMoneyKey: channel.key)
case .bankTransfer:
return Image("bankTransferLogo", bundle: .current)
case .bankTransfer(let config):
return config.provider == .pesalink
? Image("pesalinkLogo", bundle: .current)
: Image("bankTransferLogo", bundle: .current)
case .zap:
return Image("zapSingleLogo", bundle: .current)
}
}

private static func image(forMobileMoneyKey key: String) -> Image {
switch key.uppercased() {
case "MPESA":
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "Group 85.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading