Update CONTRIBUTING and package json

Author: lukakerr

CONTRIBUTING.md

@@ -8,13 +8,17 @@ If you are implementing a new feature, or modifying styles, please replace/add s
 
 ### Prettier
 
-[Prettier](https://github.com/prettier/prettier) is used to keep a consistent code style across the project. Before committing, run `npm run prettier` which will transform your code to fit the projects style.
+[Prettier](https://github.com/prettier/prettier) is used to keep a consistent code style across the project. Before committing, run `npm run prettier` which will list all files that aren't formatted correctly, then rin `npm run prettier:write` to transform your code to fit the projects style.
 
 ### ESLint
 
 [ESLint](https://github.com/eslint/eslint) is used for code linting inside your IDE/text editor. If you don't have ESLint installed in your editor, you should install it - [https://eslint.org/docs/user-guide/integrations](https://eslint.org/docs/user-guide/integrations). 
 
-To find any errors or warnings, either view them in your editor once you've installed the right package, or run `npm run eslint`. Not all errors/warnings can be fixed, and some will be picked up by prettier, so don't worry if you can't fix them.
+To find any errors or warnings, either view them in your editor once you've installed the right package, or run `npm run eslint`. Not all errors/warnings can be fixed, and some will be picked up by Prettier, so don't worry if you can't fix them. To automatically fix some errors/warnings, run `npm run eslint:fix`.
+
+### Prettier & ESLint
+
+To autoamtically format and fix linting errors, run `npm run format`. This runs Prettier, then ESLint. 
 
 ### Lock Files
 

package-lock.json

@@ -6,14 +6,17 @@
     "start": "react-native run-ios",
     "start:x": "react-native run-ios --simulator='iPhone X'",
     "link": "react-native link",
-    "prettier": "prettier --write \"**/*.js\"",
-    "eslint": "eslint --fix .; exit 0;",
+    "prettier": "prettier -l \"**/*.js\"; exit 0;",
+    "prettier:write": "prettier --write \"**/*.js\"; exit 0;",
+    "eslint": "eslint .; exit 0;",
+    "eslint:fix": "eslint --fix .; exit 0;",
     "format": "npm run prettier && npm run eslint",
     "test": "jest"
   },
   "dependencies": {
     "cheerio-without-node-native": "^0.20.2",
     "javascript-time-ago": "^1.0.28",
+    "prop-types": "^15.6.0",
     "react": "16.2.0",
     "react-native": "^0.53.0",
     "react-native-haptic": "^1.0.5",
@@ -24,6 +27,7 @@
     "react-native-tableview": "^2.1.0",
     "react-redux": "^5.0.6",
     "redux": "^3.7.2",
+    "redux-logger": "^3.0.6",
     "redux-persist": "^5.6.10",
     "redux-thunk": "^2.2.0"
   },
@@ -33,13 +37,14 @@
     "babel-preset-react-native": "4.0.0",
     "eslint": "^4.18.1",
     "eslint-config-airbnb": "^16.1.0",
+    "eslint-config-prettier": "^2.9.0",
     "eslint-plugin-import": "^2.9.0",
+    "eslint-plugin-jest": "^21.12.2",
     "eslint-plugin-jsx-a11y": "^6.0.3",
     "eslint-plugin-react": "^7.7.0",
     "jest": "22.1.4",
     "prettier": "1.10.2",
-    "react-test-renderer": "16.2.0",
-    "redux-logger": "^3.0.6"
+    "react-test-renderer": "16.2.0"
   },
   "jest": {
     "preset": "react-native",