From 3d2e07dbc4c79929e8b55c39569227aab74f69eb Mon Sep 17 00:00:00 2001 From: Jun Ma Date: Thu, 1 Dec 2022 14:32:52 +0800 Subject: [PATCH 1/2] fix cannot open electron window --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index aea0ae37fb..28b3656a6a 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "bootstrap": "npx cross-env lerna bootstrap && lerna link", "start:ui": "cd packages/neuron-ui && yarn run start", "start:wallet": "cd packages/neuron-wallet && yarn run start:debug", - "start": "concurrently \"cross-env BROWSER=none yarn run start:ui\" \"wait-on http://localhost:3000 && yarn run start:wallet\"", + "start": "concurrently \"cross-env BROWSER=none yarn run start:ui\" \"wait-on http://127.0.0.1:3000 && yarn run start:wallet\"", "clean": "lerna run --stream clean", "prebuild": "yarn clean", "build": "lerna run --stream build", diff --git a/yarn.lock b/yarn.lock index 80d93e836f..a90baba2af 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10877,10 +10877,10 @@ eslint@8.25.0: strip-json-comments "^3.1.0" text-table "^0.2.0" -eslint@8.27.0: - version "8.27.0" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.27.0.tgz#d547e2f7239994ad1faa4bb5d84e5d809db7cf64" - integrity sha512-0y1bfG2ho7mty+SiILVf9PfuRA49ek4Nc60Wmmu62QlobNR+CeXa4xXIJgcuwSQgZiWaPH+5BDsctpIW0PR/wQ== +eslint@8.28.0: + version "8.28.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.28.0.tgz#81a680732634677cc890134bcdd9fdfea8e63d6e" + integrity sha512-S27Di+EVyMxcHiwDrFzk8dJYAaD+/5SoWKxL1ri/71CRHsnJnRDPNt2Kzj24+MT9FDupf4aqqyqPrvI8MvQ4VQ== dependencies: "@eslint/eslintrc" "^1.3.3" "@humanwhocodes/config-array" "^0.11.6" From c5d25e25e8d91173aa1a77299d8ae565a0fa4728 Mon Sep 17 00:00:00 2001 From: Jun Ma Date: Mon, 5 Dec 2022 21:25:10 +0800 Subject: [PATCH 2/2] fix type error --- packages/neuron-ui/src/widgets/GlobalDialog/index.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/neuron-ui/src/widgets/GlobalDialog/index.tsx b/packages/neuron-ui/src/widgets/GlobalDialog/index.tsx index 26fd4b932f..4c9796b20c 100644 --- a/packages/neuron-ui/src/widgets/GlobalDialog/index.tsx +++ b/packages/neuron-ui/src/widgets/GlobalDialog/index.tsx @@ -20,7 +20,7 @@ const RebuildSync = ({ onDismiss, onOk }: { onDismiss: React.MouseEventHandler;
{t('messages.rebuild-sync') .split('\n') - .map(s => ( + .map((s: string) => (

{s}

))}