Skip to content

Commit

Permalink
Merge pull request #88 from zilpay/manifest-v3
Browse files Browse the repository at this point in the history
Manifest v3
  • Loading branch information
hicaru authored Nov 19, 2022
2 parents 4132a9a + a5aea23 commit f5b0227
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 5 deletions.
15 changes: 15 additions & 0 deletions core/background/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,21 @@
import { ZIlPayBackground } from 'core/background/wallet/bg-zilpay';
import { startBackground } from './background';


async function decryptMessage(key, ciphertext) {
let decrypted = await window.crypto.subtle.decrypt(
{
name: "RSA-OAEP"
},
key,
ciphertext
);

let dec = new TextDecoder();
return dec.decode(decrypted);
}


(async function() {
const core = new ZIlPayBackground();

Expand Down
2 changes: 1 addition & 1 deletion core/background/wallet/transaction.ts
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ export class ZilPayTransaction {
}

sendResponse({
resolve: null
resolve: this.#core.state
});
} catch (err) {
sendResponse({
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "zil-pay",
"version": "1.3.2",
"version": "1.3.4",
"description": "ZilPay browser Extension for zilliqa blockchain",
"shortName": "ZilPay",
"private": false,
Expand Down
9 changes: 7 additions & 2 deletions popup/pages/settings/Security.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@
<main>
<NavClose title={$_('security.title')}/>
<div>

<Jumbotron
title={$_('security.phrase.title')}
description={$_('security.phrase.description')}
Expand All @@ -75,7 +74,8 @@
>
<span
class="warning"
on:click={() => keyModal = !keyModal}
class:disabled={account.type === AccountTypes.Track}
on:click={() => keyModal = !keyModal && account.type !== AccountTypes.Track}
>
{$_('security.key.btn')}
</span>
Expand Down Expand Up @@ -118,6 +118,11 @@
}
span {
font-family: Demi;
&.disabled {
cursor: unset !important;
opacity: 0.5;
}
&.warning {
cursor: pointer;
font-size: 16px;
Expand Down
2 changes: 1 addition & 1 deletion public/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
},
"track": {
"title": "Track account",
"description": "Add none-operation account."
"description": "Add view-only account."
},
"connect": {
"title": "Connect ledger.",
Expand Down

0 comments on commit f5b0227

Please sign in to comment.