Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve IBAN recognition on device #782

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Improve IBAN recognition on device #782

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ec5d27
test build
igor-gini Feb 18, 2025
07a4f6f
fix(GiniBankSDK): readd UI tests correctly
igor-gini Feb 24, 2025
e27a950
fix(GiniBankSDK): Improve IBAN recognition on device
igor-gini Feb 14, 2025
6baa3d8
fix(GiniBankSDK): Add more patterns from PR comment
igor-gini Feb 24, 2025
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
52 changes: 4 additions & 48 deletions BankSDK/GiniBankSDKExample/GiniBankSDKExample.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,30 +70,6 @@
28DAF4B02CD293140035A1FF /* GiniHelpScreenUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF4982CD293140035A1FF /* GiniHelpScreenUITests.swift */; };
28DAF4B12CD293140035A1FF /* GiniReviewScreenUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF4992CD293140035A1FF /* GiniReviewScreenUITests.swift */; };
28DAF4B22CD293140035A1FF /* GiniCaptureScreenUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF49A2CD293140035A1FF /* GiniCaptureScreenUITests.swift */; };
28DAF4B32CD293AD0035A1FF /* GiniCameraAccessScreenUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF48D2CD293140035A1FF /* GiniCameraAccessScreenUITests.swift */; };
28DAF4B42CD293B00035A1FF /* MainScreenAccessibilityIdentifiers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF4912CD293140035A1FF /* MainScreenAccessibilityIdentifiers.swift */; };
28DAF4B52CD293B50035A1FF /* SettingScreenAccessibilityIdentifiers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF4922CD293140035A1FF /* SettingScreenAccessibilityIdentifiers.swift */; };
28DAF4B62CD293B80035A1FF /* GiniBankSDKExampleUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF48F2CD293140035A1FF /* GiniBankSDKExampleUITests.swift */; };
28DAF4B72CD293BC0035A1FF /* GiniCaptureScreenUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF49A2CD293140035A1FF /* GiniCaptureScreenUITests.swift */; };
28DAF4B82CD293BF0035A1FF /* GiniErrorScreenUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF4902CD293140035A1FF /* GiniErrorScreenUITests.swift */; };
28DAF4B92CD293C10035A1FF /* GiniHelpScreenUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF4982CD293140035A1FF /* GiniHelpScreenUITests.swift */; };
28DAF4BA2CD293C40035A1FF /* GiniMainScreenUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF4962CD293140035A1FF /* GiniMainScreenUITests.swift */; };
28DAF4BB2CD293C60035A1FF /* GiniOnboardingScreenUITest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF4952CD293140035A1FF /* GiniOnboardingScreenUITest.swift */; };
28DAF4BC2CD293C80035A1FF /* GiniReturnAssistantScreenUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF4942CD293140035A1FF /* GiniReturnAssistantScreenUITests.swift */; };
28DAF4BD2CD293CB0035A1FF /* GiniReviewScreenUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF4992CD293140035A1FF /* GiniReviewScreenUITests.swift */; };
28DAF4BE2CD293CD0035A1FF /* GiniSkontoScreenUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF48E2CD293140035A1FF /* GiniSkontoScreenUITests.swift */; };
28DAF4BF2CD293CF0035A1FF /* GiniTransactionDocsScreenUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF4972CD293140035A1FF /* GiniTransactionDocsScreenUITests.swift */; };
28DAF4C02CD3A8520035A1FF /* OnboardingScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF4862CD293140035A1FF /* OnboardingScreen.swift */; };
28DAF4C12CD3A8540035A1FF /* CameraAccessScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF4812CD293140035A1FF /* CameraAccessScreen.swift */; };
28DAF4C32CD3A8580035A1FF /* ErrorScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF4832CD293140035A1FF /* ErrorScreen.swift */; };
28DAF4C42CD3A85A0035A1FF /* HelpScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF4842CD293140035A1FF /* HelpScreen.swift */; };
28DAF4C52CD3A85D0035A1FF /* MainScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF4852CD293140035A1FF /* MainScreen.swift */; };
28DAF4C62CD3A8600035A1FF /* ReturnAssistantScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF4872CD293140035A1FF /* ReturnAssistantScreen.swift */; };
28DAF4C72CD3A8620035A1FF /* ReviewScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF4882CD293140035A1FF /* ReviewScreen.swift */; };
28DAF4C82CD3A8640035A1FF /* SkontoScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF48A2CD293140035A1FF /* SkontoScreen.swift */; };
28DAF4C92CD3A8660035A1FF /* SettingScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF4892CD293140035A1FF /* SettingScreen.swift */; };
28DAF4CA2CD3A8680035A1FF /* TransactionDocsScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF48B2CD293140035A1FF /* TransactionDocsScreen.swift */; };
28DAF4CB2CD3A8CA0035A1FF /* CaptureScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF4822CD293140035A1FF /* CaptureScreen.swift */; };
28DAF4CC2CD3A8CC0035A1FF /* CaptureScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF4822CD293140035A1FF /* CaptureScreen.swift */; };
28DAF4CD2CD3A8EE0035A1FF /* OnboardingScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF4862CD293140035A1FF /* OnboardingScreen.swift */; };
28DAF4CE2CD3A8F30035A1FF /* CameraAccessScreen.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF4812CD293140035A1FF /* CameraAccessScreen.swift */; };
Expand All @@ -120,6 +96,8 @@
5D5328882C63F71100DEA203 /* CredentialsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D5328872C63F71100DEA203 /* CredentialsTableViewCell.swift */; };
5D53288A2C63F77E00DEA203 /* CredentialsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5D5328892C63F77E00DEA203 /* CredentialsModel.swift */; };
5DCC9FA12C769A0900C1B76A /* APIEnvironment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DCC9FA02C769A0900C1B76A /* APIEnvironment.swift */; };
736C98AF2D687EBE000115B0 /* SettingScreenAccessibilityIdentifiers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF4922CD293140035A1FF /* SettingScreenAccessibilityIdentifiers.swift */; };
736C98B02D687EBE000115B0 /* MainScreenAccessibilityIdentifiers.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28DAF4912CD293140035A1FF /* MainScreenAccessibilityIdentifiers.swift */; };
764E0AD228CF274A00F96503 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 764E0AD428CF274A00F96503 /* InfoPlist.strings */; };
76610BE6298D542A004C1ECB /* CustomReviewScreenBottomNavigationBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 76610BE5298D542A004C1ECB /* CustomReviewScreenBottomNavigationBar.xib */; };
76610BE9298D5448004C1ECB /* CustomReviewScreenBottomNavigationBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = 76610BE8298D5448004C1ECB /* CustomReviewScreenBottomNavigationBar.swift */; };
Expand Down Expand Up @@ -1333,7 +1311,6 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
28DAF4B32CD293AD0035A1FF /* GiniCameraAccessScreenUITests.swift in Sources */,
83D02CD3290AC3AD00DA97F7 /* CustomOnboardingBottomNavigationBarAdapter.swift in Sources */,
F4AD00B625DED1A000C34E15 /* AppCoordinator.swift in Sources */,
768B017E28D1E54E009A2124 /* CustomLoadingIndicator.swift in Sources */,
Expand All @@ -1344,20 +1321,12 @@
83D02CDB290AC86300DA97F7 /* NibLoading.swift in Sources */,
84F2FD172CD0FAC600DAE5B4 /* SettingsSection.swift in Sources */,
84F2FD182CD0FAC600DAE5B4 /* SettingsViewModel.swift in Sources */,
28DAF4C72CD3A8620035A1FF /* ReviewScreen.swift in Sources */,
28DAF4B82CD293BF0035A1FF /* GiniErrorScreenUITests.swift in Sources */,
76EFD4D629B0C5F800C26279 /* CustomDigitalInvoiceOverviewBottomNavigationBarAdapter.swift in Sources */,
28DAF4B42CD293B00035A1FF /* MainScreenAccessibilityIdentifiers.swift in Sources */,
76810039299696A900C52F87 /* CustomDigitalInvoiceOnboardingBottomNavigationBar.swift in Sources */,
28B448CE2C985A6B00FB7BF4 /* UpdateUserDefaultsCell.swift in Sources */,
28DAF4C12CD3A8540035A1FF /* CameraAccessScreen.swift in Sources */,
28DAF4C82CD3A8640035A1FF /* SkontoScreen.swift in Sources */,
28DAF4C42CD3A85A0035A1FF /* HelpScreen.swift in Sources */,
F4AD00EC25DFDE2000C34E15 /* RootNavigationController.swift in Sources */,
F44AD01528D499E6002BAD98 /* CustomOnboardingIllustrationAdapter.swift in Sources */,
28DAF4C02CD3A8520035A1FF /* OnboardingScreen.swift in Sources */,
289447712A3C8ECD00ED012E /* SettingsViewController+SwitchOptionModel.swift in Sources */,
28DAF4BA2CD293C40035A1FF /* GiniMainScreenUITests.swift in Sources */,
76610BEA298D5448004C1ECB /* CustomReviewScreenBottomNavigationBarAdapter.swift in Sources */,
28B1B3932A45DC4C0045B4A1 /* UIView+LoadNib.swift in Sources */,
F4AD00BC25DED33300C34E15 /* Coordinator.swift in Sources */,
Expand All @@ -1370,53 +1339,40 @@
28B5873E2A3727F8008CB210 /* ReusableView.swift in Sources */,
F4AD00C225DED43200C34E15 /* DemoViewController.swift in Sources */,
28F62FA92AB319A000D47866 /* TextField.swift in Sources */,
28DAF4BE2CD293CD0035A1FF /* GiniSkontoScreenUITests.swift in Sources */,
28DAF4C92CD3A8660035A1FF /* SettingScreen.swift in Sources */,
28F62FA72AB2236500D47866 /* Device.swift in Sources */,
28DAF4C52CD3A85D0035A1FF /* MainScreen.swift in Sources */,
837EEFB5291D6ABE00DB781F /* CustomCameraBottomNavigationBarAdapter.swift in Sources */,
28DAF4BB2CD293C60035A1FF /* GiniOnboardingScreenUITest.swift in Sources */,
76610BE9298D5448004C1ECB /* CustomReviewScreenBottomNavigationBar.swift in Sources */,
28DAF4B72CD293BC0035A1FF /* GiniCaptureScreenUITests.swift in Sources */,
F4AD00CC25DFDB4E00C34E15 /* CredentialsManager.swift in Sources */,
28B5874C2A374730008CB210 /* SegmentedOptionTableViewCell.swift in Sources */,
28DAF4CB2CD3A8CA0035A1FF /* CaptureScreen.swift in Sources */,
8336530128F0334C00B5A1CE /* CustomBottomNavigationBar.swift in Sources */,
28B5873C2A372790008CB210 /* UITableView+CellRegistration.swift in Sources */,
5DCC9FA12C769A0900C1B76A /* APIEnvironment.swift in Sources */,
28DAF4CA2CD3A8680035A1FF /* TransactionDocsScreen.swift in Sources */,
5D5328882C63F71100DEA203 /* CredentialsTableViewCell.swift in Sources */,
76EFD4D429B0C4EA00C26279 /* CustomDigitalInvoiceOverviewBottomNavigationBar.swift in Sources */,
F414A56325EBB87F00D04A80 /* DocumentAnalysisHelper.swift in Sources */,
847B68CA2C4009FA00544050 /* CustomSkontoBottomNavigationBar.swift in Sources */,
28DAF4BD2CD293CB0035A1FF /* GiniReviewScreenUITests.swift in Sources */,
28DAF4B52CD293B50035A1FF /* SettingScreenAccessibilityIdentifiers.swift in Sources */,
84CD074F2C7DBBAD004DF1DE /* CustomDigitalInvoiceSkontoBottomNavigationBarAdapter.swift in Sources */,
F4BB7CF226984E5D003FD77E /* CustomMenuItemViewController.swift in Sources */,
837EEFB3291D6AAC00DB781F /* CustomCameraBottomNavigationBar.swift in Sources */,
84F2FD1A2CD0FAE100DAE5B4 /* UITableView+HeaderFooterViewRegistration.swift in Sources */,
28DAF4C32CD3A8580035A1FF /* ErrorScreen.swift in Sources */,
28A4112F2A6EB9E500421033 /* SettingsViewController+SettingsButtonStates.swift in Sources */,
736C98AF2D687EBE000115B0 /* SettingScreenAccessibilityIdentifiers.swift in Sources */,
736C98B02D687EBE000115B0 /* MainScreenAccessibilityIdentifiers.swift in Sources */,
833652FD28F0308B00B5A1CE /* CustomBottomNavigationBarAdapter.swift in Sources */,
289570932A30CD7600CC2C56 /* SettingsViewController.swift in Sources */,
2883DE062AB89F4000AE3A9C /* GiniCaptureSDKColors.swift in Sources */,
284F52082BD954B200CF70AD /* GiniBankCustomResourceProvider.swift in Sources */,
28B898D02CA324CD00C79231 /* CodeLoading.swift in Sources */,
28DAF4B92CD293C10035A1FF /* GiniHelpScreenUITests.swift in Sources */,
F4E0218827BD349A0042D000 /* Amount.swift in Sources */,
284F520A2BD959F300CF70AD /* UIColor.swift in Sources */,
28DAF4BF2CD293CF0035A1FF /* GiniTransactionDocsScreenUITests.swift in Sources */,
84CD074D2C7DBB9A004DF1DE /* CustomDigitalInvoiceSkontoBottomNavigationBar.swift in Sources */,
768100372996959800C52F87 /* CustomDigitalInvoiceOnboardingBottomNavigationBarAdapter.swift in Sources */,
28DAF4B62CD293B80035A1FF /* GiniBankSDKExampleUITests.swift in Sources */,
28DAF4BC2CD293C80035A1FF /* GiniReturnAssistantScreenUITests.swift in Sources */,
28B587462A373A72008CB210 /* SwitchOptionTableViewCell.swift in Sources */,
289447732A3C8F0C00ED012E /* SettingsViewController+SegmentedOptionModel.swift in Sources */,
28F62F9C2AB21ACE00D47866 /* Localized.swift in Sources */,
28DB2C822A39AF5000F5B304 /* GiniButton.swift in Sources */,
28A411302A6EB9E500421033 /* SettingsViewController+DocumentValidationsState.swift in Sources */,
28CDB8232A38A5E40016A81C /* ColorPalette.swift in Sources */,
28DAF4C62CD3A8600035A1FF /* ReturnAssistantScreen.swift in Sources */,
289D3DB32A4EC857002A6681 /* InfoTableViewCell.swift in Sources */,
3E7839CE29C9DBB700B42216 /* ExtractionResultTableViewCell.swift in Sources */,
5D53288A2C63F77E00DEA203 /* CredentialsModel.swift in Sources */,
Expand Down
34 changes: 30 additions & 4 deletions ...reSDK/GiniCaptureSDK/Sources/GiniCaptureSDK/Core/Screens/Camera/IBAN/IBANRecogniser.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,39 @@

