Skip to content

Commit

Permalink
[DDW-597] fix pre-push hook
Browse files Browse the repository at this point in the history
  • Loading branch information
DominikGuzei committed Mar 13, 2019
1 parent a8fcb1e commit d81f09a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
6 changes: 4 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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"
}
}
}
5 changes: 2 additions & 3 deletions source/renderer/app/containers/Root.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,9 @@ export default class Root extends Component<Props> {
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
Expand Down

0 comments on commit d81f09a

Please sign in to comment.