diff --git a/nix/deps/gradle/deps.json b/nix/deps/gradle/deps.json index e012188cd8..679b486f57 100644 --- a/nix/deps/gradle/deps.json +++ b/nix/deps/gradle/deps.json @@ -3542,30 +3542,30 @@ }, { - "path": "com/github/status-im/status-keycard-java/android/3.0.1/android-3.0.1", + "path": "com/github/status-im/status-keycard-java/android/3.0.4/android-3.0.4", "host": "https://repository.sonatype.org/content/groups/sonatype-public-grid", "type": "jar", "pom": { - "sha1": "e84c8fef96ee43bb485ca30bab3736fadf956e4d", - "sha256": "0ahqp7lsanj8x8k46sz5kmv7yz081r5j5vd8nly1ri5vj88nrj3y" + "sha1": "e6e1933d85ac05b51953effc21ab893679f5864b", + "sha256": "1y9kqp3qgx3kqaf6vm6iwphdj8caqd9x6kncjsnp6f0nirp5ijzq" }, "jar": { - "sha1": "d3055cf1607314c5ea4fa6fc3a259267dfad97ef", - "sha256": "0dv0lm2x85ijk8kaxb3fylmkp4hjgd8da3d95m5zhw82wbl4n1ca" + "sha1": "dca6e47e087a649643bbad1c1feb4b0b5e1aaf45", + "sha256": "0krxjj5h5zmap4645llscwkmyszm8qyngwg8vi8ds1mf2kp0jaz1" } }, { - "path": "com/github/status-im/status-keycard-java/lib/3.0.1/lib-3.0.1", + "path": "com/github/status-im/status-keycard-java/lib/3.0.4/lib-3.0.4", "host": "https://repository.sonatype.org/content/groups/sonatype-public-grid", "type": "jar", "pom": { - "sha1": "89f8e7342acca331648f4fe82c4471ebbfa2064c", - "sha256": "14g7c5x2mdf1fa48sb0c9hg1crr9xq4dz812kdnydylp108ln5gj" + "sha1": "718d3d286d53186552a84cee1a1283e0975da789", + "sha256": "0s2mbx1638qig4m802rf0ill9bghgga8w3ld0vpcz6x7h2kmvv6g" }, "jar": { - "sha1": "eb2728acc9f601ba1ee4750804104795524e31fd", - "sha256": "19dk9752cga9dliv8n3sw3lxk41kamz6vxmkn0v6qxx14ll80mgi" + "sha1": "b2afa2711a9898d9aeb188195edde53c00984543", + "sha256": "16c7r0667pbgljx1p8zmvahv1igcnway1qjqprbn0n4ny1vy2imm" } }, diff --git a/nix/deps/gradle/deps.list b/nix/deps/gradle/deps.list index 17cca30c66..bc54dc1d5c 100644 --- a/nix/deps/gradle/deps.list +++ b/nix/deps/gradle/deps.list @@ -297,8 +297,8 @@ com.facebook.soloader:nativeloader:0.8.2 com.facebook.soloader:soloader:0.8.0 com.facebook.soloader:soloader:0.8.2 com.facebook.yoga:proguard-annotations:1.14.1 -com.github.status-im.status-keycard-java:android:3.0.1 -com.github.status-im.status-keycard-java:lib:3.0.1 +com.github.status-im.status-keycard-java:android:3.0.4 +com.github.status-im.status-keycard-java:lib:3.0.4 com.github.status-im:function:0.0.1 com.github.yalantis:ucrop:2.2.5-native com.googlecode.json-simple:json-simple:1.1 diff --git a/nix/deps/gradle/deps.urls b/nix/deps/gradle/deps.urls index 6a06a4ea37..f45affafa8 100644 --- a/nix/deps/gradle/deps.urls +++ b/nix/deps/gradle/deps.urls @@ -251,8 +251,8 @@ https://repository.sonatype.org/content/groups/sonatype-public-grid/com/facebook https://repository.sonatype.org/content/groups/sonatype-public-grid/com/facebook/flipper/flipper/0.35.0/flipper-0.35.0.pom https://repository.sonatype.org/content/groups/sonatype-public-grid/com/facebook/yoga/proguard-annotations/1.14.1/proguard-annotations-1.14.1.pom https://repository.sonatype.org/content/groups/sonatype-public-grid/com/github/status-im/function/0.0.1/function-0.0.1.pom -https://repository.sonatype.org/content/groups/sonatype-public-grid/com/github/status-im/status-keycard-java/android/3.0.1/android-3.0.1.pom -https://repository.sonatype.org/content/groups/sonatype-public-grid/com/github/status-im/status-keycard-java/lib/3.0.1/lib-3.0.1.pom +https://repository.sonatype.org/content/groups/sonatype-public-grid/com/github/status-im/status-keycard-java/android/3.0.4/android-3.0.4.pom +https://repository.sonatype.org/content/groups/sonatype-public-grid/com/github/status-im/status-keycard-java/lib/3.0.4/lib-3.0.4.pom https://repository.sonatype.org/content/groups/sonatype-public-grid/com/github/yalantis/ucrop/2.2.5-native/ucrop-2.2.5-native.pom https://repository.sonatype.org/content/groups/sonatype-public-grid/org/jetbrains/trove4j/trove4j/20160824/trove4j-20160824.pom https://repo.maven.apache.org/maven2/commons-cli/commons-cli/1.2/commons-cli-1.2.pom diff --git a/package.json b/package.json index 83d640801f..64f86d40f8 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "react-native-screens": "^2.10.1", "react-native-shake": "^3.3.1", "react-native-splash-screen": "^3.2.0", - "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#v2.5.23", + "react-native-status-keycard": "git+https://github.com/status-im/react-native-status-keycard.git#v2.5.27", "react-native-svg": "^9.8.4", "react-native-touch-id": "^4.4.1", "react-native-webview": "git+https://github.com/status-im/react-native-webview.git#v10.9.2", diff --git a/src/status_im/keycard/real_keycard.cljs b/src/status_im/keycard/real_keycard.cljs index ab4f416bc2..adf1a35ef6 100644 --- a/src/status_im/keycard/real_keycard.cljs +++ b/src/status_im/keycard/real_keycard.cljs @@ -59,9 +59,6 @@ (defn get-application-info [{:keys [pairing on-success on-failure]}] - ;; NOTE: if the card fails to get application info in the middle of the call - ;; it doesn't returns a Tar was lost. error properly - ;; https://github.com/status-im/react-native-status-keycard/blob/master/android/src/main/java/im/status/ethereum/keycard/SmartCard.java#L235 (.. status-keycard (getApplicationInfo (str pairing)) @@ -69,10 +66,7 @@ (let [info (-> response (js->clj :keywordize-keys true) (update :key-uid ethereum/normalized-hex))] - (if (and pairing (nil? (:pin-retry-counter info))) - (on-failure (clj->js {:message "Tag was lost." - :code "android.nfc.TagLostException"})) - (on-success info))))) + (on-success info)))) (catch on-failure))) (defn install-applet [{:keys [on-success on-failure]}] diff --git a/yarn.lock b/yarn.lock index d351681aba..2375ba0ffe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6684,9 +6684,9 @@ react-native-splash-screen@^3.2.0: resolved "https://registry.yarnpkg.com/react-native-splash-screen/-/react-native-splash-screen-3.2.0.tgz#d47ec8557b1ba988ee3ea98d01463081b60fff45" integrity sha512-Ls9qiNZzW/OLFoI25wfjjAcrf2DZ975hn2vr6U9gyuxi2nooVbzQeFoQS5vQcbCt9QX5NY8ASEEAtlLdIa6KVg== -"react-native-status-keycard@git+https://github.com/status-im/react-native-status-keycard.git#v2.5.23": - version "2.5.17" - resolved "git+https://github.com/status-im/react-native-status-keycard.git#ff570d4720723fcf9ad2a844cb4b269d812c4f23" +"react-native-status-keycard@git+https://github.com/status-im/react-native-status-keycard.git#v2.5.27": + version "2.5.27" + resolved "git+https://github.com/status-im/react-native-status-keycard.git#612b74b203de0fc9ba915cbdd28b868b61f7d0f3" react-native-svg@^9.8.4: version "9.13.6"