import Foundation

func extractIBANS(string: String) -> [String] {
var results = [String]()
var prefferedIBANs = [String]()
private func extractIBANMatches(from string: String) -> [NSTextCheckingResult] {
let stringRange = NSRange(location: 0, length: string.count)
let allIBANs = IBANKnowledge().universalIBANRegex.matches(in: string, options: [], range: stringRange)
let iBANsInBlocks = IBANKnowledge().ibanInBlocksRegex.matches(in: string, options: [], range: stringRange)
let matches = allIBANs + iBANsInBlocks
return allIBANs + iBANsInBlocks
}

func extractIBANS(string: String) -> [String] {
var results = [String]()
var prefferedIBANs = [String]()
var matches = extractIBANMatches(from: string)

// try to fix invalid strings
if matches.isEmpty, string.count > 2 {
var number = String(string.dropFirst(2))

number = number.replacingOccurrences(of: "s", with: "5")
number = number.replacingOccurrences(of: "S", with: "5")
number = number.replacingOccurrences(of: "I", with: "1")
number = number.replacingOccurrences(of: "i", with: "1")
number = number.replacingOccurrences(of: "l", with: "1")
number = number.replacingOccurrences(of: "T", with: "1")
number = number.replacingOccurrences(of: "o", with: "0")
number = number.replacingOccurrences(of: "O", with: "0")
number = number.replacingOccurrences(of: "Q", with: "0")
number = number.replacingOccurrences(of: "B", with: "8")
number = number.replacingOccurrences(of: "Z", with: "7")
number = number.replacingOccurrences(of: "z", with: "7")
number = number.trimmingCharacters(in: .whitespaces)
number = number.replacingOccurrences(of: ",", with: "")
number = number.replacingOccurrences(of: ".", with: "")
matches = extractIBANMatches(from: String(string.prefix(2)) + number)
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi @igor-gini , Everything looks good to me, just a small suggestion,
We observed in android that sometimes
8 is recognized as B,
7 is recognized as Z,
I think it would be good if you can add these cases as well, If you did not saw any pattern like this in IOS then it is fine as well.
Just for your information here is the android PR link if you want to have a look :)
gini/gini-mobile-android#645

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added today, thank you for your review!


for match in matches {
if let range = Range(match.range, in: string) {
Expand Down