Skip to content

Commit 17772c9

Browse files
authored
Merge pull request #644 from enkryptcom/feat/safari-support-kr-fix
devop: keyring lock issue
2 parents 9c3541f + 136eeb7 commit 17772c9

7 files changed

Lines changed: 10 additions & 10 deletions

File tree

packages/extension/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@enkryptcom/extension",
3-
"version": "2.4.4",
3+
"version": "2.4.5",
44
"private": true,
55
"type": "module",
66
"scripts": {

packages/extension/src/libs/utils/selective-wasm.ts

Lines changed: 0 additions & 6 deletions
This file was deleted.

packages/extension/src/manifest/manifest.safari.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,10 @@ const safariManifest = {
1717
default_popup: 'action.html',
1818
},
1919
host_permissions: ['http://*/*', 'https://*/*'],
20+
content_security_policy: {
21+
extension_pages:
22+
"script-src 'self' 'unsafe-eval' 'wasm-unsafe-eval'; object-src 'self'",
23+
},
2024
permissions: [
2125
'storage',
2226
'unlimitedStorage',

packages/extension/src/ui/action/App.vue

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,11 @@ onMounted(async () => {
416416
const isInitialized = await kr.isInitialized();
417417
if (isInitialized) {
418418
const _isLocked = await isKeyRingLocked();
419+
if (__IS_SAFARI__) {
420+
setInterval(() => {
421+
isKeyRingLocked(); // keepalive safari action window
422+
}, 1000 * 5);
423+
}
419424
if (_isLocked) {
420425
router
421426
.push({ name: 'lock-screen' })

packages/extension/src/ui/action/main.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import App from './App.vue';
33
import router from './router';
44
import * as filters from './utils/filters';
55
import Vue3Lottie from 'vue3-lottie';
6-
import '@/libs/utils/selective-wasm';
76

87
global.WeakMap = WeakMap;
98

packages/extension/src/ui/onboard/main.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import App from './App.vue';
44
import { createRouter, createWebHashHistory } from 'vue-router';
55
import routes from './routes';
66
import * as filters from '@action/utils/filters';
7-
import '@/libs/utils/selective-wasm';
87

98
global.WeakMap = WeakMap;
109

packages/extension/src/ui/provider-pages/main.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { createRouter, createWebHashHistory } from 'vue-router';
44
import routes from './routes';
55
import * as filters from '@action/utils/filters';
66
import Vue3Lottie from 'vue3-lottie';
7-
import '@/libs/utils/selective-wasm';
87

98
global.WeakMap = WeakMap;
109

0 commit comments

Comments
 (0)