diff --git a/.pnp.cjs b/.pnp.cjs index 992ed9528..54028c654 100755 --- a/.pnp.cjs +++ b/.pnp.cjs @@ -8721,7 +8721,7 @@ const RAW_RUNTIME_STATE = ["@keepkey/device-protocol", "npm:7.10.2"],\ ["@keepkey/hdwallet-core", "npm:1.53.16"],\ ["@keepkey/hdwallet-keepkey", "npm:1.53.16"],\ - ["@keepkey/keepkey-sdk", "npm:0.2.52"],\ + ["@keepkey/keepkey-sdk", "workspace:packages/keepkey-sdk"],\ ["@types/create-hash", "npm:1.2.2"],\ ["@types/crypto-js", "npm:4.1.1"],\ ["@types/google-protobuf", "npm:3.15.6"],\ @@ -8761,7 +8761,7 @@ const RAW_RUNTIME_STATE = ["@keepkey/device-protocol", "npm:7.10.2"],\ ["@keepkey/hdwallet-core", "npm:1.53.16"],\ ["@keepkey/hdwallet-keepkey", "npm:1.53.16"],\ - ["@keepkey/keepkey-sdk", "npm:0.2.52"],\ + ["@keepkey/keepkey-sdk", "workspace:packages/keepkey-sdk"],\ ["@types/create-hash", "npm:1.2.2"],\ ["@types/crypto-js", "npm:4.1.1"],\ ["@types/google-protobuf", "npm:3.15.6"],\ @@ -8811,13 +8811,6 @@ const RAW_RUNTIME_STATE = }]\ ]],\ ["@keepkey/keepkey-sdk", [\ - ["npm:0.2.52", {\ - "packageLocation": "./.yarn/cache/@keepkey-keepkey-sdk-npm-0.2.52-b317817dae-53d90c0ea6.zip/node_modules/@keepkey/keepkey-sdk/",\ - "packageDependencies": [\ - ["@keepkey/keepkey-sdk", "npm:0.2.52"]\ - ],\ - "linkType": "HARD"\ - }],\ ["workspace:packages/keepkey-sdk", {\ "packageLocation": "./packages/keepkey-sdk/",\ "packageDependencies": [\ diff --git a/.yarn/cache/@keepkey-keepkey-sdk-npm-0.2.52-b317817dae-53d90c0ea6.zip b/.yarn/cache/@keepkey-keepkey-sdk-npm-0.2.52-b317817dae-53d90c0ea6.zip deleted file mode 100644 index d5d2d5522..000000000 --- a/.yarn/cache/@keepkey-keepkey-sdk-npm-0.2.52-b317817dae-53d90c0ea6.zip +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1ab4ca08ee45ff00308a3abf48cd0663972042137938ba2ab24f29cc58d2a2b1 -size 295429 diff --git a/packages/hdwallet-keepkey-rest/package.json b/packages/hdwallet-keepkey-rest/package.json index cc50605df..2ddf21e24 100644 --- a/packages/hdwallet-keepkey-rest/package.json +++ b/packages/hdwallet-keepkey-rest/package.json @@ -1,6 +1,6 @@ { "name": "@keepkey/hdwallet-keepkey-rest", - "version": "1.40.41", + "version": "1.40.42", "license": "MIT", "repository": { "type": "git", @@ -28,7 +28,7 @@ }, "dependencies": { "@keepkey/hdwallet-keepkey": "1.53.16", - "@keepkey/keepkey-sdk": "0.2.52", + "@keepkey/keepkey-sdk": "0.2.57", "lodash": "^4.17.21", "semver": "^6.3.0" }, diff --git a/packages/keepkey-desktop-app/src/pages/Browser/Browser.tsx b/packages/keepkey-desktop-app/src/pages/Browser/Browser.tsx index 61eaf38b7..4825cd6f7 100644 --- a/packages/keepkey-desktop-app/src/pages/Browser/Browser.tsx +++ b/packages/keepkey-desktop-app/src/pages/Browser/Browser.tsx @@ -103,7 +103,7 @@ const checkIfSSDApp = (currentUrl: string) => { if (!kkDesktopApiKey || !localWalletDeviceId) return ipcListeners.getSSAutoLogin(localWalletDeviceId, kkDesktopApiKey).then( - injection => { + (injection: any) => { console.log('INJECTION', injection) webview.executeJavaScript(injection) }, @@ -114,12 +114,12 @@ const checkIfSSDApp = (currentUrl: string) => { } }) .catch(console.error) - } else { - if (kkDesktopApiKey) - ipcListeners + } + + if (kkDesktopApiKey) + ipcListeners .getBrowserInjection(kkDesktopApiKey) .then((injection: any) => webview.executeJavaScript(injection)) - } } export const Browser = () => { diff --git a/packages/keepkey-desktop/package.json b/packages/keepkey-desktop/package.json index 3085c38ae..1ece5e97d 100644 --- a/packages/keepkey-desktop/package.json +++ b/packages/keepkey-desktop/package.json @@ -1,6 +1,6 @@ { "name": "keepkey-desktop", - "version": "3.0.21", + "version": "3.0.25", "author": { "name": "KeepKey", "email": "support@keepkey.com" diff --git a/yarn.lock b/yarn.lock index 72eab7bc4..52c4fbd63 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5412,7 +5412,7 @@ __metadata: "@keepkey/device-protocol": "npm:^7.10.2" "@keepkey/hdwallet-core": "npm:^1.53.16" "@keepkey/hdwallet-keepkey": "npm:1.53.16" - "@keepkey/keepkey-sdk": "npm:0.2.52" + "@keepkey/keepkey-sdk": "npm:0.2.57" "@types/create-hash": "npm:^1.2.2" "@types/crypto-js": "npm:^4.0.0" "@types/google-protobuf": "npm:^3.15.6" @@ -5485,14 +5485,7 @@ __metadata: languageName: node linkType: hard -"@keepkey/keepkey-sdk@npm:0.2.52": - version: 0.2.52 - resolution: "@keepkey/keepkey-sdk@npm:0.2.52" - checksum: 10/53d90c0ea686d84ab90ee60fe800447548d42744737533a97e119ea9650aed196d52d876b7c0816da59d826ecc6bd416aee3c93af4e7cbd2d8922e7caa471d73 - languageName: node - linkType: hard - -"@keepkey/keepkey-sdk@workspace:*, @keepkey/keepkey-sdk@workspace:packages/keepkey-sdk": +"@keepkey/keepkey-sdk@npm:0.2.57, @keepkey/keepkey-sdk@workspace:*, @keepkey/keepkey-sdk@workspace:packages/keepkey-sdk": version: 0.0.0-use.local resolution: "@keepkey/keepkey-sdk@workspace:packages/keepkey-sdk" dependencies: