Add describe method

2023-12-19 19:15:22 +03:00
159 changed files with 1558 additions and 9353 deletions
--- a/.env
+++ b/.env
@ -2,6 +2,4 @@
 # change if you're using a different noauthd server
 REACT_APP_WEB_PUSH_PUBKEY=BNW_39YcKbV4KunFxFhvMW5JUs8AljfFnGUeZpaerO-gwCoWyQat5ol0xOGB8MLaqqCbz0iptd2Qv3SToSGynMk
 #REACT_APP_NOAUTHD_URL=http://localhost:8000
-REACT_APP_NOAUTHD_URL=https://noauthd.nsec.app
-REACT_APP_DOMAIN=nsec.app
-REACT_APP_RELAY=wss://relay.nsec.app
+REACT_APP_NOAUTHD_URL=https://noauthd.login.nostrapps.org
--- a/.prettierignore
+++ b/.prettierignore
@ -1 +0,0 @@
-node_modules/
--- a/.prettierrc
+++ b/.prettierrc
@ -1,9 +0,0 @@
-{
-  "trailingComma": "es5",
-  "tabWidth": 2,
-  "semi": false,
-  "singleQuote": true,
-  "printWidth": 120,
-  "bracketSpacing": true,
-  "endOfLine": "lf"
-}
--- a/23
+++ b/23
@ -0,0 +1,23 @@
+Noauth - Nostr key manager
+--------------------------
+
+THIS IS BETA SOFTWARE, DON'T USE WITH REAL KEYS!
+
+This is a web-based nostr signer app, it uses nip46 signer
+running inside a service worker, if SW is not running -
+a noauthd server sends a push message and wakes SW up. Also,
+keys can be saved to server and fetched later in an end-to-end
+encrypted way. Keys are encrypted with user-defined password, 
+a good key derivation function is used to resist brute force.
+
+This app works in Chrome on desktop and Android out of the box,
+try it with snort.social (use bunker:/... string as 'login string').
+
+On iOS web push notifications are still experimental, eventually
+it will work on iOS out of the box too.
+
+It works across devices, but that's unreliable, especially if
+signer is on mobile - if smartphone is locked then service worker might
+not wake up. Thanks to cloud sync/recovery of keys users can import 
+their keys into this app on every device and then it works well.
+
--- a/README.md
+++ b/README.md
@ -1,95 +0,0 @@
-Noauth - Nostr key manager
--------------------------
-
-Nsec.app is a web app to store your Nostr keys 
-and provide remote access to keys using nip46.
-
-Features:
- non-custodial store for your keys
- can store many keys
- provides nip46 access to apps
- permission management for connected apps
- works in any browser or platform
- background operation even if app tab is closed
- cloud e2ee sync for your keys 
- support for OAuth-like signin flow
-
-
-How it works
------------
-
-This is a web-based nostr signer app, it uses nip46 signer
-running inside a service worker, if SW is not running -
-a noauthd server sends a push message and wakes SW up. Also,
-keys can be saved to server and fetched later in an end-to-end
-encrypted way. Keys are encrypted with user-defined password, 
-a good key derivation function is used to resist brute force.
-
-It works across devices, but that's unreliable, especially if
-signer is on mobile - if your phone is locked then service worker might
-not wake up. Thanks to cloud sync/recovery of keys users can import 
-their keys into this app on every device and then it works well.
-
-How to self-host
----------------
-
-This app is non-custodial, so there isn't much need for 
-self-hosting. However, if you'd like to run your own version of
-it, here is how to do it:
-
-Create web push keys (https://github.com/web-push-libs/web-push):
-```
-npm install web-push;
-web-push generate-vapid-keys --json
-```
-
-Edit .end in noauth:
-```
-REACT_APP_WEB_PUSH_PUBKEY=web push public key, 
-REACT_APP_NOAUTHD_URL=address of the noauthd server (see below)
-REACT_APP_DOMAIN=domain name of your bunker (i.e. nsec.app)
-REACT_APP_RELAY=relay that you'll use, can use wss://relay.nsec.app - don't use public general-purpose relays, you'll hit rate limits very fast
-```
-
-Then do:
-```
-npm install; 
-npm run build; 
-```
-The app is in the `build` folder. 
-
-To run the noauthd server (https://github.com/nostrband/noauthd),
-edit .env in noauthd:
-```
-PUSH_PUBKEY=web push public key, same as above
-PUSH_SECRET=web push private key that you generated above
-ORIGIN=address of the server itself, like http://localhost:8000
-DATABASE_URL="file:./prod.db"
-BUNKER_NSEC=nsec of the bunker (needed for create_account methods)
-BUNKER_RELAY="wss://relay.nsec.app" - same as above
-BUNKER_DOMAIN="nsec.app" - same as above
-BUNKER_ORIGIN=where noauth is hosted 
-```
-
-Then init the database and launch: 
-```
-npx prisma migrate deploy
-node -r dotenv/config src/index.js dotenv_config_path=.env
-```
-
-TODO
----
-
- Show details of requested operations
- Publish a profile for new sign ups
- Sync processed reqs across devices
- Sync connected apps and perms across devices
- Sync app activity across devices
- Group apps by domain
- Encrypt local nsec in Safari
- Add WebAuthn to the mix
- Add LN address to new profiles 
- Confirm relay/contact list pruning requests
- Transfer/change nip05 name
- Better notifs with activity summaries
- How to send auth_url to new device if all other devices are down?
--- a/config-overrides.js
+++ b/config-overrides.js
@ -1,39 +1,25 @@
-const webpack = require('webpack')
-const path = require('path')
-const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin')
+const webpack = require('webpack');
+const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');

 module.exports = function override(config) {
-	const fallback = config.resolve.fallback || {}
-	Object.assign(fallback, {
-		crypto: require.resolve('crypto-browserify'),
-		stream: require.resolve('stream-browserify'),
-		assert: require.resolve('assert'),
-		http: require.resolve('stream-http'),
-		https: require.resolve('https-browserify'),
-		os: require.resolve('os-browserify'),
-		url: require.resolve('url'),
-	})
-	config.resolve.fallback = fallback
-	config.plugins = (config.plugins || []).concat([
-		new webpack.ProvidePlugin({
-			process: 'process/browser',
-			Buffer: ['buffer', 'Buffer'],
-		}),
-	])
-	config.module.rules.unshift({
-		test: /\.m?js$/,
-		resolve: {
-			fullySpecified: false, // disable the behavior
-		},
-	})
-	// turns off the plugin that forbids importing from node_modules for the above-mentioned stuff
-	config.resolve.plugins = config.resolve.plugins.filter((plugin) => {
-		return !(plugin instanceof ModuleScopePlugin)
-	})
-
-	config.resolve.alias = {
-		'@': path.resolve(__dirname, 'src'),
-	}
-
-	return config
+    const fallback = config.resolve.fallback || {};
+    Object.assign(fallback, {
+        "crypto": require.resolve("crypto-browserify"),
+        "stream": require.resolve("stream-browserify"),
+        "assert": require.resolve("assert"),
+        "http": require.resolve("stream-http"),
+        "https": require.resolve("https-browserify"),
+        "os": require.resolve("os-browserify"),
+        "url": require.resolve("url")
+    })
+    config.resolve.fallback = fallback;
+    config.plugins = (config.plugins || []).concat([
+        new webpack.ProvidePlugin({
+            process: 'process/browser',
+            Buffer: ['buffer', 'Buffer']
+        })
+    ])
+    // turns off the plugin that forbids importing from node_modules for the above-mentioned stuff
+    config.resolve.plugins = config.resolve.plugins.filter(plugin => !(plugin instanceof ModuleScopePlugin));
+    return config;
 }
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -3,39 +3,21 @@
  "version": "0.1.0",
  "private": true,
  "dependencies": {
-    "@emotion/react": "^11.11.1",
-    "@emotion/styled": "^11.11.0",
-    "@hookform/resolvers": "^3.3.4",
-    "@mui/icons-material": "^5.14.19",
-    "@mui/material": "^5.14.20",
-    "@nostr-dev-kit/ndk": "^2.4.0",
-    "@reduxjs/toolkit": "^2.0.1",
+    "@nostr-dev-kit/ndk": "^2.0.5",
    "@testing-library/jest-dom": "^5.17.0",
    "@testing-library/react": "^13.4.0",
    "@testing-library/user-event": "^13.5.0",
    "@types/jest": "^27.5.2",
    "@types/node": "^17.0.45",
    "@types/react": "^18.2.38",
-    "@types/react-copy-to-clipboard": "^5.0.7",
    "@types/react-dom": "^18.2.17",
    "crypto": "^1.0.1",
-    "date-fns": "^3.3.1",
    "dexie": "^3.2.4",
-    "dexie-react-hooks": "^1.1.7",
-    "lodash.isequal": "^4.5.0",
-    "memoize-one": "^6.0.0",
    "nostr-tools": "^1.17.0",
-    "notistack": "^3.0.1",
    "react": "^18.2.0",
-    "react-copy-to-clipboard": "^5.1.0",
    "react-dom": "^18.2.0",
-    "react-hook-form": "^7.50.0",
-    "react-redux": "^9.0.3",
-    "react-router-dom": "^6.20.1",
    "react-scripts": "5.0.1",
-    "redux-persist": "^6.0.0",
    "typescript": "^5.3.2",
-    "use-debounce": "^10.0.0",
    "web-vitals": "^2.1.4",
    "workbox-background-sync": "^6.6.0",
    "workbox-broadcast-update": "^6.6.0",
@ -48,8 +30,7 @@
    "workbox-range-requests": "^6.6.0",
    "workbox-routing": "^6.6.0",
    "workbox-strategies": "^6.6.0",
-    "workbox-streams": "^6.6.0",
-    "yup": "^1.3.3"
+    "workbox-streams": "^6.6.0"
  },
  "overrides": {
    "react-scripts": {
@ -60,9 +41,7 @@
    "start": "react-app-rewired start",
    "build": "react-app-rewired build",
    "test": "react-app-rewired test",
-    "eject": "react-app-rewired eject",
-    "serve": "npm run build && serve -s build",
-    "format": "npx prettier --write src"
+    "eject": "react-app-rewired eject"
  },
  "eslintConfig": {
    "extends": [
@ -83,17 +62,13 @@
    ]
  },
  "devDependencies": {
-    "@types/lodash.isequal": "^4.5.8",
    "assert": "^2.1.0",
    "buffer": "^6.0.3",
    "crypto-browserify": "^3.12.0",
-    "customize-cra": "^1.0.0",
    "https-browserify": "^1.0.0",
    "os-browserify": "^0.3.0",
-    "prettier": "^3.2.5",
    "process": "^0.11.10",
    "react-app-rewired": "^2.2.1",
-    "serve": "^14.2.1",
    "stream-browserify": "^3.0.0",
    "stream-http": "^3.2.0",
    "url": "^0.11.3"
--- a/public/android-chrome-192x192.png
+++ b/public/android-chrome-192x192.png
--- a/public/android-chrome-512x512.png
+++ b/public/android-chrome-512x512.png
--- a/public/apple-touch-icon.png
+++ b/public/apple-touch-icon.png
--- a/public/favicon-16x16.png
+++ b/public/favicon-16x16.png
--- a/public/favicon-32x32.png
+++ b/public/favicon-32x32.png
--- a/public/favicon.ico
+++ b/public/favicon.ico
--- a/public/index.html
+++ b/public/index.html
@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
  <head>
    <meta charset="utf-8" />
@ -6,16 +6,12 @@
    <meta name="viewport" content="width=device-width, initial-scale=1" />
    <meta name="theme-color" content="#000000" />
    <meta name="description" content="Web site created using create-react-app" />
-    <link rel="apple-touch-icon" sizes="180x180" href="%PUBLIC_URL%/apple-touch-icon.png" />
-    <link rel="icon" type="image/png" sizes="32x32" href="%PUBLIC_URL%/favicon-32x32.png" />
-    <link rel="icon" type="image/png" sizes="16x16" href="%PUBLIC_URL%/favicon-16x16.png" />
+    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <!--
+      manifest.json provides metadata used when your web app is installed on a
+      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
+    -->
    <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <link rel="preconnect" href="https://fonts.googleapis.com" />
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
-    <link
-      href="https://fonts.googleapis.com/css2?family=Inter:wght@200;300;400;500;600;700&display=swap"
-      rel="stylesheet"
-    />
    <!--
      Notice the use of %PUBLIC_URL% in the tags above.
      It will be replaced with the URL of the `public` folder during the build.
@ -25,7 +21,7 @@
      work correctly both with client-side routing and a non-root public URL.
      Learn how to configure a non-root public URL by running `npm run build`.
    -->
-    <title>Nsec.app</title>
+    <title>Noauth</title>
  </head>
  <body>
    <noscript>You need to enable JavaScript to run this app.</noscript>
--- a/public/logo192.png
+++ b/public/logo192.png
--- a/public/logo512.png
+++ b/public/logo512.png
--- a/public/manifest.json
+++ b/public/manifest.json
@ -1,20 +1,25 @@
 {
-  "name": "Nsec.app",
-  "short_name": "Nsec.app - Nostr key management tool",
-  "start_url": ".",
+  "short_name": "Noauth",
+  "name": "Noauth Nostr key manager",
  "icons": [
    {
-      "src": "/android-chrome-192x192.png",
-      "sizes": "192x192",
-      "type": "image/png"
+      "src": "favicon.ico",
+      "sizes": "64x64 32x32 24x24 16x16",
+      "type": "image/x-icon"
    },
    {
-      "src": "/android-chrome-512x512.png",
-      "sizes": "512x512",
-      "type": "image/png"
+      "src": "logo192.png",
+      "type": "image/png",
+      "sizes": "192x192"
+    },
+    {
+      "src": "logo512.png",
+      "type": "image/png",
+      "sizes": "512x512"
    }
  ],
+  "start_url": ".",
+  "display": "standalone",
  "theme_color": "#000000",
-  "background_color": "#ffffff",
-  "display": "standalone"
+  "background_color": "#ffffff"
 }
--- a/src/App.css
+++ b/src/App.css
@ -0,0 +1,3 @@
+.App {
+  text-align: center;
+}
--- a/src/App.test.tsx
+++ b/src/App.test.tsx
@ -1,9 +1,9 @@
-import React from 'react'
-import { render, screen } from '@testing-library/react'
-import App from './App'
+import React from 'react';
+import { render, screen } from '@testing-library/react';
+import App from './App';

 test('renders learn react link', () => {
-  render(<App />)
-  const linkElement = screen.getByText(/learn react/i)
-  expect(linkElement).toBeInTheDocument()
-})
+  render(<App />);
+  const linkElement = screen.getByText(/learn react/i);
+  expect(linkElement).toBeInTheDocument();
+});
--- a/src/App.tsx
+++ b/src/App.tsx
@ -1,91 +1,229 @@
-import { DbKey, dbi } from './modules/db'
-import { useCallback, useEffect, useState } from 'react'
-import { swicOnRender } from './modules/swic'
-import { useAppDispatch } from './store/hooks/redux'
-import { setApps, setKeys, setPending, setPerms } from './store/reducers/content.slice'
-import AppRoutes from './routes/AppRoutes'
-import { fetchProfile, ndk } from './modules/nostr'
-import { ModalInitial } from './components/Modal/ModalInitial/ModalInitial'
-import { ModalImportKeys } from './components/Modal/ModalImportKeys/ModalImportKeys'
-import { ModalSignUp } from './components/Modal/ModalSignUp/ModalSignUp'
-import { ModalLogin } from './components/Modal/ModalLogin/ModalLogin'
+import './App.css';
+import { nip19 } from 'nostr-tools'
+import { DbApp, DbKey, DbPending, DbPerm, dbi } from './db';
+import { useEffect, useState } from 'react';
+import { swicCall, swicOnRender } from './swic';
+import { NIP46_RELAYS } from './consts';

 function App() {
+
  const [render, setRender] = useState(0)
-  const dispatch = useAppDispatch()
+  const [keys, setKeys] = useState<DbKey[]>([])
+  const [apps, setApps] = useState<DbApp[]>([])
+  const [perms, setPerms] = useState<DbPerm[]>([])
+  const [pending, setPending] = useState<DbPending[]>([])

-  const [isConnected, setIsConnected] = useState(false)
-
-  const load = useCallback(async () => {
-    const keys: DbKey[] = await dbi.listKeys()
-    // console.log(keys, 'keys')
-
-    dispatch(setKeys({ keys }))
-    const loadProfiles = async () => {
-      const newKeys = []
-
-      for (const key of keys) {
-        // make it async
-        const response = await fetchProfile(key.npub)
-        if (!response) {
-          newKeys.push(key)
-        } else {
-          newKeys.push({ ...key, profile: response })
-        }
-      }
-
-      dispatch(setKeys({ keys: newKeys }))
-    }
-    // async load to avoid blocking main code below
-    loadProfiles()
+  const load = async () => {
+    const keys = await dbi.listKeys()
+    setKeys(keys)

    const apps = await dbi.listApps()
-    dispatch(
-      setApps({
-        apps,
-      })
-    )
+    setApps(apps)

    const perms = await dbi.listPerms()
-    dispatch(setPerms({ perms }))
+    setPerms(perms)

    const pending = await dbi.listPending()
-    dispatch(setPending({ pending }))
+    const firstPending = new Map<string, DbPending>()
+    for (const p of pending) {
+      if (firstPending.get(p.appNpub)) continue
+      firstPending.set(p.appNpub, p)
+    }
+
+    // @ts-ignore
+    setPending([...firstPending.values()])

    // rerender
-    //		setRender((r) => r + 1)
-
-    // if (!keys.length) handleOpen(MODAL_PARAMS_KEYS.INITIAL)
-    // eslint-disable-next-line
-  }, [dispatch])
+    setRender(r => r + 1)
+  }

  useEffect(() => {
-    if (isConnected) load()
-  }, [render, isConnected, load])
+    load()
+  }, [render])

-  useEffect(() => {
-    ndk.connect().then(() => {
-      console.log('NDK connected')
-      setIsConnected(true)
+  async function log(s: string) {
+    const log = document.getElementById('log')
+    if (log) log.innerHTML = s
+  }
+
+  async function askNotificationPermission() {
+    return new Promise<void>((ok, rej) => {
+      // Let's check if the browser supports notifications
+      if (!("Notification" in window)) {
+        log("This browser does not support notifications.")
+        rej()
+      } else {
+        Notification.requestPermission().then(() => {
+          log("notifications perm" + Notification.permission)
+          if (Notification.permission === 'granted') ok()
+          else rej()
+        });
+      }
    })
-    // eslint-disable-next-line
-  }, [])
+  }
+
+  async function enableNotifications() {
+    await askNotificationPermission()
+    try {
+      const r = await swicCall('enablePush')
+      if (!r) {
+        log(`Failed to enable push subscription`)
+        return
+      }
+
+      log(`enabled!`)
+    } catch (e) {
+      log(`Error: ${e}`)
+    }
+  }
+
+  async function call(cb: () => any) {
+    try {
+      return await cb()
+    } catch (e) {
+      log(`Error: ${e}`)
+    }
+  }
+
+  async function generateKey() {
+    call(async () => {
+      const k: any = await swicCall('generateKey');
+      log("New key " + k.npub)
+    })
+  }
+
+  async function confirmPending(id: string, allow: boolean, remember: boolean) {
+    call(async () => {
+      await swicCall('confirm', id, allow, remember);
+      console.log("confirmed", id, allow, remember)
+    })
+  }
+
+  async function deleteApp(appNpub: string) {
+    call(async () => {
+      await swicCall('deleteApp', appNpub);
+      log('App deleted')
+    })
+  }
+
+  async function deletePerm(id: string) {
+    call(async () => {
+      await swicCall('deletePerm', id);
+      log('Perm deleted')
+    })
+  }
+
+  async function saveKey(npub: string) {
+    call(async () => {
+      // @ts-ignore
+      const passphrase = document.getElementById(`passphrase${npub}`)?.value
+      await swicCall('saveKey', npub, passphrase)
+      log('Key saved')
+    })
+  }
+
+  async function importKey() {
+    call(async () => {
+      // @ts-ignore
+      const nsec = document.getElementById(`nsec`)?.value
+      await swicCall('importKey', nsec)
+      log('Key imported')
+    })
+  }
+
+  async function fetchNewKey() {
+    call(async () => {
+      // @ts-ignore
+      const npub = document.getElementById('npub')?.value
+      // @ts-ignore
+      const passphrase = document.getElementById('passphrase')?.value
+      console.log("fetch", npub, passphrase)
+      const k: any = await swicCall('fetchKey', npub, passphrase)
+      log("Fetched " + k.npub)
+    })
+  }

  // subscribe to updates from the service worker
  swicOnRender(() => {
-    console.log('render')
-    setRender((r) => r + 1)
+    console.log("render")
+    setRender(r => r + 1)
  })

  return (
-    <>
-      <AppRoutes />
-      <ModalInitial />
-      <ModalImportKeys />
-      <ModalSignUp />
-      <ModalLogin />
-    </>
-  )
+    <div className="App">
+      <header className="App-header">
+        Nostr Login
+      </header>
+      <div>
+        <h4>Keys:</h4>
+        {keys.map((k) => {
+          const { data: pubkey } = nip19.decode(k.npub)
+          const str = `bunker://${pubkey}?relay=${NIP46_RELAYS[0]}`
+          return (
+            <div key={k.npub} style={{ marginBottom: "10px" }}>
+              {k.npub}
+              <div>{str}</div>
+              <div>
+                <input id={`passphrase${k.npub}`} placeholder='save password' />
+                <button onClick={() => saveKey(k.npub)}>save</button>
+              </div>
+            </div>
+          )
+        })}
+
+<div>
+          <button onClick={generateKey}>generate key</button>
+        </div>
+        <div>
+          <input id='nsec' placeholder='nsec' />
+          <button onClick={importKey}>import key (DANGER!)</button>
+        </div>
+        <div>
+          <input id='npub' placeholder='npub' />
+          <input id='passphrase' placeholder='password' />
+          <button onClick={fetchNewKey}>fetch key</button>
+        </div>
+        <hr />
+
+        <h4>Connected apps:</h4>
+        {apps.map((a) => (
+          <div key={a.npub} style={{ marginTop: "10px" }}>
+            <div>
+              {a.npub} =&gt; {a.appNpub}
+              <button onClick={() => deleteApp(a.appNpub)}>x</button>
+            </div>
+            <h5>Perms:</h5>
+            {perms.filter(p => p.appNpub === a.appNpub).map(p => (
+              <div key={p.id}>
+                {p.perm}: {p.value}
+                <button onClick={() => deletePerm(p.id)}>x</button>
+              </div>
+            ))}
+            <hr />
+          </div>
+        ))}
+
+        <h4>Pending requests:</h4>
+        {pending.map((p) => (
+          <div key={p.id}>
+            {p.appNpub} =&gt; {p.npub} ({p.method})
+            <button onClick={() => confirmPending(p.id, true, false)}>yes</button>
+            <button onClick={() => confirmPending(p.id, false, false)}>no</button>
+            <button onClick={() => confirmPending(p.id, true, true)}>yes all</button>
+            <button onClick={() => confirmPending(p.id, false, true)}>no all</button>
+          </div>
+        ))}
+        <hr />
+
+        <div>
+          <button onClick={enableNotifications}>enable background signing</button>
+        </div>
+        <div>
+          <textarea id='log'></textarea>
+        </div>
+      </div>
+    </div>
+  );
 }

-export default App
+export default App;
--- a/src/assets/icons/add-image.svg
+++ b/src/assets/icons/add-image.svg
@ -1,3 +0,0 @@
-<svg width="26" height="26" viewBox="0 0 26 26" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M25 13V16.72C25 19.4083 25 20.7524 24.4768 21.7792C24.0166 22.6823 23.2823 23.4166 22.3792 23.8768C21.3524 24.4 20.0083 24.4 17.32 24.4H8.68C5.99175 24.4 4.64762 24.4 3.62085 23.8768C2.71767 23.4166 1.98336 22.6823 1.52317 21.7792C1 20.7524 1 19.4083 1 16.72V10.48C1 7.79175 1 6.44763 1.52317 5.42085C1.98336 4.51767 2.71767 3.78337 3.62085 3.32317C4.64762 2.80001 5.99175 2.80001 8.68 2.80001H13.6M21.4 8.80001V1.60001M17.8 5.20001H25M17.8 13.6C17.8 16.251 15.651 18.4 13 18.4C10.349 18.4 8.2 16.251 8.2 13.6C8.2 10.949 10.349 8.80001 13 8.80001C15.651 8.80001 17.8 10.949 17.8 13.6Z" stroke="white" stroke-opacity="0.66" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/src/assets/icons/checked-light.svg
+++ b/src/assets/icons/checked-light.svg
@ -1,4 +0,0 @@
-<svg width="26" height="26" viewBox="0 0 26 26" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="1" width="24" height="24" rx="8" stroke="white" stroke-opacity="0.33" stroke-width="1.4"/>
-<path d="M19 9L11 17L7 13" stroke="white" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/src/assets/icons/checked.svg
+++ b/src/assets/icons/checked.svg
@ -1,4 +0,0 @@
-<svg width="26" height="26" viewBox="0 0 26 26" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="1" width="24" height="24" rx="8" stroke="black" stroke-opacity="0.33" stroke-width="1.4"/>
-<path d="M19 9L11 17L7 13" stroke="black" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/src/assets/icons/checkmark.svg
+++ b/src/assets/icons/checkmark.svg
@ -1,3 +0,0 @@
-<svg width="14" height="10" viewBox="0 0 14 10" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M13 1L5 9L1 5" stroke="#47A66D" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/src/assets/icons/copy.svg
+++ b/src/assets/icons/copy.svg
@ -1,3 +0,0 @@
-<svg width="18" height="19" viewBox="0 0 18 19" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.2 12.7V14.94C12.2 15.8361 12.2 16.2841 12.0256 16.6264C11.8722 16.9274 11.6274 17.1722 11.3264 17.3256C10.9841 17.5 10.5361 17.5 9.64 17.5H3.56C2.66392 17.5 2.21587 17.5 1.87362 17.3256C1.57256 17.1722 1.32779 16.9274 1.17439 16.6264C1 16.2841 1 15.8361 1 14.94V8.86C1 7.96392 1 7.51587 1.17439 7.17362C1.32779 6.87256 1.57256 6.62779 1.87362 6.47439C2.21587 6.3 2.66392 6.3 3.56 6.3H5.8M8.36 12.7H14.44C15.3361 12.7 15.7841 12.7 16.1264 12.5256C16.4274 12.3722 16.6722 12.1274 16.8256 11.8264C17 11.4841 17 11.0361 17 10.14V4.06C17 3.16392 17 2.71587 16.8256 2.37362C16.6722 2.07256 16.4274 1.82779 16.1264 1.67439C15.7841 1.5 15.3361 1.5 14.44 1.5H8.36C7.46392 1.5 7.01587 1.5 6.67362 1.67439C6.37256 1.82779 6.12779 2.07256 5.97439 2.37362C5.8 2.71587 5.8 3.16392 5.8 4.06V10.14C5.8 11.0361 5.8 11.4841 5.97439 11.8264C6.12779 12.1274 6.37256 12.3722 6.67362 12.5256C7.01587 12.7 7.46392 12.7 8.36 12.7Z" stroke="currentColor" stroke-opacity="0.83" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/src/assets/icons/logo.svg
+++ b/src/assets/icons/logo.svg
@ -1,3 +0,0 @@
-<svg width="32" height="36" viewBox="0 0 32 36" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M28.2711 21.2958C27.1084 21.2958 26.0749 21.8372 25.4037 22.6797L21.8702 20.6405C22.2577 19.8106 22.4755 18.8846 22.4755 17.908C22.4755 16.9314 22.2577 16.0053 21.8702 15.1755L25.3404 13.1742C26.0091 14.0648 27.0704 14.6442 28.2711 14.6442C30.2949 14.6442 31.9363 13.0047 31.9363 10.9831C31.9363 8.96158 30.2949 7.32208 28.2711 7.32208C26.2472 7.32208 24.6058 8.96158 24.6058 10.9831C24.6058 11.4006 24.6793 11.8003 24.8084 12.1748L21.3028 14.1963C20.2338 12.6732 18.5241 11.6333 16.5635 11.4638V7.274C18.3189 7.00076 19.6639 5.49029 19.6639 3.66104C19.6639 1.6395 18.0225 0 15.9987 0C13.9748 0 12.3334 1.6395 12.3334 3.66104C12.3334 5.49029 13.6784 7.00329 15.4338 7.274V11.4638C13.4733 11.6333 11.7635 12.6732 10.6946 14.1963L7.1889 12.1748C7.31808 11.8003 7.39154 11.4006 7.39154 10.9831C7.39154 8.96158 5.75015 7.32208 3.72629 7.32208C1.70242 7.32208 0.0610352 8.96158 0.0610352 10.9831C0.0610352 13.0047 1.70242 14.6442 3.72629 14.6442C4.92693 14.6442 5.98825 14.0648 6.65697 13.1742L10.1272 15.1755C9.73963 16.0053 9.52179 16.9314 9.52179 17.908C9.52179 18.8846 9.73963 19.8106 10.1272 20.643L6.59364 22.6822C5.9224 21.8397 4.88893 21.2983 3.72629 21.2983C1.70242 21.2983 0.0610352 22.9378 0.0610352 24.9593C0.0610352 26.9809 1.70242 28.6204 3.72629 28.6204C5.75015 28.6204 7.39154 26.9809 7.39154 24.9593C7.39154 24.5039 7.30542 24.0687 7.1509 23.6639L10.6946 21.6196C11.3329 22.5279 12.1992 23.2667 13.2098 23.7499V32.3497C13.2098 32.9721 13.5569 33.8551 13.9799 34.3131L15.2286 35.6565C15.6516 36.1145 16.3457 36.1145 16.7712 35.6565L18.02 34.3131C18.443 33.8551 18.79 32.9721 18.79 32.3497V23.7499C19.8007 23.2667 20.667 22.5304 21.3053 21.6196L24.849 23.6639C24.697 24.0662 24.6083 24.5014 24.6083 24.9593C24.6083 26.9809 26.2497 28.6204 28.2736 28.6204C30.2975 28.6204 31.9388 26.9809 31.9388 24.9593C31.9388 22.9378 30.2975 21.2983 28.2736 21.2983L28.2711 21.2958Z" fill="white"/>
-</svg>
--- a/src/assets/icons/settings.svg
+++ b/src/assets/icons/settings.svg
@ -1,3 +0,0 @@
-<svg width="18" height="18" viewBox="0 0 18 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.69231 2.84615C4.69231 3.86576 3.86576 4.69231 2.84615 4.69231C1.82655 4.69231 1 3.86576 1 2.84615C1 1.82655 1.82655 1 2.84615 1C3.86576 1 4.69231 1.82655 4.69231 2.84615ZM4.69231 2.84615H17M8.99989 9.00001C8.99989 10.0196 9.82644 10.8462 10.846 10.8462C11.8656 10.8462 12.6922 10.0196 12.6922 9.00001C12.6922 7.98041 11.8656 7.15386 10.846 7.15386C9.82644 7.15386 8.99989 7.98041 8.99989 9.00001ZM8.99989 9.00001L1 9M12.7691 9H17M4.69231 15.1538C4.69231 16.1734 3.86576 17 2.84615 17C1.82655 17 1 16.1734 1 15.1538C1 14.1342 1.82655 13.3077 2.84615 13.3077C3.86576 13.3077 4.69231 14.1342 4.69231 15.1538ZM4.69231 15.1538H16.9998" stroke="currentColor" stroke-opacity="0.66" stroke-width="1.4" stroke-linecap="round" stroke-linejoin="round"/>
-</svg>
--- a/src/assets/icons/share.svg
+++ b/src/assets/icons/share.svg
@ -1,3 +0,0 @@
-<svg width="17" height="18" viewBox="0 0 17 18" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M1.81696 16.5088C-0.0157917 12.7124 1.55514 8.37362 3.38789 5.39072L2.86425 4.84837C1.81696 4.03486 2.07878 2.95017 3.38789 2.67899L9.67162 1.05196C10.9807 0.780784 11.7662 1.5943 11.5044 2.95017L9.93344 9.45831C9.67162 10.543 8.62433 10.8142 7.83887 10.0007L7.0534 9.18714C4.697 12.17 3.91154 14.6106 3.38789 16.2376C3.38789 17.0511 2.34061 17.3223 1.81696 16.5088Z" stroke="currentColor" stroke-width="1.4"/>
-</svg>
--- a/src/assets/icons/unchecked-light.svg
+++ b/src/assets/icons/unchecked-light.svg
@ -1,3 +0,0 @@
-<svg width="26" height="26" viewBox="0 0 26 26" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="1" width="24" height="24" rx="8" stroke="white" stroke-opacity="0.33" stroke-width="1.4"/>
-</svg>
--- a/src/assets/icons/unchecked.svg
+++ b/src/assets/icons/unchecked.svg
@ -1,3 +0,0 @@
-<svg width="26" height="26" viewBox="0 0 26 26" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect x="1" y="1" width="24" height="24" rx="8" stroke="black" stroke-opacity="0.33" stroke-width="1.4"/>
-</svg>
--- a/src/assets/index.ts
+++ b/src/assets/index.ts
@ -1,23 +0,0 @@
-import { ReactComponent as AppLogo } from './icons/logo.svg'
-import { ReactComponent as ShareIcon } from './icons/share.svg'
-import { ReactComponent as SettingsIcon } from './icons/settings.svg'
-import { ReactComponent as CopyIcon } from './icons/copy.svg'
-import { ReactComponent as CheckmarkIcon } from './icons/checkmark.svg'
-import { ReactComponent as CheckedIcon } from './icons/checked.svg'
-import { ReactComponent as CheckedLightIcon } from './icons/checked-light.svg'
-import { ReactComponent as UnchekedIcon } from './icons/unchecked.svg'
-import { ReactComponent as UnchekedLightIcon } from './icons/unchecked-light.svg'
-import { default as AddImageIcon } from './icons/add-image.svg'
-
-export {
-  AppLogo,
-  ShareIcon,
-  SettingsIcon,
-  CopyIcon,
-  CheckmarkIcon,
-  CheckedIcon,
-  CheckedLightIcon,
-  UnchekedIcon,
-  UnchekedLightIcon,
-  AddImageIcon,
-}
--- a/src/backend.ts
+++ b/src/backend.ts
@ -0,0 +1,805 @@
+import { generatePrivateKey, getPublicKey, nip19 } from 'nostr-tools'
+import { dbi, DbKey, DbPending, DbPerm } from './db'
+import { Keys } from './keys'
+import NDK, { IEventHandlingStrategy, NDKEvent, NDKNip46Backend, NDKPrivateKeySigner, NDKSigner } from '@nostr-dev-kit/ndk'
+import { NOAUTHD_URL, WEB_PUSH_PUBKEY, NIP46_RELAYS } from './consts'
+import { Nip04 } from './nip04'
+//import { PrivateKeySigner } from './signer'
+
+//const PERF_TEST = false
+
+export interface KeyInfo {
+  npub: string
+  nip05?: string
+  locked: boolean
+}
+
+interface Key {
+  npub: string
+  ndk: NDK
+  backoff: number
+  signer: NDKSigner
+  backend: NDKNip46Backend
+}
+
+interface Pending {
+  req: DbPending
+  cb: (allow: boolean, remember: boolean) => void
+}
+
+interface IAllowCallbackParams {
+  npub: string,
+  id: string,
+  method: string,
+  remotePubkey: string,
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  params?: any
+}
+
+class Nip04KeyHandlingStrategy implements IEventHandlingStrategy {
+
+  private privkey: string
+  private nip04 = new Nip04()
+
+  constructor(privkey: string) {
+    this.privkey = privkey
+  }
+
+  private async getKey(
+    backend: NDKNip46Backend,
+    id: string,
+    remotePubkey: string,
+    recipientPubkey: string
+  ) {
+    if (
+      !(await backend.pubkeyAllowed({
+        id,
+        pubkey: remotePubkey,
+        // @ts-ignore
+        method: "get_nip04_key",
+        params: recipientPubkey,
+      }))
+    ) {
+      backend.debug(`get_nip04_key request from ${remotePubkey} rejected`);
+      return undefined;
+    }
+
+    return Buffer.from(
+      this.nip04.createKey(this.privkey, recipientPubkey)
+    ).toString('hex')
+  }
+
+  async handle(
+    backend: NDKNip46Backend,
+    id: string,
+    remotePubkey: string,
+    params: string[]
+  ) {
+    const [recipientPubkey] = params
+    return await this.getKey(backend, id, remotePubkey, recipientPubkey)
+  }
+}
+
+class DescribeHandlingStrategy implements IEventHandlingStrategy {
+
+  private methods: string[]
+
+  constructor(methods: string[]) {
+    this.methods = [...methods]
+    this.methods.push('describe')
+  }
+
+  async handle(
+    backend: NDKNip46Backend,
+    id: string,
+    remotePubkey: string,
+    params: string[]
+  ) {
+    return JSON.stringify(this.methods)
+  }
+}
+
+class EventHandlingStrategyWrapper implements IEventHandlingStrategy {
+  readonly npub: string
+  readonly method: string
+  private body: IEventHandlingStrategy
+  private allowCb: (params: IAllowCallbackParams) => Promise<boolean>
+
+  constructor(
+    npub: string,
+    method: string,
+    body: IEventHandlingStrategy,
+    allowCb: (params: IAllowCallbackParams) => Promise<boolean>
+  ) {
+    this.npub = npub
+    this.method = method
+    this.body = body
+    this.allowCb = allowCb
+  }
+
+  async handle(
+    backend: NDKNip46Backend,
+    id: string,
+    remotePubkey: string,
+    params: string[]
+  ): Promise<string | undefined> {
+    console.log(Date.now(), "handle", { method: this.method, id, remotePubkey, params })
+    const allow = await this.allowCb({
+      npub: this.npub,
+      id,
+      method: this.method,
+      remotePubkey,
+      params
+    })
+    if (!allow) return undefined
+    return this.body.handle(backend, id, remotePubkey, params)
+      .then(r => {
+        console.log(Date.now(), "req", id, "method", this.method, "result", r)
+        return r
+      })
+  }
+}
+
+export class NoauthBackend {
+  readonly swg: ServiceWorkerGlobalScope
+  private keysModule: Keys
+  private enckeys: DbKey[] = []
+  private keys: Key[] = []
+  private perms: DbPerm[] = []
+  private doneReqIds: string[] = []
+  private confirmBuffer: Pending[] = []
+  private accessBuffer: DbPending[] = []
+  private notifCallback: (() => void) | null = null
+
+  public constructor(swg: ServiceWorkerGlobalScope) {
+    this.swg = swg
+    this.keysModule = new Keys(swg.crypto.subtle)
+
+    const self = this
+    swg.addEventListener('activate', (event) => {
+      console.log("activate")
+    })
+
+    swg.addEventListener('install', (event) => {
+      console.log("install")
+    })
+
+    swg.addEventListener('push', (event) => {
+      console.log("got push", event)
+      self.onPush(event)
+      event.waitUntil(new Promise((ok: any) => {
+        self.setNotifCallback(ok)
+      }))
+    })
+
+    swg.addEventListener('message', (event) => {
+      self.onMessage(event)
+    })
+
+    swg.addEventListener('notificationclick', (event) => {
+      event.notification.close();
+      if (event.action.startsWith("allow:")) {
+        self.confirm(event.action.split(':')[1], true, false)
+      } else if (event.action.startsWith("allow-remember:")) {
+        self.confirm(event.action.split(':')[1], true, true)
+      } else if (event.action.startsWith("disallow:")) {
+        self.confirm(event.action.split(':')[1], false, false)
+      } else {
+
+        event.waitUntil(
+          self.swg.clients.matchAll({ type: "window" })
+            .then((clientList) => {
+              console.log("clients", clientList.length)
+              for (const client of clientList) {
+                console.log("client", client.url)
+                if (new URL(client.url).pathname === "/" && "focus" in client)
+                  return client.focus();
+              }
+              // if (self.swg.clients.openWindow) 
+              //   return self.swg.clients.openWindow("/");
+            }),
+        );
+      }
+    },
+      false // ???
+    );
+
+  }
+
+  public async start() {
+    this.enckeys = await dbi.listKeys()
+    console.log("started encKeys", this.listKeys())
+    this.perms = await dbi.listPerms()
+    console.log("started perms", this.perms)
+
+    const sub = await this.swg.registration.pushManager.getSubscription()
+
+    for (const k of this.enckeys) {
+      await this.unlock(k.npub)
+
+      // ensure we're subscribed on the server
+      if (sub)
+        await this.sendSubscriptionToServer(k.npub, sub)
+    }
+  }
+
+  public setNotifCallback(cb: () => void) {
+    if (this.notifCallback) {
+      this.notify()
+    }
+    this.notifCallback = cb
+  }
+
+  public listKeys(): KeyInfo[] {
+    return this.enckeys.map<KeyInfo>((k) => this.keyInfo(k))
+  }
+
+  public isLocked(npub: string): boolean {
+    return !this.keys.find(k => k.npub === npub)
+  }
+
+  public hasKey(npub: string): boolean {
+    return !!this.enckeys.find(k => k.npub === npub)
+  }
+
+  private async sha256(s: string) {
+    return Buffer.from(
+      await this.swg.crypto.subtle.digest('SHA-256', Buffer.from(s)))
+      .toString('hex')
+  }
+
+  private async sendPost({
+    url,
+    method,
+    headers,
+    body
+  }: {
+    url: string,
+    method: string,
+    headers: any,
+    body: string
+  }) {
+    const r = await fetch(url, {
+      method,
+      headers: {
+        'Content-Type': 'application/json',
+        ...headers
+      },
+      body,
+    })
+    if (r.status !== 200 && r.status !== 201) {
+      console.log("Fetch error", url, method, r.status)
+      throw new Error("Failed to fetch" + url)
+    }
+
+    return await r.json();
+  }
+
+  private async sendPostAuthd({
+    npub,
+    url,
+    method = 'GET',
+    body = ''
+  }: {
+    npub: string,
+    url: string,
+    method: string,
+    body: string
+  }) {
+
+    const { data: pubkey } = nip19.decode(npub)
+
+    const key = this.keys.find(k => k.npub === npub)
+    if (!key) throw new Error("Unknown key")
+
+    const authEvent = new NDKEvent(key.ndk, {
+      pubkey: pubkey as string,
+      kind: 27235,
+      created_at: Math.floor(Date.now() / 1000),
+      content: '',
+      tags: [
+        ['u', url],
+        ['method', method],
+      ]
+    })
+    if (body)
+      authEvent.tags.push(['payload', await this.sha256(body)])
+
+    authEvent.sig = await authEvent.sign(key.signer)
+
+    const auth = this.swg.btoa(JSON.stringify(authEvent.rawEvent()))
+
+    return await this.sendPost({
+      url,
+      method,
+      headers: {
+        'Authorization': `Nostr ${auth}`,
+      },
+      body
+    })
+  }
+
+  private async sendSubscriptionToServer(
+    npub: string,
+    pushSubscription: PushSubscription
+  ) {
+
+    const body = JSON.stringify({
+      npub,
+      relays: NIP46_RELAYS,
+      pushSubscription
+    })
+
+    const method = 'POST'
+    const url = `${NOAUTHD_URL}/subscribe`
+
+    return this.sendPostAuthd({
+      npub,
+      url,
+      method,
+      body
+    })
+  }
+  private async sendKeyToServer(
+    npub: string,
+    enckey: string,
+    pwh: string
+  ) {
+
+    const body = JSON.stringify({
+      npub,
+      data: enckey,
+      pwh
+    })
+
+    const method = 'POST'
+    const url = `${NOAUTHD_URL}/put`
+
+    return this.sendPostAuthd({
+      npub,
+      url,
+      method,
+      body
+    })
+  }
+
+  private async fetchKeyFromServer(
+    npub: string,
+    pwh: string
+  ) {
+
+    const body = JSON.stringify({
+      npub,
+      pwh
+    })
+
+    const method = 'POST'
+    const url = `${NOAUTHD_URL}/get`
+
+    return await this.sendPost({
+      url,
+      method,
+      headers: {},
+      body
+    })
+  }
+
+  private notify() {
+    // FIXME collect info from accessBuffer and confirmBuffer
+    // and update the notifications
+
+    for (const r of this.confirmBuffer) {
+      const text = `Confirm "${r.req.method}" by "${r.req.appNpub}"`
+      this.swg.registration.showNotification('Signer access', {
+        body: text,
+        tag: "confirm-" + r.req.appNpub,
+        actions: [
+          {
+            action: "allow:" + r.req.id,
+            title: "Yes"
+          },
+          {
+            action: "disallow:" + r.req.id,
+            title: "No"
+          },
+        ]
+      })
+    }
+
+    if (this.notifCallback)
+      this.notifCallback()
+  }
+
+  private keyInfo(k: DbKey): KeyInfo {
+    return {
+      npub: k.npub,
+      nip05: k.nip05,
+      locked: this.isLocked(k.npub)
+    }
+  }
+
+  private async generateGoodKey(): Promise<string> {
+    return generatePrivateKey()
+  }
+
+  public async addKey(nsec?: string): Promise<KeyInfo> {
+    let sk = ''
+    if (nsec) {
+      const { type, data } = nip19.decode(nsec)
+      if (type !== 'nsec') throw new Error('Bad nsec')
+      sk = data
+    } else {
+      sk = await this.generateGoodKey()
+    }
+    const pubkey = getPublicKey(sk)
+    const npub = nip19.npubEncode(pubkey)
+    const localKey = await this.keysModule.generateLocalKey()
+    const enckey = await this.keysModule.encryptKeyLocal(sk, localKey)
+    // @ts-ignore 
+    const dbKey: DbKey = { npub, enckey, localKey }
+    await dbi.addKey(dbKey)
+    this.enckeys.push(dbKey)
+    await this.startKey({ npub, sk })
+
+    const sub = await this.swg.registration.pushManager.getSubscription()
+    if (sub)
+      await this.sendSubscriptionToServer(npub, sub)
+
+    return this.keyInfo(dbKey)
+  }
+
+  private getPerm(req: DbPending): string {
+    const methods = [req.method]
+    if (req.method === 'describe')
+      methods.push(...['connect', 'get_public_key'])
+    for (const method of methods) {
+      const value = this.perms.find(p => p.npub === req.npub
+        && p.appNpub === req.appNpub
+        && p.perm === method)?.value || ''
+      if (value) return value
+    }
+    return ''
+  }
+
+  private async allowPermitCallback({
+    npub,
+    id,
+    method,
+    remotePubkey,
+    params
+  }: IAllowCallbackParams): Promise<boolean> {
+
+    // same reqs usually come on reconnects
+    if (this.doneReqIds.includes(id)) {
+      console.log("request already done", id)
+      // FIXME maybe repeat the reply, but without the Notification?
+      return false
+    }
+
+    const appNpub = nip19.npubEncode(remotePubkey)
+    const req: DbPending = {
+      id,
+      npub,
+      appNpub,
+      method,
+      params: JSON.stringify(params),
+      timestamp: Date.now()
+    }
+
+    const self = this
+    return new Promise(async (ok) => {
+
+      // called when it's decided whether to allow this or not
+      const onAllow = async (manual: boolean, allow: boolean, remember: boolean) => {
+
+        // confirm
+        console.log(Date.now(), allow ? "allowed" : "disallowed", npub, method, params)
+        if (manual) {
+          await dbi.confirmPending(id, allow)
+
+          if (!await dbi.getApp(req.appNpub)) {
+            await dbi.addApp({
+              appNpub: req.appNpub,
+              npub: req.npub,
+              timestamp: Date.now(),
+              name: '',
+              icon: '',
+              url: ''
+            })
+          }
+        } else {
+          // just send to db w/o waiting for it
+          // if (!PERF_TEST)
+          dbi.addConfirmed({
+            ...req,
+            allowed: allow
+          })
+        }
+
+        // for notifications
+        self.accessBuffer.push(req)
+
+        // clear from pending
+        const index = self.confirmBuffer.findIndex(r => r.req.id === id)
+        if (index >= 0)
+          self.confirmBuffer.splice(index, 1)
+
+        if (remember) {
+          await dbi.addPerm({
+            id: req.id,
+            npub: req.npub,
+            appNpub: req.appNpub,
+            perm: method,
+            value: allow ? '1' : '0',
+            timestamp: Date.now(),
+          })
+
+          this.perms = await dbi.listPerms()
+
+          const otherReqs = self.confirmBuffer.filter(r => r.req.appNpub === req.appNpub)
+          for (const r of otherReqs) {
+            if (r.req.method === req.method) {
+              r.cb(allow, false)
+            }
+          }
+        }
+
+        // notify UI that it was confirmed
+        // if (!PERF_TEST)
+        this.updateUI()
+
+        // return to let nip46 flow proceed
+        ok(allow)
+      }
+
+      // check perms
+      const perm = this.getPerm(req)
+      console.log(Date.now(), "perm", req.id, perm)
+
+      // have perm?
+      if (perm) {
+        // reply immediately
+        onAllow(false, perm === '1', false)
+      } else {
+
+        // put pending req to db
+        await dbi.addPending(req)
+
+        // need manual confirmation
+        console.log("need confirm", req)
+
+        // put to a list of pending requests
+        this.confirmBuffer.push({
+          req,
+          cb: (allow, remember) => onAllow(true, allow, remember)
+        })
+
+        // show notifs
+        this.notify()
+
+        // notify main thread to ask for user concent
+        // FIXME show a 'confirm' notification?
+        this.updateUI()
+      }
+    })
+  }
+
+  private async startKey({ npub, sk, backoff = 1000 }: { npub: string, sk: string, backoff?: number }) {
+    const ndk = new NDK({
+      explicitRelayUrls: NIP46_RELAYS
+    })
+
+    // init relay objects but dont wait until we connect
+    ndk.connect()
+
+    const signer = new NDKPrivateKeySigner(sk) // PrivateKeySigner
+    const backend = new NDKNip46Backend(ndk, sk, () => Promise.resolve(true))
+    this.keys.push({ npub, backend, signer, ndk, backoff })
+
+    // new method
+    backend.handlers['get_nip04_key'] = new Nip04KeyHandlingStrategy(sk)
+    backend.handlers['describe'] = new DescribeHandlingStrategy(Object.keys(backend.handlers))
+
+    // assign our own permission callback
+    for (const method in backend.handlers) {
+      backend.handlers[method] = new EventHandlingStrategyWrapper(npub, method, backend.handlers[method], this.allowPermitCallback.bind(this))
+    }
+
+    // start
+    backend.start()
+    console.log("started", npub)
+
+    // backoff reset on successfull connection
+    const self = this
+    const onConnect = () => {
+      // reset backoff
+      const key = self.keys.find(k => k.npub === npub)
+      if (key) key.backoff = 0
+      console.log("reset backoff for", npub)
+    }
+
+    // reconnect handling
+    let reconnected = false
+    const onDisconnect = () => {
+      if (reconnected) return
+      if (ndk.pool.connectedRelays().length > 0) return
+      reconnected = true
+      console.log(new Date(), "all relays are down for key", npub)
+
+      // run full restart after a pause
+      const bo = self.keys.find(k => k.npub === npub)?.backoff || 1000
+      setTimeout(() => {
+        console.log(new Date(), "reconnect relays for key", npub, "backoff", bo)
+        // @ts-ignore
+        for (const r of ndk.pool.relays.values())
+          r.disconnect()
+        // make sure it no longer activates
+        backend.handlers = {}
+
+        self.keys = self.keys.filter(k => k.npub !== npub)
+        self.startKey({ npub, sk, backoff: Math.min(bo * 2, 60000) })
+      }, bo)
+    }
+
+    // @ts-ignore
+    for (const r of ndk.pool.relays.values()) {
+      r.on('connect', onConnect)
+      r.on('disconnect', onDisconnect)
+    }
+  }
+
+  public async unlock(npub: string) {
+    console.log("unlocking", npub)
+    if (!this.isLocked(npub)) throw new Error(`Key ${npub} already unlocked`)
+    const info = this.enckeys.find(k => k.npub === npub)
+    if (!info) throw new Error(`Key ${npub} not found`)
+    const { type } = nip19.decode(npub)
+    if (type !== "npub") throw new Error(`Invalid npub ${npub}`)
+    const sk = await this.keysModule.decryptKeyLocal({
+      enckey: info.enckey,
+      // @ts-ignore
+      localKey: info.localKey
+    })
+    await this.startKey({ npub, sk })
+  }
+
+  private async generateKey() {
+    const k = await this.addKey()
+    this.updateUI()
+    return k
+  }
+
+  private async importKey(nsec: string) {
+    const k = await this.addKey(nsec)
+    this.updateUI()
+    return k
+  }
+
+  private async saveKey(npub: string, passphrase: string) {
+    const info = this.enckeys.find(k => k.npub === npub)
+    if (!info) throw new Error(`Key ${npub} not found`)
+    const sk = await this.keysModule.decryptKeyLocal({
+      enckey: info.enckey,
+      // @ts-ignore
+      localKey: info.localKey
+    })
+    const { enckey, pwh } = await this.keysModule.encryptKeyPass({ key: sk, passphrase })
+    await this.sendKeyToServer(npub, enckey, pwh)
+  }
+
+  private async fetchKey(npub: string, passphrase: string) {
+    const { type, data: pubkey } = nip19.decode(npub)
+    if (type !== "npub") throw new Error(`Invalid npub ${npub}`)
+    const { pwh } = await this.keysModule.generatePassKey(pubkey, passphrase)
+    const { data: enckey } = await this.fetchKeyFromServer(npub, pwh);
+
+    // key already exists?
+    const key = this.enckeys.find(k => k.npub === npub)
+    if (key) return this.keyInfo(key)
+
+    // add new key
+    const nsec = await this.keysModule.decryptKeyPass({ pubkey, enckey, passphrase })
+    const k = await this.addKey(nsec)
+    this.updateUI()
+    return k
+  }
+
+  private async confirm(id: string, allow: boolean, remember: boolean) {
+    const req = this.confirmBuffer.find(r => r.req.id === id)
+    if (!req) {
+      console.log("req ", id, "not found")
+
+      await dbi.removePending(id)
+      this.updateUI()
+    } else {
+
+      console.log("confirming", id, allow, remember)
+      req.cb(allow, remember)
+    }
+  }
+
+  private async deleteApp(appNpub: string) {
+    this.perms = this.perms.filter(p => p.appNpub !== appNpub)
+    await dbi.removeApp(appNpub)
+    await dbi.removeAppPerms(appNpub)
+    this.updateUI()
+  }
+
+  private async deletePerm(id: string) {
+    this.perms = this.perms.filter(p => p.id !== id)
+    await dbi.removePerm(id)
+    this.updateUI()
+  }
+
+  private async enablePush(): Promise<boolean> {
+    const options = {
+      userVisibleOnly: true,
+      applicationServerKey: WEB_PUSH_PUBKEY,
+    }
+
+    const pushSubscription = await this.swg.registration.pushManager.subscribe(options);
+    console.log("push endpoint", JSON.stringify(pushSubscription));
+
+    if (!pushSubscription) {
+      console.log("failed to enable push subscription")
+      return false
+    }
+
+    // subscribe to all pubkeys
+    for (const k of this.keys) {
+      await this.sendSubscriptionToServer(k.npub, pushSubscription);
+    }
+    console.log("push enabled")
+
+    return true
+  }
+
+  public async onMessage(event: any) {
+    const { id, method, args } = event.data
+    try {
+      //console.log("UI message", id, method, args)
+      let result = undefined
+      if (method === 'generateKey') {
+        result = await this.generateKey()
+      } else if (method === 'importKey') {
+        result = await this.importKey(args[0])
+      } else if (method === 'saveKey') {
+        result = await this.saveKey(args[0], args[1])
+      } else if (method === 'fetchKey') {
+        result = await this.fetchKey(args[0], args[1])
+      } else if (method === 'confirm') {
+        result = await this.confirm(args[0], args[1], args[2])
+      } else if (method === 'deleteApp') {
+        result = await this.deleteApp(args[0])
+      } else if (method === 'deletePerm') {
+        result = await this.deletePerm(args[0])
+      } else if (method === 'enablePush') {
+        result = await this.enablePush()
+      } else {
+        console.log("unknown method from UI ", method)
+      }
+      event.source.postMessage({
+        id, result
+      })
+    } catch (e: any) {
+      event.source.postMessage({
+        id, error: e.toString()
+      })
+    }
+  }
+
+  private async updateUI() {
+    const clients = await this.swg.clients.matchAll()
+    console.log("updateUI clients", clients.length)
+    for (const client of clients) {
+      client.postMessage({})
+    }
+  }
+
+  public async onPush(event: any) {
+    console.log("push", { data: event.data });
+    // noop - we just need browser to launch this worker
+    // FIXME use event.waitUntil and and unblock after we 
+    // show a notification
+  }
+}
--- a/src/components/Modal/ModalAppDetails/ModalAppDetails.tsx
+++ b/src/components/Modal/ModalAppDetails/ModalAppDetails.tsx
@ -1,175 +0,0 @@
-import { useModalSearchParams } from '@/hooks/useModalSearchParams'
-import { Button } from '@/shared/Button/Button'
-import { Input } from '@/shared/Input/Input'
-import { Modal } from '@/shared/Modal/Modal'
-import { MODAL_PARAMS_KEYS } from '@/types/modal'
-import { Autocomplete, Stack, Typography } from '@mui/material'
-import { StyledInput } from './styled'
-import { FormEvent, useEffect, useState } from 'react'
-import { isEmptyString } from '@/utils/helpers/helpers'
-import { useParams } from 'react-router-dom'
-import { useAppDispatch, useAppSelector } from '@/store/hooks/redux'
-import { selectApps } from '@/store'
-import { dbi } from '@/modules/db'
-import { useEnqueueSnackbar } from '@/hooks/useEnqueueSnackbar'
-import { setApps } from '@/store/reducers/content.slice'
-import { LoadingSpinner } from '@/shared/LoadingSpinner/LoadingSpinner'
-
-export const ModalAppDetails = () => {
-  const { getModalOpened, createHandleCloseReplace } = useModalSearchParams()
-  const isModalOpened = getModalOpened(MODAL_PARAMS_KEYS.APP_DETAILS)
-  const handleCloseModal = createHandleCloseReplace(MODAL_PARAMS_KEYS.APP_DETAILS)
-
-  const { appNpub = '' } = useParams()
-  const apps = useAppSelector(selectApps)
-  const dispatch = useAppDispatch()
-
-  const notify = useEnqueueSnackbar()
-
-  const [details, setDetails] = useState({
-    url: '',
-    name: '',
-    icon: '',
-  })
-  const [isLoading, setIsLoading] = useState(false)
-
-  useEffect(() => {
-    const currentApp = apps.find((app) => app.appNpub === appNpub)
-    if (!currentApp) return
-
-    setDetails({
-      icon: currentApp.icon || '',
-      name: currentApp.name || '',
-      url: currentApp.url || '',
-    })
-
-    // eslint-disable-next-line
-  }, [appNpub, isModalOpened])
-
-  useEffect(() => {
-    return () => {
-      if (isModalOpened) {
-        // modal closed
-        setIsLoading(false)
-      }
-    }
-  }, [isModalOpened])
-
-  const isAppNpubExists = appNpub.trim().length && apps.some((app) => app.appNpub === appNpub)
-
-  if (isModalOpened && !isAppNpubExists) {
-    handleCloseModal()
-    return null
-  }
-
-  const { icon, name, url } = details
-
-  const handleInputBlur = () => {
-    if (isEmptyString(url)) return
-
-    try {
-
-      const u = new URL(url)
-
-      if (isEmptyString(name)) setDetails((prev) => ({ ...prev, name: u.hostname }))
-      if (isEmptyString(icon)) {
-        const iconUrl = `https://${u.hostname}/favicon.ico`
-        setDetails((prev) => ({ ...prev, icon: iconUrl }))
-      }
-    } catch {
-      /* empty */
-    }
-  }
-
-  const handleInputChange = (key: string) => (e: React.ChangeEvent<HTMLInputElement>) => {
-    setDetails((prevState) => {
-      return { ...prevState, [key]: e.target.value }
-    })
-  }
-
-  const handleAutocompletInputChange = (e: unknown, value: string) => {
-    setDetails((prevState) => {
-      return { ...prevState, url: value }
-    })
-  }
-
-  const submitHandler = async (e: FormEvent) => {
-    e.preventDefault()
-    if (isLoading) return undefined
-    try {
-      setIsLoading(true)
-      const updatedApp = {
-        url,
-        name,
-        icon,
-        appNpub,
-      }
-      await dbi.updateApp(updatedApp)
-      const apps = await dbi.listApps()
-      dispatch(
-        setApps({
-          apps,
-        })
-      )
-      notify(`App successfully updated!`, 'success')
-      setIsLoading(false)
-      handleCloseModal()
-    } catch (error: any) {
-      setIsLoading(false)
-      notify(error?.message || 'Something went wrong!', 'error')
-    }
-  }
-
-  const isFormValid = !isEmptyString(name)
-
-  return (
-    <Modal open={isModalOpened} onClose={handleCloseModal}>
-      <Stack gap={'1rem'} component={'form'} onSubmit={submitHandler}>
-        <Stack alignItems={'center'}>
-          <Typography fontWeight={600} variant="h5">
-            App details
-          </Typography>
-        </Stack>
-
-        <Input
-          label="Name"
-          fullWidth
-          placeholder="Enter app name"
-          onChange={handleInputChange('name')}
-          value={details.name}
-        />
-        <Autocomplete
-          options={[]}
-          freeSolo
-          onBlur={handleInputBlur}
-          onInputChange={handleAutocompletInputChange}
-          inputValue={details.url}
-          renderInput={({ inputProps, disabled, id, InputProps }) => {
-            return (
-              <StyledInput
-                {...InputProps}
-                className="input"
-                inputProps={inputProps}
-                disabled={disabled}
-                label="URL"
-                fullWidth
-                placeholder="Enter URL"
-              />
-            )
-          }}
-        />
-        <Input
-          label="Icon"
-          fullWidth
-          placeholder="Enter app icon url"
-          onChange={handleInputChange('icon')}
-          value={details.icon}
-        />
-
-        <Button varianttype="secondary" type="submit" fullWidth disabled={!isFormValid || isLoading}>
-          Save changes {isLoading && <LoadingSpinner />}
-        </Button>
-      </Stack>
-    </Modal>
-  )
-}
--- a/src/components/Modal/ModalAppDetails/styled.tsx
+++ b/src/components/Modal/ModalAppDetails/styled.tsx
@ -1,11 +0,0 @@
-import { AppInputProps, Input } from '@/shared/Input/Input'
-import { styled } from '@mui/material'
-import { forwardRef } from 'react'
-
-export const StyledInput = styled(
-  forwardRef<HTMLInputElement, AppInputProps>((props, ref) => <Input {...props} ref={ref} />)
-)(() => ({
-  '& .MuiAutocomplete-endAdornment': {
-    right: '1rem',
-  },
-}))
--- a/src/components/Modal/ModalConfirmConnect/ModalConfirmConnect.tsx
+++ b/src/components/Modal/ModalConfirmConnect/ModalConfirmConnect.tsx
@ -1,230 +0,0 @@
-import { useModalSearchParams } from '@/hooks/useModalSearchParams'
-import { Modal } from '@/shared/Modal/Modal'
-import { MODAL_PARAMS_KEYS } from '@/types/modal'
-import {
-  askNotificationPermission,
-  call,
-  getAppIconTitle,
-  getDomain,
-  getReferrerAppUrl,
-  getShortenNpub,
-} from '@/utils/helpers/helpers'
-import { Avatar, Box, Stack, Typography } from '@mui/material'
-import { useNavigate, useParams, useSearchParams } from 'react-router-dom'
-import { useAppSelector } from '@/store/hooks/redux'
-import { selectAppsByNpub, selectKeys, selectPendingsByNpub } from '@/store'
-import { StyledButton, StyledToggleButtonsGroup } from './styled'
-import { ActionToggleButton } from './сomponents/ActionToggleButton'
-import { useEffect, useState } from 'react'
-import { swicCall, swicWaitStarted } from '@/modules/swic'
-import { ACTION_TYPE } from '@/utils/consts'
-import { useEnqueueSnackbar } from '@/hooks/useEnqueueSnackbar'
-
-export const ModalConfirmConnect = () => {
-  const keys = useAppSelector(selectKeys)
-
-  const { getModalOpened, createHandleCloseReplace } = useModalSearchParams()
-  const notify = useEnqueueSnackbar()
-  const navigate = useNavigate()
-  const isModalOpened = getModalOpened(MODAL_PARAMS_KEYS.CONFIRM_CONNECT)
-
-  const [searchParams] = useSearchParams()
-  const paramNpub = searchParams.get('npub') || ''
-  const { npub = paramNpub } = useParams<{ npub: string }>()
-  const apps = useAppSelector((state) => selectAppsByNpub(state, npub))
-  const pending = useAppSelector((state) => selectPendingsByNpub(state, npub))
-
-  const [selectedActionType, setSelectedActionType] = useState<ACTION_TYPE>(ACTION_TYPE.BASIC)
-  const [isLoaded, setIsLoaded] = useState(false)
-
-  const appNpub = searchParams.get('appNpub') || ''
-  const pendingReqId = searchParams.get('reqId') || ''
-  const isPopup = searchParams.get('popup') === 'true'
-  const token = searchParams.get('token') || ''
-
-  const triggerApp = apps.find((app) => app.appNpub === appNpub)
-  const { name, url = '', icon = '' } = triggerApp || {}
-
-  const appUrl = url || searchParams.get('appUrl') || getReferrerAppUrl()
-  const appDomain = getDomain(appUrl)
-  const appName = name || appDomain || getShortenNpub(appNpub)
-  const appAvatarTitle = getAppIconTitle(name || appDomain, appNpub)
-  const appIcon = icon || (appDomain ? `https://${appDomain}/favicon.ico` : '')
-
-  const closeModalAfterRequest = createHandleCloseReplace(MODAL_PARAMS_KEYS.CONFIRM_CONNECT, {
-    onClose: (sp) => {
-      sp.delete('appNpub')
-      sp.delete('reqId')
-      sp.delete('popup')
-      sp.delete('npub')
-      sp.delete('appUrl')
-    },
-  })
-
-  // NOTE: when opened directly to this modal using authUrl,
-  // we might not have pending requests visible yet bcs we haven't
-  // loaded them yet, which means this modal will be closed with
-  // the logic below. So now if it's popup then we wait for SW
-  // and then wait a little more to give it time to fetch
-  // pending reqs from db. Same logic implemented in confirm-event.
-
-  // FIXME move to a separate hook and reuse?
-
-  useEffect(() => {
-    if (isModalOpened) {
-      if (isPopup) {
-        console.log("waiting for sw")
-        // wait for SW to start
-        swicWaitStarted().then(() => {
-          // give it some time to load the pending reqs etc
-          console.log("waiting for sw done")
-          setTimeout(() => setIsLoaded(true), 500)
-        })
-      } else {
-        setIsLoaded(true)
-      }
-    } else {
-      setIsLoaded(false)
-    }
-  }, [isModalOpened, isPopup])
-
-  if (isLoaded) {
-    const isNpubExists = npub.trim().length && keys.some((key) => key.npub === npub)
-    // NOTE: app doesn't exist yet!
-    // const isAppNpubExists = appNpub.trim().length && apps.some((app) => app.appNpub === appNpub)
-    const isPendingReqIdExists = pendingReqId.trim().length && pending.some((p) => p.id === pendingReqId)
-    // console.log("pending", {isModalOpened, isPendingReqIdExists, isNpubExists, /*isAppNpubExists,*/ pendingReqId, pending});
-    if (isModalOpened && (!isNpubExists /*|| !isAppNpubExists*/ || (pendingReqId && !isPendingReqIdExists))) {
-      if (isPopup) window.close()
-      else closeModalAfterRequest()
-      return null
-    }
-  }
-
-  const handleActionTypeChange = (_: any, value: ACTION_TYPE | null) => {
-    if (!value) return undefined
-    return setSelectedActionType(value)
-  }
-
-  async function confirmPending(id: string, allow: boolean, remember: boolean, options?: any) {
-    call(async () => {
-      await swicCall('confirm', id, allow, remember, options)
-      console.log('confirmed', id, allow, remember, options)
-      closeModalAfterRequest()
-    })
-    if (isPopup) window.close()
-  }
-
-  const allow = async () => {
-    let perms = ['connect', 'get_public_key']
-    if (selectedActionType === ACTION_TYPE.BASIC) perms = [ACTION_TYPE.BASIC]
-
-    if (pendingReqId) {
-      const options = { perms, appUrl }
-      await confirmPending(pendingReqId, true, true, options)
-    } else {
-
-      try {
-        await askNotificationPermission()
-        const result = await swicCall('enablePush')
-        if (!result) throw new Error('Failed to activate the push subscription')
-        console.log('enablePush done')
-      } catch (e: any) {
-        console.log('error', e)
-        notify('Please enable Notifications in website settings!', 'error')
-        // keep going
-      }
-
-      try {
-        await swicCall('connectApp', { npub, appNpub, appUrl, perms })
-        console.log('connectApp done', npub, appNpub, appUrl, perms)
-      } catch (e: any) {
-        notify(e.toString(), 'error')
-        return
-      }
-
-      if (token) {
-        try {
-          await swicCall('redeemToken', npub, token)
-          console.log('redeemToken done')
-        } catch (e) {
-          console.log('error', e)
-          notify('App did not reply. Please try to log in now.', 'error')
-          navigate(`/key/${npub}`, { replace: true })
-          return
-        }
-      }
-
-      notify('App connected! Closing...', 'success')
-
-      if (isPopup) setTimeout(() => window.close(), 3000)
-      else navigate(`/key/${npub}`, { replace: true })
-    }
-  }
-
-  const disallow = () => {
-    if (pendingReqId) confirmPending(pendingReqId, false, true)
-    else closeModalAfterRequest()
-  }
-
-  if (isPopup) {
-    document.addEventListener('visibilitychange', () => {
-      if (document.visibilityState === 'hidden') {
-        disallow()
-      }
-    })
-  }
-
-  return (
-    <Modal title="Connection request" open={isModalOpened} withCloseButton={false}>
-      <Stack gap={'1rem'} paddingTop={'1rem'}>
-        {!pendingReqId && (
-          <Typography variant="body1" color={'GrayText'}>
-            You will be asked to <b>enable notifications</b>, this is needed for a reliable communication with Nostr
-            apps.
-          </Typography>
-        )}
-        <Stack direction={'row'} gap={'1rem'} alignItems={'center'} marginBottom={'1rem'}>
-          <Avatar
-            variant="rounded"
-            sx={{
-              width: 56,
-              height: 56,
-            }}
-            src={appIcon}
-          >
-            {appAvatarTitle}
-          </Avatar>
-          <Box>
-            <Typography variant="h5" fontWeight={600}>
-              {appName}
-            </Typography>
-            <Typography variant="body2" color={'GrayText'}>
-              New app would like to connect
-            </Typography>
-          </Box>
-        </Stack>
-        <StyledToggleButtonsGroup value={selectedActionType} onChange={handleActionTypeChange} exclusive>
-          <ActionToggleButton
-            value={ACTION_TYPE.BASIC}
-            title="Basic permissions"
-            description="Read your public key, sign notes, reactions, zaps, etc"
-          />
-          <ActionToggleButton
-            value={ACTION_TYPE.CUSTOM}
-            title="On demand"
-            description="Confirm permissions when the app asks for them"
-          />
-        </StyledToggleButtonsGroup>
-        <Stack direction={'row'} gap={'1rem'}>
-          <StyledButton onClick={disallow} varianttype="secondary">
-            Ignore
-          </StyledButton>
-          <StyledButton fullWidth onClick={allow}>
-            Connect
-          </StyledButton>
-        </Stack>
-      </Stack>
-    </Modal>
-  )
-}
--- a/src/components/Modal/ModalConfirmConnect/styled.tsx
+++ b/src/components/Modal/ModalConfirmConnect/styled.tsx
@ -1,25 +0,0 @@
-import { AppButtonProps, Button } from '@/shared/Button/Button'
-import { ToggleButtonGroup, ToggleButtonGroupProps, styled } from '@mui/material'
-
-export const StyledButton = styled((props: AppButtonProps) => <Button {...props} />)(() => ({
-  borderRadius: '19px',
-  fontWeight: 600,
-  padding: '0.75rem 1rem',
-  maxHeight: '41px',
-}))
-
-export const StyledToggleButtonsGroup = styled((props: ToggleButtonGroupProps) => <ToggleButtonGroup {...props} />)(
-  () => ({
-    gap: '0.75rem',
-    marginBottom: '1rem',
-    justifyContent: 'space-between',
-    '&.MuiToggleButtonGroup-root .MuiToggleButtonGroup-grouped:not(:first-of-type)': {
-      margin: '0',
-      border: 'initial',
-    },
-    '&.MuiToggleButtonGroup-root .MuiToggleButtonGroup-grouped': {
-      border: 'initial',
-      borderRadius: '1rem',
-    },
-  })
-)
--- a/src/components/Modal/ModalConfirmConnect/сomponents/ActionToggleButton.tsx
+++ b/src/components/Modal/ModalConfirmConnect/сomponents/ActionToggleButton.tsx
@ -1,25 +0,0 @@
-import { FC } from 'react'
-import { ToggleButtonProps, Typography } from '@mui/material'
-import { StyledToggleButton } from './styled'
-
-type ActionToggleButtonProps = ToggleButtonProps & {
-  description?: string
-  hasinfo?: boolean
-}
-
-export const ActionToggleButton: FC<ActionToggleButtonProps> = ({ hasinfo = false, ...props }) => {
-  const { title, description = '' } = props
-  return (
-    <StyledToggleButton {...props}>
-      <Typography variant="body2">{title}</Typography>
-      <Typography className="description" variant="caption" color={'GrayText'}>
-        {description}
-      </Typography>
-      {hasinfo && (
-        <Typography className="info" color={'GrayText'}>
-          Info
-        </Typography>
-      )}
-    </StyledToggleButton>
-  )
-}
--- a/src/components/Modal/ModalConfirmConnect/сomponents/styled.tsx
+++ b/src/components/Modal/ModalConfirmConnect/сomponents/styled.tsx
@ -1,32 +0,0 @@
-import { ToggleButton, ToggleButtonProps, styled } from '@mui/material'
-
-export const StyledToggleButton = styled((props: ToggleButtonProps) => (
-  <ToggleButton classes={{ selected: 'selected' }} {...props} />
-))(({ theme }) => ({
-  '&:is(&, :hover, :active)': {
-    background: theme.palette.backgroundSecondary.default,
-  },
-  color: theme.palette.text.primary,
-  flex: '1 0 6.25rem',
-  height: '100px',
-  borderRadius: '1rem',
-  border: `2px solid transparent !important`,
-  '&.selected': {
-    border: `2px solid ${theme.palette.text.primary} !important`,
-  },
-  display: 'flex',
-  flexDirection: 'column',
-  alignItems: 'flex-start',
-  justifyContent: 'flex-start',
-  textTransform: 'initial',
-  '& .description': {
-    display: 'inline-block',
-    textAlign: 'left',
-    lineHeight: '15px',
-    margin: '0.5rem 0 0.25rem',
-  },
-  '& .info': {
-    fontSize: '10px',
-    fontWeight: 500,
-  },
-}))
--- a/src/components/Modal/ModalConfirmEvent/ModalConfirmEvent.tsx
+++ b/src/components/Modal/ModalConfirmEvent/ModalConfirmEvent.tsx
@ -1,186 +0,0 @@
-import { useModalSearchParams } from '@/hooks/useModalSearchParams'
-import { Modal } from '@/shared/Modal/Modal'
-import { MODAL_PARAMS_KEYS } from '@/types/modal'
-import { call, getAppIconTitle, getReqActionName, getShortenNpub } from '@/utils/helpers/helpers'
-import { Avatar, Box, List, ListItem, ListItemIcon, ListItemText, Stack, Typography } from '@mui/material'
-import { useParams, useSearchParams } from 'react-router-dom'
-import { useAppSelector } from '@/store/hooks/redux'
-import { selectAppsByNpub, selectKeys } from '@/store'
-import { ActionToggleButton } from './сomponents/ActionToggleButton'
-import { FC, useEffect, useMemo, useState } from 'react'
-import { StyledActionsListContainer, StyledButton, StyledToggleButtonsGroup } from './styled'
-import { SectionTitle } from '@/shared/SectionTitle/SectionTitle'
-import { swicCall, swicWaitStarted } from '@/modules/swic'
-import { Checkbox } from '@/shared/Checkbox/Checkbox'
-import { DbPending } from '@/modules/db'
-import { IPendingsByAppNpub } from '@/pages/KeyPage/hooks/useTriggerConfirmModal'
-
-enum ACTION_TYPE {
-  ALWAYS = 'ALWAYS',
-  ONCE = 'ONCE',
-  ALLOW_ALL = 'ALLOW_ALL',
-}
-
-const ACTION_LABELS = {
-  [ACTION_TYPE.ALWAYS]: 'Always',
-  [ACTION_TYPE.ONCE]: 'Just Once',
-  [ACTION_TYPE.ALLOW_ALL]: 'All Advanced Actions',
-}
-
-type ModalConfirmEventProps = {
-  confirmEventReqs: IPendingsByAppNpub
-}
-
-type PendingRequest = DbPending & { checked: boolean }
-
-export const ModalConfirmEvent: FC<ModalConfirmEventProps> = ({ confirmEventReqs }) => {
-  const keys = useAppSelector(selectKeys)
-
-  const { getModalOpened, createHandleCloseReplace } = useModalSearchParams()
-  const isModalOpened = getModalOpened(MODAL_PARAMS_KEYS.CONFIRM_EVENT)
-  const [searchParams] = useSearchParams()
-
-  const appNpub = searchParams.get('appNpub') || ''
-  const isPopup = searchParams.get('popup') === 'true'
-  const { npub = '' } = useParams<{ npub: string }>()
-  const apps = useAppSelector((state) => selectAppsByNpub(state, npub))
-
-  const [selectedActionType, setSelectedActionType] = useState<ACTION_TYPE>(ACTION_TYPE.ALWAYS)
-  const [pendingRequests, setPendingRequests] = useState<PendingRequest[]>([])
-  const [isLoaded, setIsLoaded] = useState(false)
-
-  const currentAppPendingReqs = useMemo(() => confirmEventReqs[appNpub]?.pending || [], [confirmEventReqs, appNpub])
-
-  useEffect(() => {
-    setPendingRequests(currentAppPendingReqs.map((pr) => ({ ...pr, checked: true })))
-  }, [currentAppPendingReqs])
-
-  const closeModalAfterRequest = createHandleCloseReplace(MODAL_PARAMS_KEYS.CONFIRM_EVENT, {
-    onClose: (sp) => {
-      sp.delete('appNpub')
-      sp.delete('reqId')
-    },
-  })
-
-  useEffect(() => {
-    if (isModalOpened) {
-      if (isPopup) {
-        // wait for SW to start
-        swicWaitStarted().then(() => {
-          // give it some time to load the pending reqs etc
-          setTimeout(() => setIsLoaded(true), 500)
-        })
-      } else {
-        setIsLoaded(true)
-      }
-    } else {
-      setIsLoaded(false)
-    }
-  }, [isModalOpened, isPopup])
-
-  if (isLoaded) {
-    const isNpubExists = npub.trim().length && keys.some((key) => key.npub === npub)
-    const isAppNpubExists = appNpub.trim().length && apps.some((app) => app.appNpub === appNpub)
-    // console.log("confirm event", { confirmEventReqs, isModalOpened, isNpubExists, isAppNpubExists });
-    if (isModalOpened && (!currentAppPendingReqs.length || !isNpubExists || !isAppNpubExists)) {
-      if (isPopup) window.close()
-      else closeModalAfterRequest()
-      return null
-    }
-  }
-
-  const triggerApp = apps.find((app) => app.appNpub === appNpub)
-  const { name, icon = '' } = triggerApp || {}
-  const appName = name || getShortenNpub(appNpub)
-  const appAvatarTitle = getAppIconTitle(name, appNpub)
-
-  const handleActionTypeChange = (_: any, value: ACTION_TYPE | null) => {
-    if (!value) return undefined
-    return setSelectedActionType(value)
-  }
-
-  const selectedPendingRequests = pendingRequests.filter((pr) => pr.checked)
-
-  async function confirmPending(allow: boolean) {
-    selectedPendingRequests.forEach((req) => {
-      call(async () => {
-        const remember = selectedActionType !== ACTION_TYPE.ONCE
-        await swicCall('confirm', req.id, allow, remember)
-        console.log('confirmed', req.id, selectedActionType, allow)
-      })
-    })
-    closeModalAfterRequest()
-    if (isPopup) window.close()
-  }
-
-  const handleChangeCheckbox = (reqId: string) => () => {
-    const newPendingRequests = pendingRequests.map((req) => {
-      if (req.id === reqId) return { ...req, checked: !req.checked }
-      return req
-    })
-    setPendingRequests(newPendingRequests)
-  }
-
-  if (isPopup) {
-    document.addEventListener('visibilitychange', () => {
-      if (document.visibilityState === 'hidden') {
-        confirmPending(false)
-      }
-    })
-  }
-
-  return (
-    <Modal title="Permission request" open={isModalOpened} withCloseButton={false}>
-      <Stack gap={'1rem'} paddingTop={'1rem'}>
-        <Stack direction={'row'} gap={'1rem'} alignItems={'center'} marginBottom={'1rem'}>
-          <Avatar
-            variant="square"
-            sx={{
-              width: 56,
-              height: 56,
-              borderRadius: '12px',
-            }}
-            src={icon}
-          >
-            {appAvatarTitle}
-          </Avatar>
-          <Box>
-            <Typography variant="h5" fontWeight={600}>
-              {appName}
-            </Typography>
-            <Typography variant="body2" color={'GrayText'}>
-              App wants to perform these actions
-            </Typography>
-          </Box>
-        </Stack>
-
-        <StyledActionsListContainer marginBottom={'1rem'}>
-          <SectionTitle>Actions</SectionTitle>
-          <List>
-            {pendingRequests.map((req) => {
-              return (
-                <ListItem key={req.id}>
-                  <ListItemIcon>
-                    <Checkbox checked={req.checked} onChange={handleChangeCheckbox(req.id)} />
-                  </ListItemIcon>
-                  <ListItemText>{getReqActionName(req)}</ListItemText>
-                </ListItem>
-              )
-            })}
-          </List>
-        </StyledActionsListContainer>
-        <StyledToggleButtonsGroup value={selectedActionType} onChange={handleActionTypeChange} exclusive>
-          <ActionToggleButton value={ACTION_TYPE.ALWAYS} title="Always" />
-          <ActionToggleButton value={ACTION_TYPE.ONCE} title="Just once" />
-        </StyledToggleButtonsGroup>
-
-        <Stack direction={'row'} gap={'1rem'}>
-          <StyledButton onClick={() => confirmPending(false)} varianttype="secondary">
-            Disallow {ACTION_LABELS[selectedActionType]}
-          </StyledButton>
-          <StyledButton onClick={() => confirmPending(true)}>Allow {ACTION_LABELS[selectedActionType]}</StyledButton>
-        </Stack>
-      </Stack>
-    </Modal>
-  )
-}
--- a/src/components/Modal/ModalConfirmEvent/styled.tsx
+++ b/src/components/Modal/ModalConfirmEvent/styled.tsx
@ -1,31 +0,0 @@
-import { AppButtonProps, Button } from '@/shared/Button/Button'
-import { Stack, StackProps, ToggleButtonGroup, ToggleButtonGroupProps, styled } from '@mui/material'
-
-export const StyledButton = styled((props: AppButtonProps) => <Button {...props} />)(() => ({
-  borderRadius: '19px',
-  fontWeight: 600,
-  padding: '0.75rem 1rem',
-  maxHeight: '41px',
-}))
-
-export const StyledToggleButtonsGroup = styled((props: ToggleButtonGroupProps) => <ToggleButtonGroup {...props} />)(
-  () => ({
-    gap: '0.75rem',
-    marginBottom: '1rem',
-    justifyContent: 'space-between',
-    '&.MuiToggleButtonGroup-root .MuiToggleButtonGroup-grouped:not(:first-of-type)': {
-      margin: '0',
-      border: 'initial',
-    },
-    '&.MuiToggleButtonGroup-root .MuiToggleButtonGroup-grouped': {
-      border: 'initial',
-      borderRadius: '1rem',
-    },
-  })
-)
-
-export const StyledActionsListContainer = styled((props: StackProps) => <Stack {...props} />)(({ theme }) => ({
-  padding: '0.75rem',
-  background: theme.palette.backgroundSecondary.default,
-  borderRadius: '1rem',
-}))
--- a/src/components/Modal/ModalConfirmEvent/сomponents/ActionToggleButton.tsx
+++ b/src/components/Modal/ModalConfirmEvent/сomponents/ActionToggleButton.tsx
@ -1,21 +0,0 @@
-import { FC } from 'react'
-import { ToggleButtonProps, Typography } from '@mui/material'
-import { StyledToggleButton } from './styled'
-
-type ActionToggleButtonProps = ToggleButtonProps & {
-  hasinfo?: boolean
-}
-
-export const ActionToggleButton: FC<ActionToggleButtonProps> = ({ hasinfo = false, ...props }) => {
-  const { title } = props
-  return (
-    <StyledToggleButton {...props}>
-      <Typography variant="body2">{title}</Typography>
-      {hasinfo && (
-        <Typography className="info" color={'GrayText'}>
-          Info
-        </Typography>
-      )}
-    </StyledToggleButton>
-  )
-}
--- a/src/components/Modal/ModalConfirmEvent/сomponents/styled.tsx
+++ b/src/components/Modal/ModalConfirmEvent/сomponents/styled.tsx
@ -1,33 +0,0 @@
-import { ToggleButton, ToggleButtonProps, styled } from '@mui/material'
-
-export const StyledToggleButton = styled((props: ToggleButtonProps) => (
-  <ToggleButton classes={{ selected: 'selected' }} {...props} />
-))(({ theme }) => ({
-  '&:is(&, :hover, :active)': {
-    background: theme.palette.backgroundSecondary.default,
-  },
-  color: theme.palette.text.primary,
-  flex: '1 0 6.25rem',
-  height: '100px',
-  borderRadius: '1rem',
-  border: `2px solid transparent !important`,
-  '&.selected': {
-    border: `2px solid ${theme.palette.text.primary} !important`,
-  },
-  display: 'flex',
-  flexDirection: 'column',
-  alignItems: 'flex-start',
-  justifyContent: 'flex-start',
-  textTransform: 'initial',
-  textAlign: 'left',
-  '& .description': {
-    display: 'inline-block',
-    textAlign: 'left',
-    lineHeight: '15px',
-    margin: '0.5rem 0 0.25rem',
-  },
-  '& .info': {
-    fontSize: '10px',
-    fontWeight: 500,
-  },
-}))
--- a/src/components/Modal/ModalConnectApp/ModalConnectApp.tsx
+++ b/src/components/Modal/ModalConnectApp/ModalConnectApp.tsx
@ -1,85 +0,0 @@
-import { useEnqueueSnackbar } from '@/hooks/useEnqueueSnackbar'
-import { useModalSearchParams } from '@/hooks/useModalSearchParams'
-import { AppLink } from '@/shared/AppLink/AppLink'
-import { Button } from '@/shared/Button/Button'
-import { Input } from '@/shared/Input/Input'
-import { InputCopyButton } from '@/shared/InputCopyButton/InputCopyButton'
-import { Modal } from '@/shared/Modal/Modal'
-import { selectKeys } from '@/store'
-import { useAppSelector } from '@/store/hooks/redux'
-import { EXPLANATION_MODAL_KEYS, MODAL_PARAMS_KEYS } from '@/types/modal'
-import { getBunkerLink } from '@/utils/helpers/helpers'
-import { Stack, Typography } from '@mui/material'
-import { useRef } from 'react'
-import { useParams } from 'react-router-dom'
-
-export const ModalConnectApp = () => {
-  const keys = useAppSelector(selectKeys)
-
-  const timerRef = useRef<NodeJS.Timeout>()
-  const notify = useEnqueueSnackbar()
-  const { npub = '' } = useParams<{ npub: string }>()
-  const bunkerStr = getBunkerLink(npub)
-
-  const { getModalOpened, createHandleCloseReplace, handleOpen } = useModalSearchParams()
-  const isModalOpened = getModalOpened(MODAL_PARAMS_KEYS.CONNECT_APP)
-  const handleCloseModal = createHandleCloseReplace(MODAL_PARAMS_KEYS.CONNECT_APP, {
-    onClose: () => {
-      clearTimeout(timerRef.current)
-    },
-  })
-
-  const isNpubExists = npub.trim().length && keys.some((key) => key.npub === npub)
-  if (isModalOpened && !isNpubExists) {
-    handleCloseModal()
-    return null
-  }
-
-  const handleShareBunker = async () => {
-    const shareData = {
-      text: bunkerStr,
-    }
-    try {
-      if (navigator.share && navigator.canShare(shareData)) {
-        await navigator.share(shareData)
-      } else {
-        navigator.clipboard.writeText(bunkerStr)
-      }
-    } catch (err) {
-      console.log(err)
-      notify('Your browser does not support sharing data', 'warning')
-    }
-  }
-
-  const handleCopy = () => {
-    timerRef.current = setTimeout(() => {
-      handleCloseModal()
-    }, 3000)
-  }
-
-  return (
-    <Modal open={isModalOpened} title="Share your profile" onClose={handleCloseModal}>
-      <Stack gap={'1rem'} alignItems={'center'}>
-        <Typography variant="caption">Please, copy this code and paste it into the app to log in</Typography>
-        <Input
-          sx={{
-            gap: '0.5rem',
-          }}
-          fullWidth
-          value={bunkerStr}
-          endAdornment={<InputCopyButton value={bunkerStr} onCopy={handleCopy} />}
-        />
-        <AppLink
-          title="What is this?"
-          onClick={() => handleOpen(MODAL_PARAMS_KEYS.EXPLANATION, { search: { type: EXPLANATION_MODAL_KEYS.BUNKER } })}
-        />
-        <Button fullWidth onClick={handleShareBunker}>
-          Share it
-        </Button>
-        <Button fullWidth onClick={handleCloseModal}>
-          Done
-        </Button>
-      </Stack>
-    </Modal>
-  )
-}
--- a/src/components/Modal/ModalExplanation/ModalExplanation.tsx
+++ b/src/components/Modal/ModalExplanation/ModalExplanation.tsx
@ -1,98 +0,0 @@
-import { FC } from 'react'
-import { useModalSearchParams } from '@/hooks/useModalSearchParams'
-import { Modal } from '@/shared/Modal/Modal'
-import { EXPLANATION_MODAL_KEYS, MODAL_PARAMS_KEYS } from '@/types/modal'
-import { Stack, Typography } from '@mui/material'
-import { Button } from '@/shared/Button/Button'
-import { useSearchParams } from 'react-router-dom'
-
-type ModalExplanationProps = {
-  explanationText?: string
-}
-
-export const ModalExplanation: FC<ModalExplanationProps> = () => {
-  const { getModalOpened } = useModalSearchParams()
-  const isModalOpened = getModalOpened(MODAL_PARAMS_KEYS.EXPLANATION)
-  const [searchParams, setSearchParams] = useSearchParams()
-
-  const handleCloseModal = () => {
-    searchParams.delete('type')
-    searchParams.delete(MODAL_PARAMS_KEYS.EXPLANATION)
-    setSearchParams(searchParams, { replace: true })
-  }
-
-  const type = searchParams.get('type')
-
-  let title = ''
-  let explanationText
-  switch (type) {
-    case EXPLANATION_MODAL_KEYS.NPUB: {
-      title = 'What is NPUB?'
-      explanationText = (
-        <>
-          NPUB is your Nostr PUBlic key.
-          <br />
-          <br />
-          It is your global unique identifier on the Nostr network, and is derived from your private key.
-          <br />
-          <br />
-          You can share your NPUB with other people so that they could unambiguously find you on the network.
-        </>
-      )
-      break
-    }
-    case EXPLANATION_MODAL_KEYS.LOGIN: {
-      title = 'What is Login?'
-      explanationText = (
-        <>
-          Login (username) is your human-readable name on the Nostr network.
-          <br />
-          <br />
-          Unlike your NPUB, which is a long string of random symbols, your login is a meaningful name tied to a website
-          address (like name@nsec.app).
-          <br />
-          <br />
-          Use your username to log in to Nostr apps.
-          <br />
-          <br />
-          You can have many usernames all pointing to your NPUB. People also refer to these names as nostr-addresses or
-          NIP05 names.
-        </>
-      )
-      break
-    }
-    case EXPLANATION_MODAL_KEYS.BUNKER: {
-      title = 'What is Bunker URL?'
-      explanationText = (
-        <>
-          Bunker URL is a string used to connect to Nostr apps.
-          <br />
-          <br />
-          Some apps require bunker URL to connect to your keys. Paste it to the app and then confirm a connection
-          request.
-        </>
-      )
-      break
-    }
-  }
-  return (
-    <Modal
-      title={title}
-      open={isModalOpened}
-      onClose={handleCloseModal}
-      withCloseButton={false}
-      PaperProps={{
-        sx: {
-          minHeight: '60%',
-        },
-      }}
-    >
-      <Stack height={'100%'} gap={2}>
-        <Typography flex={1}>{explanationText}</Typography>
-        <Button fullWidth onClick={handleCloseModal}>
-          Got it!
-        </Button>
-      </Stack>
-    </Modal>
-  )
-}
--- a/src/components/Modal/ModalImportKeys/ModalImportKeys.tsx
+++ b/src/components/Modal/ModalImportKeys/ModalImportKeys.tsx
@ -1,204 +0,0 @@
-import { useEnqueueSnackbar } from '@/hooks/useEnqueueSnackbar'
-import { useModalSearchParams } from '@/hooks/useModalSearchParams'
-import { swicCall } from '@/modules/swic'
-import { Button } from '@/shared/Button/Button'
-import { Input } from '@/shared/Input/Input'
-import { Modal } from '@/shared/Modal/Modal'
-import { MODAL_PARAMS_KEYS } from '@/types/modal'
-import { Stack, Typography, useTheme } from '@mui/material'
-import { StyledAppLogo } from './styled'
-import { useNavigate } from 'react-router-dom'
-import { useForm } from 'react-hook-form'
-import { FormInputType, schema } from './const'
-import { yupResolver } from '@hookform/resolvers/yup'
-import { usePassword } from '@/hooks/usePassword'
-import { useCallback, useEffect, useState } from 'react'
-import { useDebounce } from 'use-debounce'
-import { fetchNip05 } from '@/utils/helpers/helpers'
-import { DOMAIN } from '@/utils/consts'
-import { CheckmarkIcon } from '@/assets'
-import { getPublicKey, nip19 } from 'nostr-tools'
-import { LoadingSpinner } from '@/shared/LoadingSpinner/LoadingSpinner'
-
-const FORM_DEFAULT_VALUES = {
-  username: '',
-  nsec: '',
-}
-
-export const ModalImportKeys = () => {
-  const { getModalOpened, createHandleCloseReplace } = useModalSearchParams()
-  const isModalOpened = getModalOpened(MODAL_PARAMS_KEYS.IMPORT_KEYS)
-  const handleCloseModal = createHandleCloseReplace(MODAL_PARAMS_KEYS.IMPORT_KEYS)
-  const { hidePassword, inputProps } = usePassword()
-  const theme = useTheme()
-
-  const {
-    handleSubmit,
-    reset,
-    register,
-    formState: { errors },
-    watch,
-  } = useForm<FormInputType>({
-    defaultValues: FORM_DEFAULT_VALUES,
-    resolver: yupResolver(schema),
-    mode: 'onSubmit',
-  })
-  const [isLoading, setIsLoading] = useState(false)
-  const [nameNpub, setNameNpub] = useState('')
-  const [isTakenByNsec, setIsTakenByNsec] = useState(false)
-  const [isBadNsec, setIsBadNsec] = useState(false)
-  const enteredUsername = watch('username')
-  const enteredNsec = watch('nsec')
-  const [debouncedUsername] = useDebounce(enteredUsername, 100)
-  const [debouncedNsec] = useDebounce(enteredNsec, 100)
-
-  const checkIsUsernameAvailable = useCallback(async () => {
-    if (!debouncedUsername.trim().length) return undefined
-    const npubNip05 = await fetchNip05(`${debouncedUsername}@${DOMAIN}`)
-    setNameNpub(npubNip05 || '')
-  }, [debouncedUsername])
-
-  useEffect(() => {
-    checkIsUsernameAvailable()
-  }, [checkIsUsernameAvailable])
-
-  const checkNsecUsername = useCallback(async () => {
-    if (!debouncedNsec.trim().length) {
-      setIsTakenByNsec(false)
-      setIsBadNsec(false)
-      return
-    }
-    try {
-      const { type, data } = nip19.decode(debouncedNsec)
-      const ok = type === 'nsec'
-      setIsBadNsec(!ok)
-      if (ok) {
-        const npub = nip19.npubEncode(
-          // @ts-ignore
-          getPublicKey(data)
-        )
-        setIsTakenByNsec(!!nameNpub && nameNpub === npub)
-      } else {
-        setIsTakenByNsec(false)
-      }
-    } catch {
-      setIsBadNsec(true)
-      setIsTakenByNsec(false)
-      return
-    }
-    // eslint-disable-next-line
-  }, [debouncedNsec])
-
-  useEffect(() => {
-    checkNsecUsername()
-  }, [checkNsecUsername])
-
-  const cleanUpStates = useCallback(() => {
-    hidePassword()
-    reset()
-    setIsLoading(false)
-    setNameNpub('')
-    setIsTakenByNsec(false)
-    setIsBadNsec(false)
-  }, [reset, hidePassword])
-
-  const notify = useEnqueueSnackbar()
-  const navigate = useNavigate()
-
-  const submitHandler = async (values: FormInputType) => {
-    if (isLoading) return undefined
-    try {
-      const { nsec, username } = values
-      if (!nsec || !username) throw new Error('Enter username and nsec')
-      if (nameNpub && !isTakenByNsec) throw new Error('Name taken')
-      setIsLoading(true)
-      const k: any = await swicCall('importKey', username, nsec)
-      notify('Key imported!', 'success')
-      navigate(`/key/${k.npub}`)
-      cleanUpStates()
-    } catch (error: any) {
-      notify(error?.message || 'Something went wrong!', 'error')
-      cleanUpStates()
-    }
-  }
-
-  useEffect(() => {
-    return () => {
-      isModalOpened && cleanUpStates()
-    }
-  }, [isModalOpened, cleanUpStates])
-
-  const getNameHelperText = () => {
-    if (!enteredUsername) return "Don't worry, username can be changed later."
-    if (isTakenByNsec) return 'Name matches your key'
-    if (isBadNsec) return 'Invalid nsec'
-    if (nameNpub) return 'Already taken'
-    return (
-      <>
-        <CheckmarkIcon /> Available
-      </>
-    )
-  }
-
-  const getNsecHelperText = () => {
-    if (isBadNsec) return 'Invalid nsec'
-    return 'Keys stay on your device.'
-  }
-
-  const nameHelperText = getNameHelperText()
-  const nsecHelperText = getNsecHelperText()
-
-  return (
-    <Modal open={isModalOpened} onClose={handleCloseModal}>
-      <Stack gap={'1rem'} component={'form'} onSubmit={handleSubmit(submitHandler)}>
-        <Stack direction={'row'} gap={'1rem'} alignItems={'center'} alignSelf={'flex-start'}>
-          <StyledAppLogo />
-          <Typography fontWeight={600} variant="h5">
-            Import key
-          </Typography>
-        </Stack>
-        <Input
-          label="Choose a username"
-          fullWidth
-          placeholder="Enter a Username"
-          endAdornment={<Typography color={'#FFFFFFA8'}>@{DOMAIN}</Typography>}
-          {...register('username')}
-          error={!!errors.username}
-          helperText={nameHelperText}
-          helperTextProps={{
-            sx: {
-              '&.helper_text': {
-                color:
-                  enteredUsername && (isTakenByNsec || !nameNpub)
-                    ? theme.palette.success.main
-                    : enteredUsername && nameNpub
-                      ? theme.palette.error.main
-                      : theme.palette.textSecondaryDecorate.main,
-              },
-            },
-          }}
-        />
-        <Input
-          label="Paste your private key"
-          placeholder="nsec1..."
-          fullWidth
-          {...register('nsec')}
-          error={!!errors.nsec}
-          {...inputProps}
-          helperText={nsecHelperText}
-          helperTextProps={{
-            sx: {
-              '&.helper_text': {
-                color: isBadNsec ? theme.palette.error.main : theme.palette.textSecondaryDecorate.main,
-              },
-            },
-          }}
-        />
-
-        <Button type="submit" disabled={isLoading}>
-          Import key {isLoading && <LoadingSpinner />}
-        </Button>
-      </Stack>
-    </Modal>
-  )
-}
--- a/src/components/Modal/ModalImportKeys/const.ts
+++ b/src/components/Modal/ModalImportKeys/const.ts
@ -1,8 +0,0 @@
-import * as yup from 'yup'
-
-export const schema = yup.object().shape({
-  username: yup.string().required(),
-  nsec: yup.string().required(),
-})
-
-export type FormInputType = yup.InferType<typeof schema>
--- a/src/components/Modal/ModalImportKeys/styled.tsx
+++ b/src/components/Modal/ModalImportKeys/styled.tsx
@ -1,14 +0,0 @@
-import { AppLogo } from '@/assets'
-import { Box, styled } from '@mui/material'
-
-export const StyledAppLogo = styled((props) => (
-  <Box {...props}>
-    <AppLogo />
-  </Box>
-))(() => ({
-  background: '#0d0d0d',
-  padding: '0.75rem',
-  borderRadius: '16px',
-  display: 'grid',
-  placeItems: 'center',
-}))
--- a/src/components/Modal/ModalInitial/ModalInitial.tsx
+++ b/src/components/Modal/ModalInitial/ModalInitial.tsx
@ -1,37 +0,0 @@
-// import { useEffect } from 'react'
-import { useModalSearchParams } from '@/hooks/useModalSearchParams'
-import { Button } from '@/shared/Button/Button'
-import { Modal } from '@/shared/Modal/Modal'
-import { MODAL_PARAMS_KEYS } from '@/types/modal'
-import { Stack } from '@mui/material'
-// import { AppLink } from '@/shared/AppLink/AppLink'
-
-export const ModalInitial = () => {
-  const { getModalOpened, createHandleCloseReplace, handleOpen } = useModalSearchParams()
-  const isModalOpened = getModalOpened(MODAL_PARAMS_KEYS.INITIAL)
-  const handleCloseModal = createHandleCloseReplace(MODAL_PARAMS_KEYS.INITIAL)
-
-  // const [showAdvancedContent, setShowAdvancedContent] = useState(false)
-
-  // const handleShowAdvanced = () => {
-  //   setShowAdvancedContent(true)
-  // }
-
-  // useEffect(() => {
-  //   return () => {
-  //     if (isModalOpened) {
-  //       setShowAdvancedContent(false)
-  //     }
-  //   }
-  // }, [isModalOpened])
-
-  return (
-    <Modal open={isModalOpened} onClose={handleCloseModal}>
-      <Stack paddingTop={'0.5rem'} gap={'1rem'}>
-        <Button onClick={() => handleOpen(MODAL_PARAMS_KEYS.SIGN_UP)}>Sign up</Button>
-        <Button onClick={() => handleOpen(MODAL_PARAMS_KEYS.LOGIN)}>Login</Button>
-        <Button onClick={() => handleOpen(MODAL_PARAMS_KEYS.IMPORT_KEYS)}>Import key</Button>
-      </Stack>
-    </Modal>
-  )
-}
--- a/src/components/Modal/ModalLogin/ModalLogin.tsx
+++ b/src/components/Modal/ModalLogin/ModalLogin.tsx
@ -1,151 +0,0 @@
-import { useCallback, useEffect, useState } from 'react'
-import { useEnqueueSnackbar } from '@/hooks/useEnqueueSnackbar'
-import { useModalSearchParams } from '@/hooks/useModalSearchParams'
-import { swicCall } from '@/modules/swic'
-import { Modal } from '@/shared/Modal/Modal'
-import { MODAL_PARAMS_KEYS } from '@/types/modal'
-import { Stack, Typography } from '@mui/material'
-import { StyledAppLogo } from './styled'
-import { Input } from '@/shared/Input/Input'
-import { Button } from '@/shared/Button/Button'
-import { useNavigate, useSearchParams } from 'react-router-dom'
-import { useForm } from 'react-hook-form'
-import { FormInputType, schema } from './const'
-import { yupResolver } from '@hookform/resolvers/yup'
-import { DOMAIN } from '@/utils/consts'
-import { fetchNip05, fetchNpubNames } from '@/utils/helpers/helpers'
-import { usePassword } from '@/hooks/usePassword'
-import { dbi } from '@/modules/db'
-import { LoadingSpinner } from '@/shared/LoadingSpinner/LoadingSpinner'
-
-const FORM_DEFAULT_VALUES = {
-  username: '',
-  password: '',
-}
-
-export const ModalLogin = () => {
-  const { getModalOpened, createHandleCloseReplace } = useModalSearchParams()
-  const isModalOpened = getModalOpened(MODAL_PARAMS_KEYS.LOGIN)
-  const handleCloseModal = createHandleCloseReplace(MODAL_PARAMS_KEYS.LOGIN)
-
-  const notify = useEnqueueSnackbar()
-  const navigate = useNavigate()
-  const { hidePassword, inputProps } = usePassword()
-  const [isLoading, setIsLoading] = useState(false)
-  const [searchParams] = useSearchParams()
-  const isPopup = searchParams.get('popup') === 'true'
-
-  const {
-    handleSubmit,
-    reset,
-    register,
-    setValue,
-    formState: { errors },
-  } = useForm<FormInputType>({
-    defaultValues: FORM_DEFAULT_VALUES,
-    resolver: yupResolver(schema),
-    mode: 'onSubmit',
-  })
-
-  const cleanUpStates = useCallback(() => {
-    hidePassword()
-    reset()
-    setIsLoading(false)
-  }, [reset, hidePassword])
-
-  const submitHandler = async (values: FormInputType) => {
-    if (isLoading) return undefined
-
-    try {
-      setIsLoading(true)
-      let npub = values.username
-      let name = ''
-
-      if (!npub.startsWith('npub1')) {
-        name = npub
-        if (!npub.includes('@')) {
-          npub += '@' + DOMAIN
-        } else {
-          const nameDomain = npub.split('@')
-          if (nameDomain[1] === DOMAIN) name = nameDomain[0]
-        }
-      }
-      if (npub.includes('@')) {
-        const npubNip05 = await fetchNip05(npub)
-        if (!npubNip05) throw new Error(`Username ${npub} not found`)
-        npub = npubNip05
-      }
-      const passphrase = values.password
-
-      console.log('fetch', npub, name)
-      const k: any = await swicCall('fetchKey', npub, passphrase, name)
-      notify(`Fetched ${k.npub}`, 'success')
-      dbi.addSynced(k.npub)
-      cleanUpStates()
-      setTimeout(() => {
-        // give frontend time to read the new key first
-        navigate(`/key/${k.npub}${isPopup ? '?popup=true' : ''}`)
-      }, 300)
-    } catch (error: any) {
-      console.log('error', error)
-      notify(error?.message || 'Something went wrong!', 'error')
-      setIsLoading(false)
-    }
-  }
-
-  useEffect(() => {
-    if (isModalOpened) {
-      const npub = searchParams.get('npub') || ''
-      const appNpub = searchParams.get('appNpub') || ''
-      if (isPopup && isModalOpened) {
-        swicCall('fetchPendingRequests', npub, appNpub)
-
-        fetchNpubNames(npub).then(names => {
-          if (names.length) {
-            setValue('username', `${names[0]}@${DOMAIN}`)
-          }
-        })
-      }
-    }
-  }, [searchParams, isModalOpened, isPopup, setValue])
-
-  useEffect(() => {
-    return () => {
-      if (isModalOpened) {
-        // modal closed
-        cleanUpStates()
-      }
-    }
-  }, [isModalOpened, cleanUpStates])
-
-  return (
-    <Modal open={isModalOpened} onClose={handleCloseModal}>
-      <Stack gap={'1rem'} component={'form'} onSubmit={handleSubmit(submitHandler)}>
-        <Stack direction={'row'} gap={'1rem'} alignItems={'center'} alignSelf={'flex-start'}>
-          <StyledAppLogo />
-          <Typography fontWeight={600} variant="h5">
-            Login
-          </Typography>
-        </Stack>
-        <Input
-          label="Username or nip05 or npub"
-          fullWidth
-          placeholder="name or name@domain.com or npub1..."
-          {...register('username')}
-          error={!!errors.username}
-        />
-        <Input
-          label="Password"
-          fullWidth
-          placeholder="Your password"
-          {...register('password')}
-          {...inputProps}
-          error={!!errors.password}
-        />
-        <Button type="submit" fullWidth disabled={isLoading}>
-          Add account {isLoading && <LoadingSpinner />}
-        </Button>
-      </Stack>
-    </Modal>
-  )
-}
--- a/src/components/Modal/ModalLogin/const.ts
+++ b/src/components/Modal/ModalLogin/const.ts
@ -1,8 +0,0 @@
-import * as yup from 'yup'
-
-export const schema = yup.object().shape({
-  username: yup.string().required(),
-  password: yup.string().required().min(4),
-})
-
-export type FormInputType = yup.InferType<typeof schema>
--- a/src/components/Modal/ModalLogin/styled.tsx
+++ b/src/components/Modal/ModalLogin/styled.tsx
@ -1,14 +0,0 @@
-import { AppLogo } from '@/assets'
-import { Box, styled } from '@mui/material'
-
-export const StyledAppLogo = styled((props) => (
-  <Box {...props}>
-    <AppLogo />
-  </Box>
-))({
-  background: '#0d0d0d',
-  padding: '0.75rem',
-  borderRadius: '16px',
-  display: 'grid',
-  placeItems: 'center',
-})
--- a/src/components/Modal/ModalSettings/ModalSettings.tsx
+++ b/src/components/Modal/ModalSettings/ModalSettings.tsx
@ -1,151 +0,0 @@
-import { useModalSearchParams } from '@/hooks/useModalSearchParams'
-import { Modal } from '@/shared/Modal/Modal'
-import { MODAL_PARAMS_KEYS } from '@/types/modal'
-import { Box, Stack, Typography } from '@mui/material'
-import { StyledButton, StyledSettingContainer, StyledSynchedText } from './styled'
-import { SectionTitle } from '@/shared/SectionTitle/SectionTitle'
-import { CheckmarkIcon } from '@/assets'
-import { Input } from '@/shared/Input/Input'
-import { ChangeEvent, FC, useEffect, useState } from 'react'
-import { Checkbox } from '@/shared/Checkbox/Checkbox'
-import { useEnqueueSnackbar } from '@/hooks/useEnqueueSnackbar'
-import { swicCall } from '@/modules/swic'
-import { useParams } from 'react-router-dom'
-import { dbi } from '@/modules/db'
-import { usePassword } from '@/hooks/usePassword'
-import { useAppSelector } from '@/store/hooks/redux'
-import { selectKeys } from '@/store'
-import { isValidPassphase, isWeakPassphase } from '@/modules/keys'
-import { LoadingSpinner } from '@/shared/LoadingSpinner/LoadingSpinner'
-
-type ModalSettingsProps = {
-  isSynced: boolean
-}
-
-export const ModalSettings: FC<ModalSettingsProps> = ({ isSynced }) => {
-  const { getModalOpened, createHandleCloseReplace } = useModalSearchParams()
-  const { npub = '' } = useParams<{ npub: string }>()
-  const keys = useAppSelector(selectKeys)
-
-  const notify = useEnqueueSnackbar()
-
-  const isModalOpened = getModalOpened(MODAL_PARAMS_KEYS.SETTINGS)
-  const handleCloseModal = createHandleCloseReplace(MODAL_PARAMS_KEYS.SETTINGS)
-
-  const { hidePassword, inputProps } = usePassword()
-
-  const [enteredPassword, setEnteredPassword] = useState('')
-  const [isPasswordInvalid, setIsPasswordInvalid] = useState(false)
-
-  const [isChecked, setIsChecked] = useState(false)
-  const [isLoading, setIsLoading] = useState(false)
-
-  useEffect(() => setIsChecked(isSynced), [isModalOpened, isSynced])
-
-  useEffect(() => {
-    return () => {
-      if (isModalOpened) {
-        // modal closed
-        hidePassword()
-      }
-    }
-  }, [hidePassword, isModalOpened])
-
-  const isNpubExists = npub.trim().length && keys.some((key) => key.npub === npub)
-
-  if (isModalOpened && !isNpubExists) {
-    handleCloseModal()
-    return null
-  }
-
-  const handlePasswordChange = (e: ChangeEvent<HTMLInputElement>) => {
-    const password = e.target.value
-    setIsPasswordInvalid(!!password && !isValidPassphase(password))
-    setEnteredPassword(password)
-  }
-
-  const onClose = () => {
-    handleCloseModal()
-    setEnteredPassword('')
-    setIsPasswordInvalid(false)
-  }
-
-  const handleChangeCheckbox = (e: unknown, checked: boolean) => {
-    setIsChecked(checked)
-  }
-
-  const handleSubmit = async (e: React.FormEvent) => {
-    e.preventDefault()
-    setIsPasswordInvalid(false)
-
-    if (!isValidPassphase(enteredPassword)) {
-      return setIsPasswordInvalid(true)
-    }
-    try {
-      setIsLoading(true)
-      await swicCall('saveKey', npub, enteredPassword)
-      notify('Key saved', 'success')
-      dbi.addSynced(npub) // Sync npub
-      setEnteredPassword('')
-      setIsPasswordInvalid(false)
-      setIsLoading(false)
-    } catch (error) {
-      setIsPasswordInvalid(false)
-      setIsLoading(false)
-    }
-  }
-
-  return (
-    <Modal open={isModalOpened} onClose={onClose} title="Settings">
-      <Stack gap={'1rem'}>
-        <StyledSettingContainer onSubmit={handleSubmit}>
-          <Stack direction={'row'} justifyContent={'space-between'}>
-            <SectionTitle>Cloud sync</SectionTitle>
-            {isSynced && (
-              <StyledSynchedText>
-                <CheckmarkIcon /> Synched
-              </StyledSynchedText>
-            )}
-          </Stack>
-          <Box>
-            <Checkbox onChange={handleChangeCheckbox} checked={isChecked} />
-            <Typography variant="caption">Use this key on multiple devices</Typography>
-          </Box>
-          <Input
-            fullWidth
-            {...inputProps}
-            onChange={handlePasswordChange}
-            value={enteredPassword}
-            placeholder="Enter a password"
-            disabled={!isChecked}
-          />
-          {isPasswordInvalid ? (
-            <Typography variant="body2" color={'red'}>
-              Password must include 6+ English letters, numbers or punctuation marks.
-            </Typography>
-          ) : !!enteredPassword && isWeakPassphase(enteredPassword) ? (
-            <Typography variant="body2" color={'orange'}>
-              Weak password
-            </Typography>
-          ) : !!enteredPassword && !isPasswordInvalid ? (
-            <Typography variant="body2" color={'green'}>
-              Good password
-            </Typography>
-          ) : isSynced ? (
-            <Typography variant="body2" color={'GrayText'}>
-              To change your password, type a new one and sync.
-            </Typography>
-          ) : (
-            <Typography variant="body2" color={'GrayText'}>
-              This key will be encrypted and stored on our server. You can use the password to download this key onto
-              another device.
-            </Typography>
-          )}
-          <StyledButton type="submit" fullWidth disabled={!isChecked}>
-            Sync {isLoading && <LoadingSpinner mode="secondary" />}
-          </StyledButton>
-        </StyledSettingContainer>
-      </Stack>
-    </Modal>
-  )
-}
--- a/src/components/Modal/ModalSettings/styled.tsx
+++ b/src/components/Modal/ModalSettings/styled.tsx
@ -1,31 +0,0 @@
-import { Button } from '@/shared/Button/Button'
-import { Stack, StackProps, Typography, TypographyProps, styled } from '@mui/material'
-
-export const StyledSettingContainer = styled((props: StackProps) => (
-  <Stack gap={'0.75rem'} component={'form'} {...props} />
-))(({ theme }) => ({
-  padding: '1rem',
-  borderRadius: '1rem',
-  background: theme.palette.background.default,
-  color: theme.palette.text.primary,
-}))
-
-export const StyledButton = styled(Button)(({ theme }) => {
-  return {
-    '&.button:is(:hover, :active, &)': {
-      background: theme.palette.secondary.main,
-      color: theme.palette.text.primary,
-    },
-    ':disabled': {
-      cursor: 'not-allowed',
-    },
-  }
-})
-
-export const StyledSynchedText = styled((props: TypographyProps) => <Typography variant="caption" {...props} />)(({
-  theme,
-}) => {
-  return {
-    color: theme.palette.success.main,
-  }
-})
--- a/src/components/Modal/ModalSignUp/ModalSignUp.tsx
+++ b/src/components/Modal/ModalSignUp/ModalSignUp.tsx
@ -1,122 +0,0 @@
-import { useEnqueueSnackbar } from '@/hooks/useEnqueueSnackbar'
-import { useModalSearchParams } from '@/hooks/useModalSearchParams'
-import { Modal } from '@/shared/Modal/Modal'
-import { MODAL_PARAMS_KEYS } from '@/types/modal'
-import { Stack, Typography, useTheme } from '@mui/material'
-import React, { ChangeEvent, useEffect, useState } from 'react'
-import { StyledAppLogo } from './styled'
-import { Input } from '@/shared/Input/Input'
-import { Button } from '@/shared/Button/Button'
-import { CheckmarkIcon } from '@/assets'
-import { swicCall } from '@/modules/swic'
-import { useNavigate } from 'react-router-dom'
-import { DOMAIN } from '@/utils/consts'
-import { fetchNip05 } from '@/utils/helpers/helpers'
-import { LoadingSpinner } from '@/shared/LoadingSpinner/LoadingSpinner'
-
-export const ModalSignUp = () => {
-  const { getModalOpened, createHandleCloseReplace } = useModalSearchParams()
-  const isModalOpened = getModalOpened(MODAL_PARAMS_KEYS.SIGN_UP)
-  const handleCloseModal = createHandleCloseReplace(MODAL_PARAMS_KEYS.SIGN_UP)
-  const notify = useEnqueueSnackbar()
-  const theme = useTheme()
-
-  const navigate = useNavigate()
-
-  const [enteredValue, setEnteredValue] = useState('')
-  const [isAvailable, setIsAvailable] = useState(false)
-
-  const [isLoading, setIsLoading] = useState(false)
-
-  const handleInputChange = async (e: ChangeEvent<HTMLInputElement>) => {
-    setEnteredValue(e.target.value)
-    const name = e.target.value.trim()
-    if (name) {
-      const npubNip05 = await fetchNip05(`${name}@${DOMAIN}`)
-      setIsAvailable(!npubNip05)
-    } else {
-      setIsAvailable(false)
-    }
-  }
-
-  const getInputHelperText = () => {
-    if (!enteredValue) return "Don't worry, username can be changed later."
-    if (!isAvailable) return 'Already taken'
-    return (
-      <>
-        <CheckmarkIcon /> Available
-      </>
-    )
-  }
-
-  const inputHelperText = getInputHelperText()
-
-  const handleSubmit = async (e: React.FormEvent) => {
-    e.preventDefault()
-    if (isLoading || !isAvailable) return undefined
-
-    const name = enteredValue.trim()
-    if (!name.length) return
-
-    try {
-      setIsLoading(true)
-      const k: any = await swicCall('generateKey', name)
-      notify(`Account created for "${name}"`, 'success')
-      setIsLoading(false)
-      setTimeout(() => {
-        // give frontend time to read the new key first
-        navigate(`/key/${k.npub}`)
-      }, 300)
-    } catch (error: any) {
-      notify(error?.message || 'Something went wrong!', 'error')
-      setIsLoading(false)
-    }
-  }
-
-  useEffect(() => {
-    return () => {
-      if (isModalOpened) {
-        // modal closed
-        setIsLoading(false)
-        setIsAvailable(false)
-      }
-    }
-  }, [isModalOpened])
-
-  return (
-    <Modal open={isModalOpened} onClose={handleCloseModal}>
-      <Stack paddingTop={'1rem'} gap={'1rem'} component={'form'} onSubmit={handleSubmit}>
-        <Stack direction={'row'} gap={'1rem'} alignItems={'center'} alignSelf={'flex-start'}>
-          <StyledAppLogo />
-          <Typography fontWeight={600} variant="h5">
-            Sign up
-          </Typography>
-        </Stack>
-        <Input
-          label="Username"
-          fullWidth
-          placeholder="Enter a Username"
-          helperText={inputHelperText}
-          endAdornment={<Typography color={'#FFFFFFA8'}>@{DOMAIN}</Typography>}
-          onChange={handleInputChange}
-          value={enteredValue}
-          helperTextProps={{
-            sx: {
-              '&.helper_text': {
-                color:
-                  enteredValue && isAvailable
-                    ? theme.palette.success.main
-                    : enteredValue && !isAvailable
-                      ? theme.palette.error.main
-                      : theme.palette.textSecondaryDecorate.main,
-              },
-            },
-          }}
-        />
-        <Button fullWidth type="submit" disabled={isLoading}>
-          Create account {isLoading && <LoadingSpinner />}
-        </Button>
-      </Stack>
-    </Modal>
-  )
-}
--- a/src/components/Modal/ModalSignUp/styled.tsx
+++ b/src/components/Modal/ModalSignUp/styled.tsx
@ -1,14 +0,0 @@
-import { AppLogo } from '@/assets'
-import { Box, styled } from '@mui/material'
-
-export const StyledAppLogo = styled((props) => (
-  <Box {...props}>
-    <AppLogo />
-  </Box>
-))({
-  background: '#0d0d0d',
-  padding: '0.75rem',
-  borderRadius: '16px',
-  display: 'grid',
-  placeItems: 'center',
-})
--- a/src/components/Notification/Notification.tsx
+++ b/src/components/Notification/Notification.tsx
@ -1,23 +0,0 @@
-import { IconButton, Typography } from '@mui/material'
-import { forwardRef } from 'react'
-import { useSnackbar } from 'notistack'
-import CloseIcon from '@mui/icons-material/Close'
-import { NotificationProps } from './types'
-import { StyledAlert, StyledContainer } from './styled'
-
-export const Notification = forwardRef<HTMLDivElement, NotificationProps>(({ message, alertvariant, id }, ref) => {
-  const { closeSnackbar } = useSnackbar()
-
-  const closeSnackBarHandler = () => closeSnackbar(id)
-
-  return (
-    <StyledAlert alertvariant={alertvariant} ref={ref}>
-      <StyledContainer>
-        <Typography variant="body1">{message}</Typography>
-        <IconButton onClick={closeSnackBarHandler} color="inherit">
-          <CloseIcon color="inherit" />
-        </IconButton>
-      </StyledContainer>
-    </StyledAlert>
-  )
-})
--- a/src/components/Notification/const.ts
+++ b/src/components/Notification/const.ts
@ -1,9 +0,0 @@
-import { VariantType } from 'notistack'
-
-type Variant = Exclude<VariantType, 'default' | 'info'>
-
-export const BORDER_STYLES: Record<Variant, string> = {
-  error: '#b90e0a',
-  success: '#32cd32',
-  warning: '#FF9500',
-}
--- a/src/components/Notification/styled.tsx
+++ b/src/components/Notification/styled.tsx
@ -1,44 +0,0 @@
-import { Alert, Box, styled } from '@mui/material'
-import { StyledAlertProps } from './types'
-import { BORDER_STYLES } from './const'
-import { forwardRef } from 'react'
-
-export const StyledAlert = styled(
-  forwardRef<HTMLDivElement, StyledAlertProps>((props, ref) => <Alert {...props} ref={ref} icon={false} />)
-)(({ alertvariant }) => ({
-  width: '100%',
-  maxHeight: 56,
-  padding: '0.5rem 1rem',
-  backgroundColor: '#FFF',
-  borderRadius: 4,
-  border: `solid ${BORDER_STYLES[alertvariant]} 1px`,
-  color: BORDER_STYLES[alertvariant],
-  fontSize: 12,
-  fontWeight: '500',
-  '& .MuiAlert-message': {
-    display: 'flex',
-    minWidth: '100%',
-    justifyContent: 'space-between',
-    overflow: 'hidden',
-    padding: 0,
-  },
-}))
-
-export const StyledContainer = styled(Box)(() => ({
-  display: 'flex',
-  justifyContent: 'space-between',
-  alignItems: 'center',
-  gap: '1rem',
-  width: '100%',
-  '& > .MuiTypography-root': {
-    flex: 1,
-    width: '100%',
-    wordBreak: 'break-word',
-    display: '-webkit-box',
-    WebkitLineClamp: 2,
-    WebkitBoxOrient: 'vertical',
-    overflow: 'hidden',
-    textOverflow: 'ellipsis',
-    fontWeight: 500,
-  },
-}))
--- a/src/components/Notification/types.ts
+++ b/src/components/Notification/types.ts
@ -1,11 +0,0 @@
-import { AlertProps } from '@mui/material'
-import { SnackbarKey, VariantType } from 'notistack'
-
-export type StyledAlertProps = Omit<AlertProps, 'id'> & {
-  alertvariant: Exclude<VariantType, 'default' | 'info'>
-}
-
-export type NotificationProps = {
-  message: string
-  id: SnackbarKey
-} & StyledAlertProps
--- a/src/components/Warning/Warning.tsx
+++ b/src/components/Warning/Warning.tsx
@ -1,27 +0,0 @@
-import { FC, ReactNode } from 'react'
-import { IconContainer, StyledContainer } from './styled'
-import { BoxProps, Stack, Typography } from '@mui/material'
-
-type WarningProps = {
-  message?: string | ReactNode
-  hint?: string | ReactNode
-  icon?: ReactNode
-} & BoxProps
-
-export const Warning: FC<WarningProps> = ({ hint, message, icon, ...restProps }) => {
-  return (
-    <StyledContainer {...restProps}>
-      {icon && <IconContainer>{icon}</IconContainer>}
-      <Stack flex={1} direction={'column'} gap={'0.2rem'}>
-        <Typography noWrap>
-          {message}
-        </Typography>
-        {hint && (
-          <Typography>
-            {hint}
-          </Typography>
-        )}
-      </Stack>
-    </StyledContainer>
-  )
-}
--- a/src/components/Warning/styled.tsx
+++ b/src/components/Warning/styled.tsx
@ -1,22 +0,0 @@
-import { Box, BoxProps, styled } from '@mui/material'
-
-export const StyledContainer = styled((props: BoxProps) => <Box {...props} />)(() => {
-  return {
-    borderRadius: '4px',
-    border: '1px solid grey',
-    padding: '0.5rem',
-    display: 'flex',
-    alignItems: 'center',
-    gap: '1rem',
-    cursor: 'pointer',
-  }
-})
-
-export const IconContainer = styled((props: BoxProps) => <Box {...props} />)(() => ({
-  width: '40px',
-  height: '40px',
-  borderRadius: '50%',
-  background: 'grey',
-  display: 'grid',
-  placeItems: 'center',
-}))
--- a/src/consts.ts
+++ b/src/consts.ts
@ -0,0 +1,4 @@
+export const NIP46_RELAYS = ['wss://relay.login.nostrapps.org']
+export const NOAUTHD_URL = process.env.REACT_APP_NOAUTHD_URL
+export const WEB_PUSH_PUBKEY = process.env.REACT_APP_WEB_PUSH_PUBKEY
+
--- a/src/modules/db.ts
+++ b/src/modules/db.ts
@ -1,4 +1,3 @@
-import { MetaEvent } from '@/types/meta-event'
 import Dexie from 'dexie'

 export interface DbKey {
@ -8,7 +7,6 @@ export interface DbKey {
  avatar?: string
  relays?: string[]
  enckey: string
-  profile?: MetaEvent | null
 }

 export interface DbApp {
@ -48,29 +46,23 @@ export interface DbHistory {
  allowed: boolean
 }

-export interface DbSyncHistory {
-  npub: string
-}
-
 export interface DbSchema extends Dexie {
  keys: Dexie.Table<DbKey, string>
  apps: Dexie.Table<DbApp, string>
  perms: Dexie.Table<DbPerm, string>
  pending: Dexie.Table<DbPending, string>
  history: Dexie.Table<DbHistory, string>
-  syncHistory: Dexie.Table<DbSyncHistory, string>
 }

 export const db = new Dexie('noauthdb') as DbSchema

-db.version(8).stores({
+db.version(7).stores({
  keys: 'npub',
  apps: 'appNpub,npub,name,timestamp',
  perms: 'id,npub,appNpub,perm,value,timestamp',
  pending: 'id,npub,appNpub,timestamp,method',
  history: 'id,npub,appNpub,timestamp,method,allowed',
-  requestHistory: 'id',
-  syncHistory: 'npub',
+  requestHistory: 'id'
 })

 export const dbi = {
@ -103,17 +95,6 @@ export const dbi = {
      console.log(`db addApp error: ${error}`)
    }
  },
-  updateApp: async (app: Omit<DbApp, 'npub' | 'timestamp'>) => {
-    try {
-      await db.apps.where({ appNpub: app.appNpub }).modify({
-        name: app.name,
-        icon: app.icon,
-        url: app.url,
-      })
-    } catch (error) {
-      console.log(`db updateApp error: ${error}`)
-    }
-  },
  listApps: async (): Promise<DbApp[]> => {
    try {
      return await db.apps.toArray()
@ -161,9 +142,8 @@ export const dbi = {
  addPending: async (r: DbPending) => {
    try {
      return db.transaction('rw', db.pending, db.history, async () => {
-        const exists =
-          (await db.pending.where('id').equals(r.id).toArray()).length > 0 ||
-          (await db.history.where('id').equals(r.id).toArray()).length > 0
+        const exists = (await db.pending.where('id').equals(r.id).toArray()).length > 0
+          || (await db.history.where('id').equals(r.id).toArray()).length > 0
        if (exists) return false

        await db.pending.add(r)
@ -192,11 +172,12 @@ export const dbi = {
  confirmPending: async (id: string, allowed: boolean) => {
    try {
      db.transaction('rw', db.pending, db.history, async () => {
-        const r: DbPending | undefined = await db.pending.where('id').equals(id).first()
-        if (!r) throw new Error('Pending not found ' + id)
+        const r: DbPending | undefined
+          = await db.pending.where('id').equals(id).first()
+        if (!r) throw new Error("Pending not found " + id)
        const h: DbHistory = {
          ...r,
-          allowed,
+          allowed
        }
        await db.pending.delete(id)
        await db.history.add(h)
@ -213,12 +194,4 @@ export const dbi = {
      return false
    }
  },
-  addSynced: async (npub: string) => {
-    try {
-      await db.syncHistory.add({ npub })
-    } catch (error) {
-      console.log(`db addSynced error: ${error}`)
-      return false
-    }
-  },
 }
--- a/src/ende.ts
+++ b/src/ende.ts
@ -0,0 +1,126 @@
+/*
+ende stands for encryption decryption
+*/
+import { secp256k1 as secp } from '@noble/curves/secp256k1'
+//import * as secp from "./vendor/secp256k1.js";
+
+export async function encrypt(
+    publicKey: string,
+    message: string,
+    privateKey: string,
+): Promise<string> {
+    const key = secp.getSharedSecret(privateKey, "02" + publicKey);
+    const normalizedKey = getNormalizedX(key);
+    const encoder = new TextEncoder();
+    const iv = Uint8Array.from(randomBytes(16));
+    const plaintext = encoder.encode(message);
+    const cryptoKey = await crypto.subtle.importKey(
+        "raw",
+        normalizedKey,
+        { name: "AES-CBC" },
+        false,
+        ["encrypt"],
+    );
+    const ciphertext = await crypto.subtle.encrypt(
+        { name: "AES-CBC", iv },
+        cryptoKey,
+        plaintext,
+    );
+
+    const ctb64 = toBase64(new Uint8Array(ciphertext));
+    const ivb64 = toBase64(new Uint8Array(iv.buffer));
+    return `${ctb64}?iv=${ivb64}`;
+}
+
+export async function decrypt(
+    privateKey: string,
+    publicKey: string,
+    data: string,
+): Promise<string | Error> {
+    const key = secp.getSharedSecret(privateKey, "02" + publicKey); // this line is very slow
+    return decrypt_with_shared_secret(data, key);
+}
+
+export async function decrypt_with_shared_secret(
+    data: string,
+    sharedSecret: Uint8Array,
+): Promise<string | Error> {
+    const [ctb64, ivb64] = data.split("?iv=");
+    const normalizedKey = getNormalizedX(sharedSecret);
+
+    const cryptoKey = await crypto.subtle.importKey(
+        "raw",
+        normalizedKey,
+        { name: "AES-CBC" },
+        false,
+        ["decrypt"],
+    );
+    let ciphertext: BufferSource;
+    let iv: BufferSource;
+    try {
+        ciphertext = decodeBase64(ctb64);
+        iv = decodeBase64(ivb64);
+    } catch (e) {
+        return new Error(`failed to decode, ${e}`);
+    }
+
+    try {
+        const plaintext = await crypto.subtle.decrypt(
+            { name: "AES-CBC", iv },
+            cryptoKey,
+            ciphertext,
+        );
+        const text = utf8Decode(plaintext);
+        return text;
+    } catch (e) {
+        return new Error(`failed to decrypt, ${e}`);
+    }
+}
+
+export function utf8Encode(str: string) {
+    let encoder = new TextEncoder();
+    return encoder.encode(str);
+}
+
+export function utf8Decode(bin: Uint8Array | ArrayBuffer): string {
+    let decoder = new TextDecoder();
+    return decoder.decode(bin);
+}
+
+function toBase64(uInt8Array: Uint8Array) {
+    let strChunks = new Array(uInt8Array.length);
+    let i = 0;
+    // @ts-ignore
+    for (let byte of uInt8Array) {
+        strChunks[i] = String.fromCharCode(byte); // bytes to utf16 string
+        i++;
+    }
+    return btoa(strChunks.join(""));
+}
+
+function decodeBase64(base64String: string) {
+    const binaryString = atob(base64String);
+    const length = binaryString.length;
+    const bytes = new Uint8Array(length);
+
+    for (let i = 0; i < length; i++) {
+        bytes[i] = binaryString.charCodeAt(i);
+    }
+    return bytes;
+}
+
+function getNormalizedX(key: Uint8Array): Uint8Array {
+    return key.slice(1, 33);
+}
+
+function randomBytes(bytesLength: number = 32) {
+    return crypto.getRandomValues(new Uint8Array(bytesLength));
+}
+
+export function utf16Encode(str: string): number[] {
+    let array = new Array(str.length);
+    for (let i = 0; i < str.length; i++) {
+        array[i] = str.charCodeAt(i);
+    }
+    return array;
+}
--- a/src/hooks/useEnqueueSnackbar.tsx
+++ b/src/hooks/useEnqueueSnackbar.tsx
@ -1,20 +0,0 @@
-import { useSnackbar as useDefaultSnackbar, OptionsObject, VariantType } from 'notistack'
-import { Notification } from '../components/Notification/Notification'
-
-export const useEnqueueSnackbar = () => {
-  const { enqueueSnackbar } = useDefaultSnackbar()
-
-  const showSnackbar = (message: string, variant: Exclude<VariantType, 'default' | 'info'> = 'success') => {
-    enqueueSnackbar(message, {
-      anchorOrigin: {
-        vertical: 'top',
-        horizontal: 'right',
-      },
-      content: (id) => {
-        return <Notification id={id} message={message} alertvariant={variant} />
-      },
-    } as OptionsObject)
-  }
-
-  return showSnackbar
-}
--- a/src/hooks/useIsIOS.ts
+++ b/src/hooks/useIsIOS.ts
@ -1,22 +0,0 @@
-import { useState, useEffect } from 'react'
-
-/**
- * Custom hook to detect if the platform is iOS or not.
- * @returns {boolean} True if the platform is iOS, false otherwise.
- */
-
-const iOSRegex = /iPad|iPhone|iPod/
-
-function useIsIOS() {
-  const [isIOS, setIsIOS] = useState(false)
-
-  useEffect(() => {
-    const isIOSUserAgent =
-      iOSRegex.test(navigator.userAgent) || (navigator.userAgent.includes('Mac') && 'ontouchend' in document)
-    setIsIOS(isIOSUserAgent)
-  }, [])
-
-  return isIOS
-}
-
-export default useIsIOS
--- a/src/hooks/useModalSearchParams.ts
+++ b/src/hooks/useModalSearchParams.ts
@ -1,84 +0,0 @@
-import { MODAL_PARAMS_KEYS } from '@/types/modal'
-import { useCallback } from 'react'
-import { createSearchParams, useLocation, useNavigate, useSearchParams } from 'react-router-dom'
-
-type SearchParamsType = {
-  [key: string]: string
-}
-
-export type IExtraOptions = {
-  search?: SearchParamsType
-  replace?: boolean
-  append?: boolean
-}
-
-export type IExtraCloseOptions = {
-  replace?: boolean
-  onClose?: (s: URLSearchParams) => void
-}
-
-export const useModalSearchParams = () => {
-  const [searchParams, setSearchParams] = useSearchParams()
-
-  const location = useLocation()
-  const navigate = useNavigate()
-
-  const getEnumParam = useCallback((modal: MODAL_PARAMS_KEYS) => {
-    return Object.values(MODAL_PARAMS_KEYS)[Object.values(MODAL_PARAMS_KEYS).indexOf(modal)]
-  }, [])
-
-  const createHandleClose = (modal: MODAL_PARAMS_KEYS, extraOptions?: IExtraCloseOptions) => () => {
-    const enumKey = getEnumParam(modal)
-    searchParams.delete(enumKey)
-    extraOptions?.onClose && extraOptions?.onClose(searchParams)
-    // console.log({ searchParams })
-    setSearchParams(searchParams, { replace: !!extraOptions?.replace })
-  }
-
-  const createHandleCloseReplace = (modal: MODAL_PARAMS_KEYS, extraOptions: IExtraCloseOptions = {}) => {
-    return createHandleClose(modal, { ...extraOptions, replace: true })
-  }
-
-  const handleOpen = useCallback(
-    (modal: MODAL_PARAMS_KEYS, extraOptions?: IExtraOptions) => {
-      const enumKey = getEnumParam(modal)
-
-      let searchParamsData: SearchParamsType = { [enumKey]: 'true' }
-      if (extraOptions?.search) {
-        searchParamsData = {
-          ...searchParamsData,
-          ...extraOptions.search,
-        }
-      }
-
-      const searchString = !extraOptions?.append
-        ? createSearchParams(searchParamsData).toString()
-        : `${location.search}&${createSearchParams(searchParamsData).toString()}`
-
-      navigate(
-        {
-          pathname: location.pathname,
-          search: searchString,
-        },
-        { replace: !!extraOptions?.replace }
-      )
-    },
-    [location, navigate, getEnumParam]
-  )
-
-  const getModalOpened = useCallback(
-    (modal: MODAL_PARAMS_KEYS) => {
-      const enumKey = getEnumParam(modal)
-      const modalOpened = searchParams.get(enumKey) === 'true'
-      return modalOpened
-    },
-    [getEnumParam, searchParams]
-  )
-
-  return {
-    getModalOpened,
-    createHandleClose,
-    createHandleCloseReplace,
-    handleOpen,
-  }
-}
--- a/src/hooks/useOpenMenu.ts
+++ b/src/hooks/useOpenMenu.ts
@ -1,21 +0,0 @@
-import React, { useState } from 'react'
-
-export const useOpenMenu = () => {
-  const [anchorEl, setAnchorEl] = useState<null | HTMLElement>(null)
-
-  const open = Boolean(anchorEl)
-
-  const handleOpen = (event: React.MouseEvent<HTMLElement>) => {
-    setAnchorEl(event.currentTarget)
-  }
-  const handleClose = () => {
-    setAnchorEl(null)
-  }
-
-  return {
-    open,
-    handleOpen,
-    handleClose,
-    anchorEl,
-  }
-}
--- a/src/hooks/usePassword.tsx
+++ b/src/hooks/usePassword.tsx
@ -1,30 +0,0 @@
-import { useCallback, useMemo, useState } from 'react'
-import { IconButton } from '@mui/material'
-import VisibilityOffOutlinedIcon from '@mui/icons-material/VisibilityOffOutlined'
-import VisibilityOutlinedIcon from '@mui/icons-material/VisibilityOutlined'
-
-export const usePassword = () => {
-  const [isPasswordShown, setIsPasswordShown] = useState(false)
-
-  const handlePasswordTypeChange = useCallback(() => setIsPasswordShown((prevState) => !prevState), [])
-
-  const hidePassword = useCallback(() => setIsPasswordShown(false), [])
-
-  const inputProps = useMemo(
-    () => ({
-      endAdornment: (
-        <IconButton size="small" onClick={handlePasswordTypeChange}>
-          {isPasswordShown ? (
-            <VisibilityOffOutlinedIcon htmlColor="#6b6b6b" />
-          ) : (
-            <VisibilityOutlinedIcon htmlColor="#6b6b6b" />
-          )}
-        </IconButton>
-      ),
-      type: isPasswordShown ? 'text' : 'password',
-    }),
-    [handlePasswordTypeChange, isPasswordShown]
-  )
-
-  return { inputProps, hidePassword }
-}
--- a/src/hooks/useProfile.ts
+++ b/src/hooks/useProfile.ts
@ -1,41 +0,0 @@
-import { useCallback, useEffect, useState } from 'react'
-import { fetchProfile } from '@/modules/nostr'
-import { MetaEvent } from '@/types/meta-event'
-import { getProfileUsername, getShortenNpub } from '@/utils/helpers/helpers'
-import { useAppSelector } from '@/store/hooks/redux'
-import { selectKeyByNpub } from '@/store'
-
-const getFirstLetter = (text: string | undefined): string | null => {
-  if (!text || text.trim().length === 0) return null
-  return text.substring(0, 1).toUpperCase()
-}
-
-export const useProfile = (npub: string) => {
-  const [profile, setProfile] = useState<MetaEvent | null>(null)
-  const currentKey = useAppSelector((state) => selectKeyByNpub(state, npub))
-
-  const userName = getProfileUsername(profile) || currentKey?.name
-  const userAvatar = profile?.info?.picture || ''
-  const avatarTitle = getFirstLetter(userName)
-
-  const loadProfile = useCallback(async () => {
-    if (!npub) return undefined
-    try {
-      const response = await fetchProfile(npub)
-      setProfile(response)
-    } catch (error) {
-      console.error('Failed to fetch profile:', error)
-    }
-  }, [npub])
-
-  useEffect(() => {
-    loadProfile()
-  }, [loadProfile])
-
-  return {
-    profile,
-    userName: userName || getShortenNpub(npub),
-    userAvatar,
-    avatarTitle,
-  }
-}
--- a/src/hooks/useToggleConfirm.ts
+++ b/src/hooks/useToggleConfirm.ts
@ -1,15 +0,0 @@
-import { useCallback, useState } from 'react'
-
-export const useToggleConfirm = () => {
-  const [showConfirm, setShowConfirm] = useState(false)
-
-  const handleShow = useCallback(() => setShowConfirm(true), [])
-
-  const handleClose = useCallback(() => setShowConfirm(false), [])
-
-  return {
-    open: showConfirm,
-    handleShow,
-    handleClose,
-  }
-}
--- a/src/index.css
+++ b/src/index.css
@ -1,21 +1,13 @@
-* {
-  margin: 0;
-  padding: 0;
-  box-sizing: border-box;
-}
 body {
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans',
-    'Droid Sans', 'Helvetica Neue', sans-serif;
+  margin: 0;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
+    'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
+    sans-serif;
  -webkit-font-smoothing: antialiased;
  -moz-osx-font-smoothing: grayscale;
 }

 code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
-}
-
-html,
-body,
-#root {
-  height: 100%;
+  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
+    monospace;
 }
--- a/src/index.tsx
+++ b/src/index.tsx
@ -1,32 +1,18 @@
-import React from 'react'
-import ReactDOM from 'react-dom/client'
-import './index.css'
-import App from './App'
-import reportWebVitals from './reportWebVitals'
-import { swicRegister } from './modules/swic'
-import { BrowserRouter } from 'react-router-dom'
-import { Provider } from 'react-redux'
-import { persistor, store } from './store'
-import ThemeProvider from './modules/theme/ThemeProvider'
-import { PersistGate } from 'redux-persist/integration/react'
-import { SnackbarProvider } from 'notistack'
+import React from 'react';
+import ReactDOM from 'react-dom/client';
+import './index.css';
+import App from './App';
+import reportWebVitals from './reportWebVitals';
+import { swicRegister } from './swic';

-const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement)
+const root = ReactDOM.createRoot(
+  document.getElementById('root') as HTMLElement
+);
 root.render(
  <React.StrictMode>
-    <BrowserRouter>
-      <Provider store={store}>
-        <PersistGate loading={null} persistor={persistor}>
-          <ThemeProvider>
-            <SnackbarProvider maxSnack={3} autoHideDuration={3000}>
-              <App />
-            </SnackbarProvider>
-          </ThemeProvider>
-        </PersistGate>
-      </Provider>
-    </BrowserRouter>
+    <App />
  </React.StrictMode>
-)
+);

 // If you want your app to work offline and load faster, you can change
 // unregister() to register() below. Note this comes with some pitfalls.
@ -36,4 +22,4 @@ swicRegister()
 // If you want to start measuring performance in your app, pass a function
 // to log results (for example: reportWebVitals(console.log))
 // or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
-reportWebVitals()
+reportWebVitals();
--- a/src/modules/keys.ts
+++ b/src/modules/keys.ts
@ -1,5 +1,5 @@
-import crypto, { pbkdf2 } from 'crypto'
-import { getPublicKey, nip19 } from 'nostr-tools'
+import crypto, { pbkdf2 } from 'crypto';
+import { getPublicKey, nip19 } from 'nostr-tools';

 // encrypted keys have a prefix and version
 // so that we'd be able to switch to a better
@ -17,34 +17,14 @@ const ITERATIONS_PWH = 100000
 const HASH_SIZE = 32
 const HASH_ALGO = 'sha256'
 // encryption
-const ALGO = 'aes-256-cbc'
+const ALGO = 'aes-256-cbc';
 const IV_SIZE = 16

-// valid passwords are a limited ASCII only, see notes below
-const ASCII_REGEX = /^[A-Za-z0-9!@#$%^&*()\-_]{6,}$/
+// valid passwords are a limited ASCII only, see notes below 
+const ASCII_REGEX = /^[A-Za-z0-9!@#$%^&*()]{4,}$/

-const ALGO_LOCAL = 'AES-CBC'
-const KEY_SIZE_LOCAL = 256
-
-export function isValidPassphase(passphrase: string): boolean {
-  return ASCII_REGEX.test(passphrase)
-}
-
-export function isWeakPassphase(passphrase: string): boolean {
-  const BIG_LETTER_REGEX = /[A-Z]+/
-  const SMALL_LETTER_REGEX = /[a-z]+/
-  const NUMBER_REGEX = /[0-9]+/
-  const PUNCT_REGEX = /[!@#$%^&*()\-_]+/
-  const big = BIG_LETTER_REGEX.test(passphrase) ? 1 : 0
-  const small = SMALL_LETTER_REGEX.test(passphrase) ? 1 : 0
-  const number = NUMBER_REGEX.test(passphrase) ? 1 : 0
-  const punct = PUNCT_REGEX.test(passphrase) ? 1 : 0
-  const base = big * 26 + small * 26 + number * 10 + punct * 12
-  const compl = Math.pow(base, passphrase.length)
-  const thresh = Math.pow(11, 14)
-  // console.log({ big, small, number, punct, base, compl, thresh });
-  return compl < thresh; 
-}
+const ALGO_LOCAL = 'AES-CBC';
+const KEY_SIZE_LOCAL = 256;

 export class Keys {
  subtle: any
@ -53,7 +33,13 @@ export class Keys {
    this.subtle = cryptoSubtle
  }

-  public async generatePassKey(pubkey: string, passphrase: string): Promise<{ passkey: Buffer; pwh: string }> {
+  public isValidPassphase(passphrase: string): boolean {
+    return ASCII_REGEX.test(passphrase)
+  }
+
+  public async generatePassKey(pubkey: string, passphrase: string)
+  : Promise<{ passkey: Buffer, pwh: string }> {
+
    const salt = Buffer.from(pubkey, 'hex')

    // https://nodejs.org/api/crypto.html#using-strings-as-inputs-to-cryptographic-apis
@ -61,7 +47,7 @@ export class Keys {
    // We could use string.normalize() to make sure all JS implementations
    // are compatible, but since we're looking to make this thing a standard
    // then the simplest way is to exclude unicode and only work with ASCII
-    if (!isValidPassphase(passphrase)) throw new Error('Password must be 4+ ASCII chars')
+    if (!this.isValidPassphase(passphrase)) throw new Error("Password must be 4+ ASCII chars")

    return new Promise((ok, fail) => {
      // NOTE: we should use Argon2 or scrypt later, for now
@ -71,11 +57,7 @@ export class Keys {
        else {
          pbkdf2(key, passphrase, ITERATIONS_PWH, HASH_SIZE, HASH_ALGO, (err, hash) => {
            if (err) fail(err)
-            else
-              ok({
-                passkey: key,
-                pwh: hash.toString('hex'),
-              })
+            else ok({ passkey: key, pwh: hash.toString('hex') })
          })
        }
      })
@ -83,8 +65,8 @@ export class Keys {
  }

  private isSafari() {
-    const chrome = navigator.userAgent.indexOf('Chrome') > -1
-    const safari = navigator.userAgent.indexOf('Safari') > -1
+    const chrome = navigator.userAgent.indexOf("Chrome") > -1; 
+    const safari = navigator.userAgent.indexOf("Safari") > -1; 
    return safari && !chrome
  }

@ -99,8 +81,8 @@ export class Keys {
      { name: ALGO_LOCAL, length: KEY_SIZE_LOCAL },
      // NOTE: important to make sure it's not visible in
      // dev console in IndexedDB
-      /*extractable*/ false,
-      ['encrypt', 'decrypt']
+      /*extractable*/false,
+      ["encrypt", "decrypt"]
    )
  }

@ -112,30 +94,25 @@ export class Keys {
    return `${PREFIX_LOCAL}:${VERSION_LOCAL}:${iv.toString('hex')}:${Buffer.from(encrypted).toString('hex')}}`
  }

-  public async decryptKeyLocal({ enckey, localKey }: { enckey: string; localKey: CryptoKey | {} }): Promise<string> {
+  public async decryptKeyLocal({ enckey, localKey }: { enckey: string, localKey: CryptoKey | {} }): Promise<string> {
    if (this.isSafari()) return enckey
    const parts = enckey.split(':')
-    if (parts.length !== 4) throw new Error('Bad encrypted key')
-    if (parts[0] !== PREFIX_LOCAL) throw new Error('Bad encrypted key prefix')
-    if (parts[1] !== VERSION_LOCAL) throw new Error('Bad encrypted key version')
-    if (parts[2].length !== IV_SIZE * 2) throw new Error('Bad encrypted key iv')
-    if (parts[3].length < 30) throw new Error('Bad encrypted key data')
-    const iv = Buffer.from(parts[2], 'hex')
-    const data = Buffer.from(parts[3], 'hex')
+    if (parts.length !== 4) throw new Error("Bad encrypted key")
+    if (parts[0] !== PREFIX_LOCAL) throw new Error("Bad encrypted key prefix")
+    if (parts[1] !== VERSION_LOCAL) throw new Error("Bad encrypted key version")
+    if (parts[2].length !== IV_SIZE * 2) throw new Error("Bad encrypted key iv")
+    if (parts[3].length < 30) throw new Error("Bad encrypted key data")
+    const iv = Buffer.from(parts[2], 'hex');
+    const data = Buffer.from(parts[3], 'hex');
    const decrypted = await this.subtle.decrypt({ name: ALGO_LOCAL, iv }, localKey, data)
    const { type, data: value } = nip19.decode(Buffer.from(decrypted).toString())
-    if (type !== 'nsec') throw new Error('Bad encrypted key payload type')
-    if ((value as string).length !== 64) throw new Error('Bad encrypted key payload length')
-    return value as string
+    if (type !== "nsec") throw new Error("Bad encrypted key payload type")
+    if ((value as string).length !== 64) throw new Error("Bad encrypted key payload length")
+    return (value as string)
  }

-  public async encryptKeyPass({
-    key,
-    passphrase,
-  }: {
-    key: string
-    passphrase: string
-  }): Promise<{ enckey: string; pwh: string }> {
+  public async encryptKeyPass({ key, passphrase }: { key: string, passphrase: string })
+  : Promise<{ enckey: string, pwh: string }> {
    const start = Date.now()
    const nsec = nip19.nsecEncode(key)
    const pubkey = getPublicKey(key)
@ -143,29 +120,21 @@ export class Keys {
    const iv = crypto.randomBytes(IV_SIZE)
    const cipher = crypto.createCipheriv(ALGO, passkey, iv)
    const encrypted = Buffer.concat([cipher.update(nsec), cipher.final()])
-    console.log('encrypted key in ', Date.now() - start)
+    console.log("encrypted key in ", Date.now() - start)
    return {
-      enckey: `${PREFIX}:${VERSION}:${iv.toString('hex')}:${encrypted.toString('hex')}`,
-      pwh,
+      enckey: `${PREFIX}:${VERSION}:${iv.toString('hex')}:${encrypted.toString('hex')}}`,
+      pwh
    }
  }

-  public async decryptKeyPass({
-    pubkey,
-    enckey,
-    passphrase,
-  }: {
-    pubkey: string
-    enckey: string
-    passphrase: string
-  }): Promise<string> {
+  public async decryptKeyPass({ pubkey, enckey, passphrase }: { pubkey: string, enckey: string, passphrase: string }): Promise<string> {
    const start = Date.now()
    const parts = enckey.split(':')
-    if (parts.length !== 4) throw new Error('Bad encrypted key')
-    if (parts[0] !== PREFIX) throw new Error('Bad encrypted key prefix')
-    if (parts[1] !== VERSION) throw new Error('Bad encrypted key version')
-    if (parts[2].length !== IV_SIZE * 2) throw new Error('Bad encrypted key iv')
-    if (parts[3].length < 30) throw new Error('Bad encrypted key data')
+    if (parts.length !== 4) throw new Error("Bad encrypted key")
+    if (parts[0] !== PREFIX) throw new Error("Bad encrypted key prefix")
+    if (parts[1] !== VERSION) throw new Error("Bad encrypted key version")
+    if (parts[2].length !== IV_SIZE * 2) throw new Error("Bad encrypted key iv")
+    if (parts[3].length < 30) throw new Error("Bad encrypted key data")
    const { passkey } = await this.generatePassKey(pubkey, passphrase)
    const iv = Buffer.from(parts[2], 'hex')
    const data = Buffer.from(parts[3], 'hex')
@ -173,9 +142,9 @@ export class Keys {
    const decrypted = Buffer.concat([decipher.update(data), decipher.final()])
    const nsec = decrypted.toString()
    const { type, data: value } = nip19.decode(nsec)
-    if (type !== 'nsec') throw new Error('Bad encrypted key payload type')
-    if (value.length !== 64) throw new Error('Bad encrypted key payload length')
-    console.log('decrypted key in ', Date.now() - start)
-    return nsec
+    if (type !== "nsec") throw new Error("Bad encrypted key payload type")
+    if (value.length !== 64) throw new Error("Bad encrypted key payload length")
+    console.log("decrypted key in ", Date.now() - start)
+    return nsec;
  }
-}
+}
--- a/src/layout/Header/Header.tsx
+++ b/src/layout/Header/Header.tsx
@ -1,61 +0,0 @@
-import { Avatar, Stack, Toolbar, Typography } from '@mui/material'
-import { StyledAppBar, StyledAppLogo, StyledAppName, StyledProfileContainer, StyledThemeButton } from './styled'
-import { Menu } from './components/Menu'
-import { useNavigate, useParams } from 'react-router-dom'
-import { ProfileMenu } from './components/ProfileMenu'
-import { useProfile } from '@/hooks/useProfile'
-import DarkModeIcon from '@mui/icons-material/DarkMode'
-import LightModeIcon from '@mui/icons-material/LightMode'
-import { useAppDispatch, useAppSelector } from '@/store/hooks/redux'
-import { setThemeMode } from '@/store/reducers/ui.slice'
-
-export const Header = () => {
-  const themeMode = useAppSelector((state) => state.ui.themeMode)
-  const navigate = useNavigate()
-  const dispatch = useAppDispatch()
-
-  const { npub = '' } = useParams<{ npub: string }>()
-  const { userName, userAvatar, avatarTitle } = useProfile(npub)
-  const showProfile = Boolean(npub)
-
-  const handleNavigate = () => {
-    navigate(`/key/${npub}`)
-  }
-
-  const isDarkMode = themeMode === 'dark'
-  const themeIcon = isDarkMode ? <LightModeIcon htmlColor="#fff" /> : <DarkModeIcon htmlColor="#000" />
-
-  const handleChangeMode = () => {
-    dispatch(setThemeMode({ mode: isDarkMode ? 'light' : 'dark' }))
-  }
-
-  return (
-    <StyledAppBar position="fixed">
-      <Toolbar sx={{ padding: '12px' }}>
-        <Stack direction={'row'} justifyContent={'space-between'} alignItems={'center'} width={'100%'}>
-          {showProfile && (
-            <StyledProfileContainer>
-              <Avatar src={userAvatar} alt={userName} onClick={handleNavigate} className="avatar">
-                {avatarTitle}
-              </Avatar>
-              <Typography fontWeight={600} onClick={handleNavigate} className="username">
-                {userName}
-              </Typography>
-            </StyledProfileContainer>
-          )}
-
-          {!showProfile && (
-            <StyledAppName>
-              <StyledAppLogo />
-              <span>Nsec.app</span>
-            </StyledAppName>
-          )}
-
-          <StyledThemeButton onClick={handleChangeMode}>{themeIcon}</StyledThemeButton>
-
-          {showProfile ? <ProfileMenu /> : <Menu />}
-        </Stack>
-      </Toolbar>
-    </StyledAppBar>
-  )
-}
--- a/src/layout/Header/components/ListItemProfile.tsx
+++ b/src/layout/Header/components/ListItemProfile.tsx
@ -1,31 +0,0 @@
-import { useProfile } from '@/hooks/useProfile'
-import { DbKey } from '@/modules/db'
-import { Avatar, ListItemIcon, MenuItem, Typography } from '@mui/material'
-import React, { FC } from 'react'
-
-type ListItemProfileProps = {
-	onClickItem: () => void
-} & DbKey
-
-export const ListItemProfile: FC<ListItemProfileProps> = ({
-	onClickItem,
-	npub,
-}) => {
-	const { userName, userAvatar, avatarTitle } = useProfile(npub)
-	return (
-		<MenuItem sx={{ gap: '0.5rem' }} onClick={onClickItem}>
-			<ListItemIcon>
-				<Avatar
-					src={userAvatar}
-					alt={userName}
-					sx={{ width: 36, height: 36 }}
-				>
-					{avatarTitle}
-				</Avatar>
-			</ListItemIcon>
-			<Typography variant='body2' noWrap>
-				{userName}
-			</Typography>
-		</MenuItem>
-	)
-}
--- a/src/layout/Header/components/ListProfiles.tsx
+++ b/src/layout/Header/components/ListProfiles.tsx
@ -1,19 +0,0 @@
-import { DbKey } from '@/modules/db'
-import { Stack } from '@mui/material'
-import { FC } from 'react'
-import { ListItemProfile } from './ListItemProfile'
-
-type ListProfilesProps = {
-  keys: DbKey[]
-  onClickItem: (key: DbKey) => void
-}
-
-export const ListProfiles: FC<ListProfilesProps> = ({ keys = [], onClickItem }) => {
-  return (
-    <Stack maxHeight={'10rem'} overflow={'auto'}>
-      {keys.map((key) => {
-        return <ListItemProfile {...key} key={key.npub} onClickItem={() => onClickItem(key)} />
-      })}
-    </Stack>
-  )
-}
--- a/src/layout/Header/components/Menu.tsx
+++ b/src/layout/Header/components/Menu.tsx
@ -1,46 +0,0 @@
-import { Menu as MuiMenu } from '@mui/material'
-import LoginIcon from '@mui/icons-material/Login'
-import PersonAddAltRoundedIcon from '@mui/icons-material/PersonAddAltRounded'
-import { useAppSelector } from '@/store/hooks/redux'
-import { useModalSearchParams } from '@/hooks/useModalSearchParams'
-import { MODAL_PARAMS_KEYS } from '@/types/modal'
-import { MenuButton } from './styled'
-import { useOpenMenu } from '@/hooks/useOpenMenu'
-import { MenuItem } from './MenuItem'
-import MenuRoundedIcon from '@mui/icons-material/MenuRounded'
-import { selectKeys } from '@/store'
-
-export const Menu = () => {
-  const keys = useAppSelector(selectKeys)
-  const { handleOpen } = useModalSearchParams()
-  const { anchorEl, handleClose, handleOpen: handleOpenMenu, open } = useOpenMenu()
-
-  const isNoKeys = !keys || keys.length === 0
-
-  const handleNavigateToAuth = () => {
-    handleOpen(MODAL_PARAMS_KEYS.INITIAL)
-    handleClose()
-  }
-
-  return (
-    <>
-      <MenuButton onClick={handleOpenMenu}>
-        <MenuRoundedIcon color="inherit" />
-      </MenuButton>
-      <MuiMenu
-        anchorEl={anchorEl}
-        open={open}
-        onClose={handleClose}
-        sx={{
-          zIndex: 1302,
-        }}
-      >
-        <MenuItem
-          Icon={isNoKeys ? <LoginIcon /> : <PersonAddAltRoundedIcon />}
-          onClick={handleNavigateToAuth}
-          title={isNoKeys ? 'Sign up' : 'Add account'}
-        />
-      </MuiMenu>
-    </>
-  )
-}
--- a/src/layout/Header/components/MenuItem.tsx
+++ b/src/layout/Header/components/MenuItem.tsx
@ -1,20 +0,0 @@
-import React, { FC, ReactNode } from 'react'
-import { StyledMenuItem } from './styled'
-import { ListItemIcon, MenuItemProps as MuiMenuItemProps, Typography } from '@mui/material'
-
-type MenuItemProps = {
-  onClick: () => void
-  title: string
-  Icon: ReactNode
-} & MuiMenuItemProps
-
-export const MenuItem: FC<MenuItemProps> = ({ onClick, Icon, title }) => {
-  return (
-    <StyledMenuItem onClick={onClick}>
-      <ListItemIcon>{Icon}</ListItemIcon>
-      <Typography fontWeight={500} variant="body2" noWrap>
-        {title}
-      </Typography>
-    </StyledMenuItem>
-  )
-}
--- a/src/layout/Header/components/ProfileMenu.tsx
+++ b/src/layout/Header/components/ProfileMenu.tsx
@ -1,66 +0,0 @@
-import { useOpenMenu } from '@/hooks/useOpenMenu'
-import { MenuButton } from './styled'
-import { Divider, Menu } from '@mui/material'
-import { MenuItem } from './MenuItem'
-import { useModalSearchParams } from '@/hooks/useModalSearchParams'
-import { MODAL_PARAMS_KEYS } from '@/types/modal'
-import { useNavigate } from 'react-router-dom'
-import LoginIcon from '@mui/icons-material/Login'
-import KeyboardArrowDownRoundedIcon from '@mui/icons-material/KeyboardArrowDownRounded'
-import HomeRoundedIcon from '@mui/icons-material/HomeRounded'
-import PersonAddAltRoundedIcon from '@mui/icons-material/PersonAddAltRounded'
-import { useAppSelector } from '@/store/hooks/redux'
-import { selectKeys } from '@/store'
-
-import { ListProfiles } from './ListProfiles'
-import { DbKey } from '@/modules/db'
-
-export const ProfileMenu = () => {
-  const { anchorEl, handleOpen: handleOpenMenu, open, handleClose } = useOpenMenu()
-  const { handleOpen } = useModalSearchParams()
-
-  const keys = useAppSelector(selectKeys)
-  const isNoKeys = !keys || keys.length === 0
-
-  const navigate = useNavigate()
-
-  const handleNavigateToAuth = () => {
-    handleOpen(MODAL_PARAMS_KEYS.INITIAL)
-    handleClose()
-  }
-
-  const handleNavigateHome = () => {
-    navigate('/home')
-    handleClose()
-  }
-
-  const handleNavigateToKeyInnerPage = (key: DbKey) => {
-    navigate('/key/' + key.npub)
-    handleClose()
-  }
-
-  return (
-    <>
-      <MenuButton onClick={handleOpenMenu}>
-        <KeyboardArrowDownRoundedIcon color="inherit" fontSize="large" />
-      </MenuButton>
-      <Menu
-        open={open}
-        anchorEl={anchorEl}
-        onClose={handleClose}
-        sx={{
-          zIndex: 1302,
-        }}
-      >
-        <ListProfiles keys={keys} onClickItem={handleNavigateToKeyInnerPage} />
-        <Divider />
-        <MenuItem Icon={<HomeRoundedIcon />} onClick={handleNavigateHome} title="Home" />
-        <MenuItem
-          Icon={isNoKeys ? <LoginIcon /> : <PersonAddAltRoundedIcon />}
-          onClick={handleNavigateToAuth}
-          title={isNoKeys ? 'Sign up' : 'Add account'}
-        />
-      </Menu>
-    </>
-  )
-}
--- a/src/layout/Header/components/styled.tsx
+++ b/src/layout/Header/components/styled.tsx
@ -1,16 +0,0 @@
-import { IconButton, IconButtonProps, MenuItem, MenuItemProps, styled } from '@mui/material'
-
-export const MenuButton = styled((props: IconButtonProps) => <IconButton {...props} />)(({ theme }) => {
-  const isDark = theme.palette.mode === 'dark'
-  return {
-    borderRadius: '1rem',
-    background: isDark ? '#333333A8' : 'transparent',
-    color: isDark ? '#FFFFFFA8' : 'initial',
-    width: 42,
-    height: 42,
-  }
-})
-
-export const StyledMenuItem = styled((props: MenuItemProps) => <MenuItem {...props} />)(() => ({
-  padding: '0.5rem 1rem',
-}))
--- a/src/layout/Header/styled.tsx
+++ b/src/layout/Header/styled.tsx
@ -1,56 +0,0 @@
-import { AppLogo } from '@/assets'
-import { AppBar, IconButton, Stack, StackProps, Typography, TypographyProps, styled } from '@mui/material'
-import { Link } from 'react-router-dom'
-
-export const StyledAppBar = styled(AppBar)(({ theme }) => {
-  return {
-    color: theme.palette.primary.main,
-    boxShadow: 'none',
-    marginBottom: '1rem',
-    background: theme.palette.background.default,
-    zIndex: 1301,
-    maxWidth: 'inherit',
-    left: '50%',
-    transform: 'translateX(-50%)',
-    borderRadius: '8px',
-  }
-})
-
-export const StyledAppName = styled((props: TypographyProps) => (
-  <Typography component={Link} to={'/'} flexGrow={1} {...props} />
-))(() => ({
-  '&:not(:hover)': {
-    textDecoration: 'initial',
-  },
-  color: 'inherit',
-  display: 'flex',
-  alignItems: 'center',
-  gap: '0.75rem',
-  fontWeight: 600,
-  fontSize: '1rem',
-  lineHeight: '22.4px',
-  marginLeft: '0.5rem',
-}))
-
-export const StyledProfileContainer = styled((props: StackProps) => <Stack {...props} />)(() => ({
-  gap: '1rem',
-  flexDirection: 'row',
-  alignItems: 'center',
-  flex: 1,
-  '& .avatar': {
-    cursor: 'pointer',
-  },
-  '& .username': {
-    cursor: 'pointer',
-  },
-}))
-
-export const StyledThemeButton = styled(IconButton)({
-  margin: '0 0.5rem',
-})
-
-export const StyledAppLogo = styled(AppLogo)(({ theme }) => ({
-  '& path': {
-    fill: theme.palette.text.primary,
-  },
-}))
--- a/src/layout/Layout.tsx
+++ b/src/layout/Layout.tsx
@ -1,37 +0,0 @@
-import { FC } from 'react'
-import { Outlet } from 'react-router-dom'
-import { Header } from './Header/Header'
-import { Container, ContainerProps, Divider, DividerProps, styled } from '@mui/material'
-
-export const Layout: FC = () => {
-  return (
-    <StyledContainer maxWidth="md">
-      <Header />
-      <StyledDivider />
-      <main>
-        <Outlet />
-      </main>
-    </StyledContainer>
-  )
-}
-
-const StyledContainer = styled((props: ContainerProps) => <Container maxWidth="sm" {...props} />)({
-  height: '100%',
-  display: 'flex',
-  flexDirection: 'column',
-  paddingBottom: '1rem',
-  position: 'relative',
-  '& > main': {
-    flex: 1,
-    maxHeight: '100%',
-    paddingTop: 'calc(66px + 1rem)',
-  },
-})
-
-const StyledDivider = styled((props: DividerProps) => <Divider {...props} />)({
-  position: 'absolute',
-  top: '66px',
-  width: '100%',
-  left: 0,
-  height: '2px',
-})
--- a/src/logo.svg
+++ b/src/logo.svg
@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
+    <g fill="#61DAFB">
+        <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
+        <circle cx="420.9" cy="296.5" r="45.7"/>
+        <path d="M520.5 78.1z"/>
+    </g>
+</svg>
--- a/src/modules/backend.ts
+++ b/src/modules/backend.ts
--- a/src/modules/ende.ts
+++ b/src/modules/ende.ts
@ -1,95 +0,0 @@
-/*
-ende stands for encryption decryption
-*/
-import { secp256k1 as secp } from '@noble/curves/secp256k1'
-//import * as secp from "./vendor/secp256k1.js";
-
-export async function encrypt(publicKey: string, message: string, privateKey: string): Promise<string> {
-  const key = secp.getSharedSecret(privateKey, '02' + publicKey)
-  const normalizedKey = getNormalizedX(key)
-  const encoder = new TextEncoder()
-  const iv = Uint8Array.from(randomBytes(16))
-  const plaintext = encoder.encode(message)
-  const cryptoKey = await crypto.subtle.importKey('raw', normalizedKey, { name: 'AES-CBC' }, false, ['encrypt'])
-  const ciphertext = await crypto.subtle.encrypt({ name: 'AES-CBC', iv }, cryptoKey, plaintext)
-
-  const ctb64 = toBase64(new Uint8Array(ciphertext))
-  const ivb64 = toBase64(new Uint8Array(iv.buffer))
-  return `${ctb64}?iv=${ivb64}`
-}
-
-export async function decrypt(privateKey: string, publicKey: string, data: string): Promise<string | Error> {
-  const key = secp.getSharedSecret(privateKey, '02' + publicKey) // this line is very slow
-  return decrypt_with_shared_secret(data, key)
-}
-
-export async function decrypt_with_shared_secret(data: string, sharedSecret: Uint8Array): Promise<string | Error> {
-  const [ctb64, ivb64] = data.split('?iv=')
-  const normalizedKey = getNormalizedX(sharedSecret)
-
-  const cryptoKey = await crypto.subtle.importKey('raw', normalizedKey, { name: 'AES-CBC' }, false, ['decrypt'])
-  let ciphertext: BufferSource
-  let iv: BufferSource
-  try {
-    ciphertext = decodeBase64(ctb64)
-    iv = decodeBase64(ivb64)
-  } catch (e) {
-    return new Error(`failed to decode, ${e}`)
-  }
-
-  try {
-    const plaintext = await crypto.subtle.decrypt({ name: 'AES-CBC', iv }, cryptoKey, ciphertext)
-    const text = utf8Decode(plaintext)
-    return text
-  } catch (e) {
-    return new Error(`failed to decrypt, ${e}`)
-  }
-}
-
-export function utf8Encode(str: string) {
-  let encoder = new TextEncoder()
-  return encoder.encode(str)
-}
-
-export function utf8Decode(bin: Uint8Array | ArrayBuffer): string {
-  let decoder = new TextDecoder()
-  return decoder.decode(bin)
-}
-
-function toBase64(uInt8Array: Uint8Array) {
-  let strChunks = new Array(uInt8Array.length)
-  let i = 0
-  // @ts-ignore
-  for (let byte of uInt8Array) {
-    strChunks[i] = String.fromCharCode(byte) // bytes to utf16 string
-    i++
-  }
-  return btoa(strChunks.join(''))
-}
-
-function decodeBase64(base64String: string) {
-  const binaryString = atob(base64String)
-  const length = binaryString.length
-  const bytes = new Uint8Array(length)
-
-  for (let i = 0; i < length; i++) {
-    bytes[i] = binaryString.charCodeAt(i)
-  }
-  return bytes
-}
-
-function getNormalizedX(key: Uint8Array): Uint8Array {
-  return key.slice(1, 33)
-}
-
-function randomBytes(bytesLength: number = 32) {
-  return crypto.getRandomValues(new Uint8Array(bytesLength))
-}
-
-export function utf16Encode(str: string): number[] {
-  let array = new Array(str.length)
-  for (let i = 0; i < str.length; i++) {
-    array[i] = str.charCodeAt(i)
-  }
-  return array
-}
--- a/src/modules/nostr.ts
+++ b/src/modules/nostr.ts
@ -1,83 +0,0 @@
-import { AugmentedEvent } from '@/types/augmented-event'
-import { Meta, createMeta } from '@/types/meta'
-import { MetaEvent, createMetaEvent } from '@/types/meta-event'
-import NDK, { NDKEvent, NostrEvent } from '@nostr-dev-kit/ndk'
-import { nip19 } from 'nostr-tools'
-
-export const ndk = new NDK({
-  explicitRelayUrls: ['wss://relay.nostr.band/all', 'wss://relay.nostr.band', 'wss://relay.damus.io', 'wss://nos.lol'],
-})
-
-export function nostrEvent(e: Required<NDKEvent>) {
-  return {
-    id: e.id,
-    created_at: e.created_at,
-    pubkey: e.pubkey,
-    kind: e.kind,
-    tags: e.tags,
-    content: e.content,
-    sig: e.sig,
-  }
-}
-function rawEvent(e: Required<NDKEvent>): AugmentedEvent {
-  return {
-    ...nostrEvent(e),
-    identifier: getTagValue(e as NDKEvent, 'd'),
-    order: e.created_at as number,
-  }
-}
-
-function parseContentJson(c: string): object {
-  try {
-    return JSON.parse(c)
-  } catch (e) {
-    console.log('Bad json: ', c, e)
-    return {}
-  }
-}
-
-export function getTags(e: AugmentedEvent | NDKEvent | MetaEvent, name: string): string[][] {
-  return e.tags.filter((t: string[]) => t.length > 0 && t[0] === name)
-}
-
-export function getTag(e: AugmentedEvent | NDKEvent | MetaEvent, name: string): string[] | null {
-  const tags = getTags(e, name)
-  if (tags.length === 0) return null
-  return tags[0]
-}
-
-export function getTagValue(
-  e: AugmentedEvent | NDKEvent | MetaEvent,
-  name: string,
-  index: number = 0,
-  def: string = ''
-): string {
-  const tag = getTag(e, name)
-  if (tag === null || !tag.length || (index && index >= tag.length)) return def
-  return tag[1 + index]
-}
-
-export function parseProfileJson(e: NostrEvent): Meta {
-  // all meta fields are optional so 'as' works fine
-  const profile = createMeta(parseContentJson(e.content))
-  profile.pubkey = e.pubkey
-  profile.npub = nip19.npubEncode(e.pubkey)
-  return profile
-}
-
-export async function fetchProfile(npub: string): Promise<MetaEvent | null> {
-  const npubToken = npub.includes('#') ? npub.split('#')[0] : npub
-  const { type, data: pubkey } = nip19.decode(npubToken)
-  if (type !== 'npub') return null
-
-  const event = await ndk.fetchEvent({ kinds: [0], authors: [pubkey] })
-
-  if (event) {
-    const augmentedEvent = rawEvent(event as Required<NDKEvent>)
-    const m = createMetaEvent(augmentedEvent)
-    m.info = parseProfileJson(m)
-    return m
-  }
-
-  return event
-}
--- a/src/modules/pow.ts
+++ b/src/modules/pow.ts
@ -1,51 +0,0 @@
-// based on https://git.v0l.io/Kieran/snort/src/branch/main/packages/system/src/pow-util.ts
-
-import { sha256 } from '@noble/hashes/sha256'
-import { bytesToHex } from '@noble/hashes/utils'
-
-export interface NostrPowEvent {
-  id?: string
-  pubkey: string
-  created_at: number
-  kind?: number
-  tags: Array<Array<string>>
-  content: string
-  sig?: string
-}
-
-export function minePow(e: NostrPowEvent, target: number) {
-  let ctr = 0
-
-  let nonceTagIdx = e.tags.findIndex((a) => a[0] === 'nonce')
-  if (nonceTagIdx === -1) {
-    nonceTagIdx = e.tags.length
-    e.tags.push(['nonce', ctr.toString(), target.toString()])
-  }
-  do {
-    e.tags[nonceTagIdx][1] = (++ctr).toString()
-    e.id = createId(e)
-  } while (countLeadingZeros(e.id) < target)
-
-  return e
-}
-
-function createId(e: NostrPowEvent) {
-  const payload = [0, e.pubkey, e.created_at, e.kind, e.tags, e.content]
-  return bytesToHex(sha256(JSON.stringify(payload)))
-}
-
-export function countLeadingZeros(hex: string) {
-  let count = 0
-
-  for (let i = 0; i < hex.length; i++) {
-    const nibble = parseInt(hex[i], 16)
-    if (nibble === 0) {
-      count += 4
-    } else {
-      count += Math.clz32(nibble) - 28
-      break
-    }
-  }
-
-  return count
-}
--- a/src/modules/signer.ts
+++ b/src/modules/signer.ts
@ -1,70 +0,0 @@
-import type { UnsignedEvent } from 'nostr-tools'
-import { generatePrivateKey, getPublicKey, getSignature } from 'nostr-tools'
-
-import type { NostrEvent } from '@nostr-dev-kit/ndk' // "./ndk-dist";
-import { NDKUser } from '@nostr-dev-kit/ndk' // "./ndk-dist";
-import type { NDKSigner } from '@nostr-dev-kit/ndk' // "./ndk-dist";
-import { Nip04 } from './nip04'
-//import { decrypt, encrypt } from "./ende";
-
-export class PrivateKeySigner implements NDKSigner {
-  private _user: NDKUser | undefined
-  privateKey?: string
-  private nip04: Nip04
-
-  public constructor(privateKey?: string) {
-    if (privateKey) {
-      this.privateKey = privateKey
-      this._user = new NDKUser({
-        hexpubkey: getPublicKey(this.privateKey),
-      })
-    }
-    this.nip04 = new Nip04()
-  }
-
-  public static generate() {
-    const privateKey = generatePrivateKey()
-    return new PrivateKeySigner(privateKey)
-  }
-
-  public async blockUntilReady(): Promise<NDKUser> {
-    if (!this._user) {
-      throw new Error('NDKUser not initialized')
-    }
-    return this._user
-  }
-
-  public async user(): Promise<NDKUser> {
-    await this.blockUntilReady()
-    return this._user as NDKUser
-  }
-
-  public async sign(event: NostrEvent): Promise<string> {
-    if (!this.privateKey) {
-      throw Error('Attempted to sign without a private key')
-    }
-
-    return getSignature(event as UnsignedEvent, this.privateKey)
-  }
-
-  public async encrypt(recipient: NDKUser, value: string): Promise<string> {
-    if (!this.privateKey) {
-      throw Error('Attempted to encrypt without a private key')
-    }
-
-    const recipientHexPubKey = recipient.hexpubkey
-    return await this.nip04.encrypt(this.privateKey, recipientHexPubKey, value)
-    //        return await encrypt(recipientHexPubKey, value, this.privateKey);
-  }
-
-  public async decrypt(sender: NDKUser, value: string): Promise<string> {
-    if (!this.privateKey) {
-      throw Error('Attempted to decrypt without a private key')
-    }
-
-    const senderHexPubKey = sender.hexpubkey
-    //        console.log("nip04_decrypt", value)
-    return await this.nip04.decrypt(this.privateKey, senderHexPubKey, value)
-    //        return await decrypt(this.privateKey, senderHexPubKey, value) as string;
-  }
-}
--- a/src/modules/swic.ts
+++ b/src/modules/swic.ts
@ -1,95 +0,0 @@
-// service-worker client interface
-import * as serviceWorkerRegistration from '../serviceWorkerRegistration'
-
-export let swr: ServiceWorkerRegistration | null = null
-const reqs = new Map<number, { ok: (r: any) => void; rej: (r: any) => void }>()
-let nextReqId = 1
-let onRender: (() => void) | null = null
-const queue: (() => Promise<void> | void)[] = []
-
-export async function swicRegister() {
-  serviceWorkerRegistration.register({
-    onSuccess(registration) {
-      console.log('sw registered')
-      swr = registration
-    },
-    onError(e) {
-      console.log(`error ${e}`)
-    },
-  })
-
-  navigator.serviceWorker.ready.then(async (r) => {
-    console.log('sw ready, queue', queue.length)
-    swr = r
-    if (navigator.serviceWorker.controller) {
-      console.log(`This page is currently controlled by: ${navigator.serviceWorker.controller}`)
-    } else {
-      console.log('This page is not currently controlled by a service worker.')
-    }
-
-    while (queue.length)
-      await (queue.shift()!)()
-  })
-
-  navigator.serviceWorker.addEventListener('message', (event) => {
-    onMessage((event as MessageEvent).data)
-  })
-}
-
-export function swicWaitStarted() {
-  return new Promise<void>(ok => {
-    if (swr && swr.active) ok()
-    else queue.push(ok)
-  })
-} 
-
-function onMessage(data: any) {
-  const { id, result, error } = data
-  console.log('SW message', id, result, error)
-
-  if (!id) {
-    if (onRender) onRender()
-    return
-  }
-
-  const r = reqs.get(id)
-  if (!r) {
-    console.log('Unexpected message from service worker', data)
-    return
-  }
-
-  reqs.delete(id)
-  if (error) r.rej(error)
-  else r.ok(result)
-}
-
-export async function swicCall(method: string, ...args: any[]) {
-  const id = nextReqId
-  nextReqId++
-
-  return new Promise((ok, rej) => {
-
-    const call = async () => {
-      if (!swr || !swr.active) {
-        rej(new Error('No active service worker'))
-        return
-      }
-
-      reqs.set(id, { ok, rej })
-      const msg = {
-        id,
-        method,
-        args: [...args],
-      }
-      console.log('sending to SW', msg)
-      swr.active.postMessage(msg)
-    }
-
-    if (swr && swr.active) call()
-    else queue.push(call)
-  })
-}
-
-export function swicOnRender(cb: () => void) {
-  onRender = cb
-}
--- a/src/modules/theme/ThemeProvider.tsx
+++ b/src/modules/theme/ThemeProvider.tsx
@ -1,18 +0,0 @@
-import { FC, PropsWithChildren } from 'react'
-import { ThemeProvider as ThemeMuiProvider, CssBaseline } from '@mui/material'
-import { darkTheme, lightTheme } from './theme'
-import { useAppSelector } from '../../store/hooks/redux'
-
-const ThemeProvider: FC<PropsWithChildren> = ({ children }) => {
-  const themeMode = useAppSelector((state) => state.ui.themeMode)
-  const isDarkMode = themeMode === 'dark'
-
-  return (
-    <ThemeMuiProvider theme={isDarkMode ? darkTheme : lightTheme}>
-      <CssBaseline />
-      {children}
-    </ThemeMuiProvider>
-  )
-}
-
-export default ThemeProvider
--- a/src/modules/theme/theme.ts
+++ b/src/modules/theme/theme.ts
@ -1,99 +0,0 @@
-import { createTheme, Theme } from '@mui/material'
-
-declare module '@mui/material/styles' {
-  interface Palette {
-    textSecondaryDecorate: Palette['primary']
-    backgroundSecondary: Palette['background']
-  }
-
-  interface PaletteOptions {
-    textSecondaryDecorate?: Palette['primary']
-    backgroundSecondary?: Palette['background']
-  }
-}
-
-const commonTheme: Theme = createTheme({
-  typography: {
-    fontFamily: ['Inter', 'sans-serif'].join(','),
-  },
-  components: {
-    MuiButton: {
-      styleOverrides: {
-        root: {
-          textTransform: 'initial',
-        },
-      },
-    },
-  },
-})
-
-const lightTheme: Theme = createTheme({
-  ...commonTheme,
-  palette: {
-    mode: 'light',
-    primary: {
-      main: '#000000',
-    },
-    secondary: {
-      main: '#E8E9EB',
-      dark: '#ACACAC',
-    },
-    error: {
-      main: '#f44336',
-    },
-    background: {
-      default: '#f7f7f7',
-      paper: '#f7f7f7',
-    },
-    backgroundSecondary: {
-      default: '#E8E9EB',
-      paper: '#f7f7f7',
-    },
-    text: {
-      primary: '#000000',
-      secondary: '#ffffff',
-    },
-    textSecondaryDecorate: {
-      main: '#6b6b6b',
-      light: '#000',
-      dark: '#000',
-      contrastText: '#000',
-    },
-  },
-})
-
-const darkTheme: Theme = createTheme({
-  ...commonTheme,
-  palette: {
-    mode: 'dark',
-    primary: {
-      main: '#FFFFFF',
-    },
-    secondary: {
-      main: '#222222',
-    },
-    error: {
-      main: '#ef9a9a',
-    },
-    background: {
-      default: '#121212',
-      paper: '#28282B',
-    },
-    backgroundSecondary: {
-      default: '#0d0d0d',
-      paper: '#28282B',
-    },
-    text: {
-      primary: '#ffffff',
-      secondary: '#000000',
-    },
-    textSecondaryDecorate: {
-      main: '#6b6b6b',
-      light: '#000',
-      dark: '#000',
-      contrastText: '#000',
-    },
-  },
-})
-
-export { lightTheme, darkTheme }
--- a/src/modules/nip04.ts
+++ b/src/modules/nip04.ts
@ -7,25 +7,25 @@ export const utf8Decoder = new TextDecoder('utf-8')
 export const utf8Encoder = new TextEncoder()

 function toBase64(uInt8Array: Uint8Array) {
-  let strChunks = new Array(uInt8Array.length)
-  let i = 0
+  let strChunks = new Array(uInt8Array.length);
+  let i = 0;
  // @ts-ignore
  for (let byte of uInt8Array) {
-    strChunks[i] = String.fromCharCode(byte) // bytes to utf16 string
-    i++
+    strChunks[i] = String.fromCharCode(byte); // bytes to utf16 string
+    i++;
  }
-  return btoa(strChunks.join(''))
+  return btoa(strChunks.join(""));
 }

 function fromBase64(base64String: string) {
-  const binaryString = atob(base64String)
-  const length = binaryString.length
-  const bytes = new Uint8Array(length)
+  const binaryString = atob(base64String);
+  const length = binaryString.length;
+  const bytes = new Uint8Array(length);

  for (let i = 0; i < length; i++) {
-    bytes[i] = binaryString.charCodeAt(i)
+    bytes[i] = binaryString.charCodeAt(i);
  }
-  return bytes
+  return bytes;
 }

 function getNormalizedX(key: Uint8Array): Uint8Array {
@ -65,7 +65,7 @@ export class Nip04 {
    // let ctb64 = toBase64(new Uint8Array(ciphertext))
    // let ivb64 = toBase64(new Uint8Array(iv.buffer))

-    console.log('nip04_encrypt', text, 't1', t2 - t1, 't2', t3 - t2, 't3', Date.now() - t3)
+    console.log("nip04_encrypt", text, "t1", t2 - t1, "t2", t3 - t2, "t3", Date.now() - t3)

    return `${ctb64}?iv=${ivb64}`
  }
@ -85,4 +85,7 @@ export class Nip04 {
    let text = utf8Decoder.decode(plaintext)
    return text
  }
+
 }
+
+
--- a/src/pages/AppPage/App.Page.tsx
+++ b/src/pages/AppPage/App.Page.tsx
@ -1,120 +0,0 @@
-import { useParams } from 'react-router'
-import { useAppSelector } from '@/store/hooks/redux'
-import { selectAppByAppNpub, selectKeys, selectPermsByNpubAndAppNpub } from '@/store'
-import { Navigate, useNavigate } from 'react-router-dom'
-import { formatTimestampDate } from '@/utils/helpers/date'
-import { Box, IconButton, Stack, Typography } from '@mui/material'
-import { SectionTitle } from '@/shared/SectionTitle/SectionTitle'
-import { getAppIconTitle, getDomain, getShortenNpub } from '@/utils/helpers/helpers'
-import { Button } from '@/shared/Button/Button'
-import { ACTION_TYPE } from '@/utils/consts'
-import { Permissions } from './components/Permissions/Permissions'
-import { StyledAppIcon } from './styled'
-import { useToggleConfirm } from '@/hooks/useToggleConfirm'
-import { ConfirmModal } from '@/shared/ConfirmModal/ConfirmModal'
-import { swicCall } from '@/modules/swic'
-import { useEnqueueSnackbar } from '@/hooks/useEnqueueSnackbar'
-import { IOSBackButton } from '@/shared/IOSBackButton/IOSBackButton'
-import { ModalActivities } from './components/Activities/ModalActivities'
-import { useModalSearchParams } from '@/hooks/useModalSearchParams'
-import { MODAL_PARAMS_KEYS } from '@/types/modal'
-import MoreIcon from '@mui/icons-material/MoreVertRounded'
-import { ModalAppDetails } from '@/components/Modal/ModalAppDetails/ModalAppDetails'
-
-const AppPage = () => {
-  const keys = useAppSelector(selectKeys)
-
-  const { appNpub = '', npub = '' } = useParams()
-  const currentApp = useAppSelector((state) => selectAppByAppNpub(state, appNpub))
-  const perms = useAppSelector((state) => selectPermsByNpubAndAppNpub(state, npub, appNpub))
-
-  const navigate = useNavigate()
-  const notify = useEnqueueSnackbar()
-  const { open, handleClose, handleShow } = useToggleConfirm()
-  const { handleOpen: handleOpenModal } = useModalSearchParams()
-
-  const connectPerm = perms.find((perm) => perm.perm === 'connect' || perm.perm === ACTION_TYPE.BASIC)
-
-  const isNpubExists = npub.trim().length && keys.some((key) => key.npub === npub)
-
-  if (!isNpubExists || !currentApp) {
-    return <Navigate to={`/key/${npub}`} />
-  }
-
-  const { icon = '', name = '', url = '' } = currentApp || {}
-  const appDomain = getDomain(url)
-  const shortAppNpub = getShortenNpub(appNpub)
-  const appName = name || appDomain || shortAppNpub
-  const appAvatarTitle = getAppIconTitle(name || appDomain, appNpub)
-  const isAppNameExists = !!name
-
-  const { timestamp } = connectPerm || {}
-  const connectedOn = connectPerm && timestamp ? `Connected at ${formatTimestampDate(timestamp)}` : 'Not connected'
-
-  const handleDeleteApp = async () => {
-    try {
-      await swicCall('deleteApp', appNpub)
-      notify(`App: «${appName}» successfully deleted!`, 'success')
-      navigate(`/key/${npub}`)
-    } catch (error: any) {
-      notify(error?.message || 'Failed to delete app', 'error')
-    }
-  }
-
-  const handleShowAppDetailsModal = () => handleOpenModal(MODAL_PARAMS_KEYS.APP_DETAILS)
-
-  return (
-    <>
-      <Stack maxHeight={'100%'} overflow={'auto'} alignItems={'flex-start'} height={'100%'}>
-        <IOSBackButton onNavigate={() => navigate(`key/${npub}`)} />
-        <Stack marginBottom={'1rem'} direction={'row'} gap={'1rem'} width={'100%'} alignItems={'center'}>
-          <StyledAppIcon src={icon}>{appAvatarTitle}</StyledAppIcon>
-          <Box flex={'1'} overflow={'hidden'}>
-            <Stack direction={'row'} alignItems={'flex-start'} gap={'0.5rem'} marginBottom={'0.5rem'}>
-              <Box display={'flex'} flexDirection={'column'} flex={1}>
-                <Typography variant="h4" noWrap>
-                  {appName}
-                </Typography>
-                {isAppNameExists && (
-                  <Typography noWrap display={'block'} variant="body1" color={'GrayText'}>
-                    {shortAppNpub}
-                  </Typography>
-                )}
-              </Box>
-              <IconButton onClick={handleShowAppDetailsModal}>
-                <MoreIcon />
-              </IconButton>
-            </Stack>
-            <Typography variant="body2" noWrap>
-              {connectedOn}
-            </Typography>
-          </Box>
-        </Stack>
-        <Box marginBottom={'1rem'}>
-          <SectionTitle marginBottom={'0.5rem'}>Disconnect</SectionTitle>
-          <Button fullWidth onClick={handleShow}>
-            Delete app
-          </Button>
-        </Box>
-        <Permissions perms={perms} />
-
-        <Button fullWidth onClick={() => handleOpenModal(MODAL_PARAMS_KEYS.ACTIVITY)}>
-          Activity
-        </Button>
-      </Stack>
-
-      <ConfirmModal
-        open={open}
-        headingText="Delete app"
-        description="Are you sure you want to delete this app?"
-        onCancel={handleClose}
-        onConfirm={handleDeleteApp}
-        onClose={handleClose}
-      />
-      <ModalActivities appNpub={appNpub} />
-      <ModalAppDetails />
-    </>
-  )
-}
-
-export default AppPage
--- a/src/pages/AppPage/components/Activities/ItemActivity.tsx
+++ b/src/pages/AppPage/components/Activities/ItemActivity.tsx
@ -1,29 +0,0 @@
-import { FC } from 'react'
-import { DbHistory } from '@/modules/db'
-import { Box, IconButton, Typography } from '@mui/material'
-import { StyledActivityItem } from './styled'
-import { formatTimestampDate } from '@/utils/helpers/date'
-import ClearRoundedIcon from '@mui/icons-material/ClearRounded'
-import DoneRoundedIcon from '@mui/icons-material/DoneRounded'
-import MoreVertRoundedIcon from '@mui/icons-material/MoreVertRounded'
-import { getReqActionName } from '@/utils/helpers/helpers'
-
-type ItemActivityProps = DbHistory
-
-export const ItemActivity: FC<ItemActivityProps> = (req) => {
-  const { allowed, timestamp } = req
-  return (
-    <StyledActivityItem>
-      <Box display={'flex'} flexDirection={'column'} gap={'0.5rem'} flex={1}>
-        <Typography flex={1} fontWeight={700}>
-          {getReqActionName(req)}
-        </Typography>
-        <Typography variant="body2">{formatTimestampDate(timestamp)}</Typography>
-      </Box>
-      <Box>{allowed ? <DoneRoundedIcon htmlColor="green" /> : <ClearRoundedIcon htmlColor="red" />}</Box>
-      <IconButton>
-        <MoreVertRoundedIcon />
-      </IconButton>
-    </StyledActivityItem>
-  )
-}
--- a/src/pages/AppPage/components/Activities/ModalActivities.tsx
+++ b/src/pages/AppPage/components/Activities/ModalActivities.tsx
@ -1,30 +0,0 @@
-import React, { FC } from 'react'
-import { Modal } from '@/shared/Modal/Modal'
-import { Box } from '@mui/material'
-import { useLiveQuery } from 'dexie-react-hooks'
-import { HistoryDefaultValue, getActivityHistoryQuerier } from '../../utils'
-import { ItemActivity } from './ItemActivity'
-import { useModalSearchParams } from '@/hooks/useModalSearchParams'
-import { MODAL_PARAMS_KEYS } from '@/types/modal'
-
-type ModalActivitiesProps = {
-  appNpub: string
-}
-
-export const ModalActivities: FC<ModalActivitiesProps> = ({ appNpub }) => {
-  const { getModalOpened, createHandleCloseReplace } = useModalSearchParams()
-  const isModalOpened = getModalOpened(MODAL_PARAMS_KEYS.ACTIVITY)
-  const handleCloseModal = createHandleCloseReplace(MODAL_PARAMS_KEYS.ACTIVITY)
-
-  const history = useLiveQuery(getActivityHistoryQuerier(appNpub), [], HistoryDefaultValue)
-
-  return (
-    <Modal open={isModalOpened} onClose={handleCloseModal} fixedHeight="calc(100% - 5rem)" title="Activity history">
-      <Box overflow={'auto'}>
-        {history.map((item) => {
-          return <ItemActivity {...item} key={item.id} />
-        })}
-      </Box>
-    </Modal>
-  )
-}
--- a/src/pages/AppPage/components/Activities/styled.tsx
+++ b/src/pages/AppPage/components/Activities/styled.tsx
@ -1,10 +0,0 @@
-import styled from '@emotion/styled'
-import { Box, BoxProps } from '@mui/material'
-
-export const StyledActivityItem = styled((props: BoxProps) => <Box {...props} />)(() => ({
-  display: 'flex',
-  gap: '0.5rem',
-  justifyContent: 'space-between',
-  alignItems: 'center',
-  padding: '0.25rem',
-}))
--- a/src/pages/AppPage/components/Permissions/ItemPermission.tsx
+++ b/src/pages/AppPage/components/Permissions/ItemPermission.tsx
@ -1,41 +0,0 @@
-import { FC } from 'react'
-import { Box, IconButton, Typography } from '@mui/material'
-import { DbPerm } from '@/modules/db'
-import { formatTimestampDate } from '@/utils/helpers/date'
-import { StyledPermissionItem } from './styled'
-import ClearRoundedIcon from '@mui/icons-material/ClearRounded'
-import DoneRoundedIcon from '@mui/icons-material/DoneRounded'
-import MoreVertRoundedIcon from '@mui/icons-material/MoreVertRounded'
-import { ItemPermissionMenu } from './ItemPermissionMenu'
-import { useOpenMenu } from '@/hooks/useOpenMenu'
-import { getPermActionName } from '@/utils/helpers/helpers'
-
-type ItemPermissionProps = {
-  permission: DbPerm
-}
-
-export const ItemPermission: FC<ItemPermissionProps> = ({ permission }) => {
-  const { value, timestamp, id } = permission || {}
-
-  const { anchorEl, handleClose, handleOpen, open } = useOpenMenu()
-
-  const isAllowed = value === '1'
-
-  return (
-    <>
-      <StyledPermissionItem>
-        <Box display={'flex'} flexDirection={'column'} gap={'0.5rem'} flex={1}>
-          <Typography flex={1} fontWeight={700}>
-            {getPermActionName(permission)}
-          </Typography>
-          <Typography variant="body2">{formatTimestampDate(timestamp)}</Typography>
-        </Box>
-        <Box>{isAllowed ? <DoneRoundedIcon htmlColor="green" /> : <ClearRoundedIcon htmlColor="red" />}</Box>
-        <IconButton onClick={handleOpen}>
-          <MoreVertRoundedIcon />
-        </IconButton>
-      </StyledPermissionItem>
-      <ItemPermissionMenu anchorEl={anchorEl} open={open} handleClose={handleClose} permId={id} />
-    </>
-  )
-}
--- a/src/pages/AppPage/components/Permissions/ItemPermissionMenu.tsx
+++ b/src/pages/AppPage/components/Permissions/ItemPermissionMenu.tsx
@ -1,55 +0,0 @@
-import { FC, useState } from 'react'
-import { Menu, MenuItem, MenuProps } from '@mui/material'
-import { ConfirmModal } from '@/shared/ConfirmModal/ConfirmModal'
-import { swicCall } from '@/modules/swic'
-import { useEnqueueSnackbar } from '@/hooks/useEnqueueSnackbar'
-
-type ItemPermissionMenuProps = {
-  permId: string
-  handleClose: () => void
-} & MenuProps
-
-export const ItemPermissionMenu: FC<ItemPermissionMenuProps> = ({ open, anchorEl, handleClose, permId }) => {
-  const [showConfirm, setShowConfirm] = useState(false)
-  const notify = useEnqueueSnackbar()
-
-  const handleShowConfirm = () => {
-    setShowConfirm(true)
-    handleClose()
-  }
-  const handleCloseConfirm = () => setShowConfirm(false)
-
-  const handleDeletePerm = async () => {
-    try {
-      await swicCall('deletePerm', permId)
-      notify('Permission successfully deleted!', 'success')
-      handleCloseConfirm()
-    } catch (error: any) {
-      notify(error?.message || 'Failed to delete permission', 'error')
-    }
-  }
-
-  return (
-    <>
-      <Menu
-        open={open}
-        anchorEl={anchorEl}
-        onClose={handleClose}
-        anchorOrigin={{
-          horizontal: 'left',
-          vertical: 'bottom',
-        }}
-      >
-        <MenuItem onClick={handleShowConfirm}>Delete permission</MenuItem>
-      </Menu>
-      <ConfirmModal
-        open={showConfirm}
-        onClose={handleCloseConfirm}
-        onCancel={handleCloseConfirm}
-        headingText="Delete permission"
-        description="Are you sure you want to delete this permission?"
-        onConfirm={handleDeletePerm}
-      />
-    </>
-  )
-}
--- a/Show More
+++ b/Show More