-
Notifications
You must be signed in to change notification settings - Fork 983
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.
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
[#20434] Allow users from v1 to login with keycard #20558
base: develop
Are you sure you want to change the base?
Conversation
Jenkins BuildsClick to see older builds (12)
|
1476f55
to
141c1a3
Compare
@@ -45,7 +45,7 @@ ANDROID_ABI_INCLUDE=armeabi-v7a;arm64-v8a;x86;x86_64 | |||
|
|||
org.gradle.jvmargs=-Xmx8704M -XX:+UseParallelGC | |||
|
|||
versionCode=9999 | |||
versionCode=2024052414 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
REVERT BEFORE MERGE!
[status-im.common.resources :as resources] | ||
[utils.re-frame :as rf])) | ||
|
||
(defn connect-keycard |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we just need a temporary solution, so no styles and i18n
:keycard/pin-retry-counter | ||
(fn [db] | ||
(get-in db [:keycard :application-info :pin-retry-counter]))) | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
empty line
|
||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
empty line
(and (zero? pin-retry-counter) | ||
(or (nil? puk-retry-counter) | ||
(pos? puk-retry-counter))) | ||
nil |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
redundant?
82% of end-end tests have passed
Failed tests (5)Click to expandClass TestGroupChatMultipleDeviceMergedNewUI:
Class TestOneToOneChatMultipleSharedDevicesNewUi:
Class TestWalletMultipleDevice:
Class TestCommunityMultipleDeviceMerged:
Expected to fail tests (4)Click to expandClass TestCommunityMultipleDeviceMergedTwo:
Class TestGroupChatMultipleDeviceMergedNewUI:
Class TestWalletOneDevice:
Passed tests (42)Click to expandClass TestActivityCenterContactRequestMultipleDevicePR:
Class TestCommunityMultipleDeviceMergedTwo:
Class TestCommunityOneDeviceMerged:
Class TestActivityMultipleDevicePRTwo:
Class TestGroupChatMultipleDeviceMergedNewUI:
Class TestWalletOneDevice:
Class TestCommunityMultipleDeviceMerged:
Class TestOneToOneChatMultipleSharedDevicesNewUiTwo:
Class TestDeepLinksOneDevice:
Class TestOneToOneChatMultipleSharedDevicesNewUi:
Class TestActivityMultipleDevicePR:
|
189d3c6
to
fcb06ee
Compare
fixes: #20434
fixes: #18470
Steps to test:
Unfortunately I wasn't able to test on ios device
NOTE:
REVERT BEFORE MERGE android version!