From d81f09a86db7e7d5fed8318adef850ca792989bf Mon Sep 17 00:00:00 2001 From: Dominik Guzei Date: Wed, 13 Mar 2019 13:09:06 +0100 Subject: [PATCH] [DDW-597] fix pre-push hook --- package.json | 6 ++++-- source/renderer/app/containers/Root.js | 5 ++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 739fe3081b..181f260a8e 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,9 @@ "cucumber:watch:debug": "KEEP_APP_AFTER_TESTS=true npm run cucumber -- --tags @watch", "lint": "eslint --format=node_modules/eslint-formatter-pretty source features storybook *.js", "flow:test": "flow; test $? -eq 0 -o $? -eq 2", - "prettier": "./node_modules/.bin/prettier --write --ignore-path .eslintignore --loglevel warn \"./**/*.{js,scss,json}\"", + "prettier": "./node_modules/.bin/prettier --ignore-path .eslintignore \"./**/*.{js,scss,json}\"", + "prettier:check": "yarn prettier -c", + "prettier:format": "yarn prettier --write --loglevel warn", "manage:translations": "gulp purge:translations && gulp clear:cache && gulp build && node ./translations/translation-runner.js", "storybook": "start-storybook -p 6006 -c storybook", "clear:cache": "gulp clear:cache", @@ -183,7 +185,7 @@ "husky": { "hooks": { "pre-commit": "pretty-quick --staged --pattern \"./**/*.{js,scss,json}\"", - "pre-push": "yarn prettier && yarn lint && yarn flow:test && yarn manage:translations" + "pre-push": "yarn prettier:check && yarn lint && yarn flow:test && yarn manage:translations" } } } diff --git a/source/renderer/app/containers/Root.js b/source/renderer/app/containers/Root.js index 01af4052a3..4ed7aab76a 100644 --- a/source/renderer/app/containers/Root.js +++ b/source/renderer/app/containers/Root.js @@ -25,10 +25,9 @@ export default class Root extends Component { isNotEnoughDiskSpace, } = networkStatus; - const isPageThatDoesntNeedWallets = ( + const isPageThatDoesntNeedWallets = isBlockConsolidationStatusPage || - (isAdaRedemptionPage && hasLoadedWallets && isSynced) - ); + (isAdaRedemptionPage && hasLoadedWallets && isSynced); // In case node is in stopping sequence we must show the "Connecting" screen // with the "Stopping Cardano node..." and "Cardano node stopped" messages