Skip to content

Commit

Permalink
Merge pull request #797 from secretkeylabs/release/v0.29.2
Browse files Browse the repository at this point in the history
release: v0.29.2 to main
  • Loading branch information
yknl authored Feb 14, 2024
2 parents a7d723b + 03b0c56 commit eadf92e
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 6 deletions.
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "xverse-web-extension",
"description": "A Bitcoin wallet for Web3",
"version": "0.29.1",
"version": "0.29.2",
"private": true,
"engines": {
"node": "^18.18.2"
Expand Down
2 changes: 1 addition & 1 deletion src/content-scripts/content-script.ts
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ const injectInPageScript = (isPriority) => {
inpage.src = chrome.runtime.getURL('inpage.js');
inpage.id = 'xverse-wallet-provider';
inpage.setAttribute('data-is-priority', isPriority ? 'true' : '');
document.body.appendChild(inpage);
document.head.appendChild(inpage);
};

getIsPriorityWallet()
Expand Down
17 changes: 15 additions & 2 deletions src/inpage/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,28 @@ try {
if (document.currentScript?.dataset.isPriority) {
Object.defineProperties(window, {
StacksProvider: { get: () => StacksMethodsProvider, set: () => {} },
BitcoinProvider: { get: () => SatsMethodsProvider, set: () => {} },
});
} else {
window.StacksProvider = StacksMethodsProvider as StacksProvider;
}
} catch (e) {
console.log(
'Failed setting Xverse Stacks default provider. Another wallet may have already set it in an immutable way.',
);
console.error(e);
}

try {
if (document.currentScript?.dataset.isPriority) {
Object.defineProperties(window, {
BitcoinProvider: { get: () => SatsMethodsProvider, set: () => {} },
});
} else {
window.BitcoinProvider = SatsMethodsProvider;
}
} catch (e) {
console.log(
'Failed setting Xverse default providers. Another wallet may have already set them in an immutable way.',
'Failed setting Xverse Bitcoin default provider. Another wallet may have already set it in an immutable way.',
);
console.error(e);
}
1 change: 1 addition & 0 deletions src/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
},
"content_scripts": [
{
"run_at": "document_start",
"js": ["browser-polyfill.js", "content-script.js"],
"matches": ["*://*/*"],
"all_frames": true
Expand Down

0 comments on commit eadf92e

Please sign in to comment.