Skip to content

Merge/main/2026.1.0#1655

Merged
meladRaouf merged 11 commits into
mainfrom
merge/main2026.1.0
May 5, 2026
Merged

Merge/main/2026.1.0#1655
meladRaouf merged 11 commits into
mainfrom
merge/main2026.1.0

Conversation

@meladRaouf
Copy link
Copy Markdown
Collaborator

No description provided.

alexandr-simprints and others added 10 commits March 3, 2026 17:14
* [MS-1341] Adding on tap focus for the OCR scanner

* [MS-1341] Removing 'camera' field and verifying lifecycle state before using binding

(cherry picked from commit 9c1e017)
* Cherry picking latest linter rulesˆ from the main branch

* [MS-1338] Removing checkbox from the credential confirmation

(cherry picked from commit 376ca5d)
* [MS-1339] Adding 'Has number, no card (booklet)' skip reason for MFID

* [MS-1339] Adding `HAS_NUMBER_NO_ID` credential skip reason

(cherry picked from commit cefefb6)
…ragment` (#1593)

* [MS-1351] Adding system bar insets for ExternalCredentialControllerFragment

* [MS-1351] Adding system bar insets for fragments in the MFID workflow

(cherry picked from commit 655d362)
* Cherry picking latest linter rulesˆ from the main branch

* [MS-1340] Adding validation for the credential fields edit text

* [MS-1340] Updating tests

* [MS-1340] Removing existing text watch when rendering updated state

* [MS-1340] Fixing code comments

* [MS-1340] Confirmation checkbox is disabled if credential is being edited

* [MS-1340] Renaming credential validation use cases for better readability

(cherry picked from commit 295763e)
…ntial data (#1591)

* [MS-1346] Identificaiton response now contains scanned external credential data

* [MS-1346] Renaming variables to be more consistent

* [MS-1346] Fixing tests

* [MS-1346] Fixing tests, removing unnecessary variables

* [MS-1346] Fixing tests

* [MS-1346] Fixing tests

* [MS-1346] Adding test coverage for credential response in Identification response

(cherry picked from commit b12990e)
… an Identification response (#1594)

* [MS-1352] Accessing a correct scanned credential field to build an Identification response

* [MS-1352] Adding test coverageˆ

(cherry picked from commit a5c531b)
… responses

# Conflicts:
#	infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/EventRemoteDataSource.kt
…ing-26.1

MS-1382 Explicitly throw exception on unsuccessful event up/down sync responses
merge release/2025.4.1 into release/2026.1.0
@cla-bot cla-bot Bot added the ... label May 5, 2026
@meladRaouf meladRaouf changed the title Merge/main2026.1.0 Merge/main/2026.1.0 May 5, 2026
@meladRaouf meladRaouf force-pushed the merge/main2026.1.0 branch from ccddd3e to d5f6d28 Compare May 5, 2026 13:13
@meladRaouf meladRaouf force-pushed the merge/main2026.1.0 branch from d5f6d28 to 58fb956 Compare May 5, 2026 13:38
# Conflicts:
#	feature/external-credential/src/main/java/com/simprints/feature/externalcredential/screens/skip/ExternalCredentialSkipFragment.kt
#	infra/event-sync/src/main/java/com/simprints/infra/eventsync/event/remote/EventRemoteDataSource.kt
#	infra/event-sync/src/test/java/com/simprints/infra/eventsync/event/remote/EventRemoteDataSourceTest.kt
@meladRaouf meladRaouf force-pushed the merge/main2026.1.0 branch from 58fb956 to 8f0de28 Compare May 5, 2026 13:53
@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud Bot commented May 5, 2026

@meladRaouf meladRaouf merged commit dbd9fc2 into main May 5, 2026
14 checks passed
@meladRaouf meladRaouf deleted the merge/main2026.1.0 branch May 5, 2026 14:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants