Merge pull request #245 from plebbit/master

Development

package.json

@@ -64,7 +64,8 @@
     "electron:before:download-ipfs": "node electron/downloadIpfs",
     "electron:before:delete-data": "rimraf .plebbit",
     "android:build:icons": "cordova-res android --skip-config --copy --resources /tmp/plebbit-react-android-icons --icon-source ./android/icons/icon.png --splash-source ./android/icons/splash.png --icon-foreground-source ./android/icons/icon-foreground.png --icon-background-source '#ffffee'",
-    "prettier": "prettier src/**/*.{js,jsx} --write"
+    "prettier": "prettier src/**/*.{js,jsx} --write",
+    "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0"
   },
   "eslintConfig": {
     "extends": [
@@ -135,9 +136,29 @@
     "prettier": "2.3.2",
     "source-map-explorer": "2.5.3",
     "typescript": "5.0.2",
-    "wait-on": "7.0.1"
+    "wait-on": "7.0.1",
+    "conventional-changelog-cli": "4.1.0",
+    "cz-conventional-changelog": "3.3.0",
+    "husky": "4.3.8",
+    "lint-staged": "12.3.8"
   },
   "resolutions": {
     "styled-components": "^5"
+  },
+  "lint-staged": {
+    "{src,test,config}/**/*.{cjs,js,jsx,ts,tsx}": [
+      "prettier --config config/prettier.config.js --write"
+    ]
+  },
+  "husky": {
+    "hooks": {
+      "prepare-commit-msg": "exec < /dev/tty && cz --hook || true",
+      "pre-commit": "lint-staged"
+    }
+  },
+  "config": {
+    "commitizen": {
+      "path": "./node_modules/cz-conventional-changelog"
+    }
   }
 }

src/components/modals/SettingsModal.jsx

@@ -350,9 +350,10 @@ const SettingsModal = ({ isOpen, closeModal }) => {
 
 
   const handleSaveAccount = async () => {
+    const data = importRef.current.value;
     try {
-      const parsedJson = JSON.parse(editedAccountJson);
-      await setAccount(parsedJson);
+      const parsedJson = JSON.parse(data);
+      await setAccount(parsedJson.account);
       setNewSuccessMessage("Account data saved successfully.");
     } catch (error) {
       setNewErrorMessage("Error saving account data: " + error.message);

src/components/styled/views/Board.styled.jsx

@@ -1430,7 +1430,7 @@ export const TopBar = styled.div`
   @media (min-width: 480px) {
     .stats-all-container {
       float: right;
-      margin-top: 3px;
+      margin-top: 5px;
       margin-right: 30px;
       overflow: hidden;
       max-width: calc(100vw - 50vw);