From f16d320e71ee95af663c5211315d42c3f1800cc4 Mon Sep 17 00:00:00 2001 From: Ikemefuna Obioha Date: Mon, 4 Mar 2024 16:44:38 +0100 Subject: [PATCH 1/4] Fixed redirect error --- setup/react/app/MainRouter.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/setup/react/app/MainRouter.js b/setup/react/app/MainRouter.js index 3337e38f36..951503a8b4 100644 --- a/setup/react/app/MainRouter.js +++ b/setup/react/app/MainRouter.js @@ -29,7 +29,10 @@ const MainRouter = ({ history }) => { if (event.name === EVENTS.SESSION_REQUEST) { const method = event.meta?.params?.request?.method; - if (method === SIGNING_METHODS.SIGN_MESSAGE || method === SIGNING_METHODS.SIGN_RAW_MESSAGE) { + if ( + method === SIGNING_METHODS.SIGN_MESSAGE.key || + method === SIGNING_METHODS.SIGN_RAW_MESSAGE.key + ) { showRequestModal('requestSignMessageDialog', event); } else { showRequestModal('requestView', event); From 50605a8ff133690e6f12b54bbc53d47c10d78162 Mon Sep 17 00:00:00 2001 From: Ikemefuna Obioha Date: Tue, 5 Mar 2024 11:42:06 +0100 Subject: [PATCH 2/4] Minor change --- setup/react/app/MainRouter.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/react/app/MainRouter.js b/setup/react/app/MainRouter.js index 951503a8b4..0d5e949b55 100644 --- a/setup/react/app/MainRouter.js +++ b/setup/react/app/MainRouter.js @@ -30,8 +30,8 @@ const MainRouter = ({ history }) => { const method = event.meta?.params?.request?.method; if ( - method === SIGNING_METHODS.SIGN_MESSAGE.key || - method === SIGNING_METHODS.SIGN_RAW_MESSAGE.key + method === SIGNING_METHODS.SIGN_MESSAGE.method || + method === SIGNING_METHODS.SIGN_RAW_MESSAGE.method ) { showRequestModal('requestSignMessageDialog', event); } else { From 5135017317655b40feeef27638834d97cbb70889 Mon Sep 17 00:00:00 2001 From: Ikemefuna Obioha Date: Tue, 5 Mar 2024 11:42:37 +0100 Subject: [PATCH 3/4] Reverted minor change --- setup/react/app/MainRouter.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup/react/app/MainRouter.js b/setup/react/app/MainRouter.js index 0d5e949b55..951503a8b4 100644 --- a/setup/react/app/MainRouter.js +++ b/setup/react/app/MainRouter.js @@ -30,8 +30,8 @@ const MainRouter = ({ history }) => { const method = event.meta?.params?.request?.method; if ( - method === SIGNING_METHODS.SIGN_MESSAGE.method || - method === SIGNING_METHODS.SIGN_RAW_MESSAGE.method + method === SIGNING_METHODS.SIGN_MESSAGE.key || + method === SIGNING_METHODS.SIGN_RAW_MESSAGE.key ) { showRequestModal('requestSignMessageDialog', event); } else { From 6f92761f8454560d6d3ab305f54f13896722ea9a Mon Sep 17 00:00:00 2001 From: Ikemefuna Obioha Date: Tue, 5 Mar 2024 17:38:28 +0100 Subject: [PATCH 4/4] Updated Jenkins Lisk core version to fix e2e error --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 385b2c6aad..de7e9a1c0b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { ansiColor('xterm') } parameters { - string(name: 'CORE_VERSION', defaultValue: '4.0.1') + string(name: 'CORE_VERSION', defaultValue: '4.0.2') string(name: 'SERVICE_BRANCH_NAME', defaultValue: 'development') } stages {