Skip to content

Commit 13efb50

Browse files
authored
[Fix] MetaMask stuck loading after app update (#1212)
* fixes * bump ext importer * fixes * add call-bind-apply-helpers as a dep * add debug logs * refactors and fixes * rm debug logs * bump 0.23.0 * rm more debug logs * rm debug log
1 parent 4941e7f commit 13efb50

File tree

10 files changed

+34
-14
lines changed

10 files changed

+34
-14
lines changed

package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "hyperplay",
3-
"version": "0.22.6",
3+
"version": "0.23.0",
44
"private": true,
55
"main": "build/main/main.js",
66
"homepage": "./",
@@ -95,6 +95,7 @@
9595
"auto-launch": "^5.0.6",
9696
"axios": "^1.7.5",
9797
"bn.js": "^5.2.1",
98+
"call-bind-apply-helpers": "^1.0.1",
9899
"classic-level": "^1.4.1",
99100
"classnames": "^2.5.1",
100101
"compare-versions": "^6.1.1",
@@ -225,7 +226,7 @@
225226
"vite-plugin-svgr": "^2.2.2"
226227
},
227228
"optionalDependencies": {
228-
"@hyperplay/extension-importer": "^0.1.1-alpha.0",
229+
"@hyperplay/extension-importer": "^0.3.0",
229230
"@hyperplay/extension-provider": "^0.0.9",
230231
"@hyperplay/mock-backend": "^0.0.1",
231232
"@hyperplay/overlay": "^0.0.7",

pnpm-lock.yaml

+8-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/extensions/MetaMask_v10.22.2/background-3.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/extensions/MetaMask_v10.22.2/common-0.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/extensions/MetaMask_v10.22.2/manifest.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
}
6767
],
6868
"default_locale": "en",
69-
"description": "other build from git id: 0f96e8e3",
69+
"description": "other build from git id: f5c002c3",
7070
"host_permissions": [
7171
"http://localhost:8545/",
7272
"file://*/*",

public/extensions/MetaMask_v10.22.2/scripts/app-init.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/extensions/MetaMask_v10.22.2/scripts/inpage.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/extensions/MetaMask_v10.22.2/scripts/sentry-install.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

public/extensions/MetaMask_v10.22.2/ui-12.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/backend/main.ts

+16
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,20 @@ import { checkG7ConnectionStatus, postPlaySessionTime } from './utils/quests'
190190

191191
import { gameIsEpicForwarderOnHyperPlay } from './utils/shouldOpenOverlay'
192192

193+
async function initExtensionOnLaunch() {
194+
try {
195+
const extImporter = await import('@hyperplay/extension-importer')
196+
await extImporter.initExtensionBeforeWindowCreation(hpApi)
197+
} catch (err) {
198+
logError(
199+
`Error initializing extension on launch ${err}`,
200+
LogPrefix.HyperPlay
201+
)
202+
}
203+
}
204+
205+
initExtensionOnLaunch()
206+
193207
async function startProxyServer() {
194208
try {
195209
const proxyServer = await import('@hyperplay/proxy-server')
@@ -681,6 +695,8 @@ ipcMain.once('loadingScreenReady', () => {
681695
ipcMain.once('frontendReady', async () => {
682696
logInfo('Frontend Ready', LogPrefix.Backend)
683697
await initExtension(hpApi)
698+
// wait for mm SW to initialize
699+
await wait(5000)
684700
ipcMain.emit('reloadApp')
685701
handleProtocol([openUrlArgument, ...process.argv])
686702
setTimeout(() => {

0 commit comments

Comments
 (0)