Merge branch 'develop' into production

xMartin · Apr 7, 2021 · f95759f · f95759f · vercel · Apr 7, 2021
2 parents 3993c47 + 7bc1df1
commit f95759f
Show file tree

Hide file tree

Showing 33 changed files with 3,604 additions and 3,124 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -11,34 +11,35 @@
   },
   "homepage": "https://grouptabs.net/",
   "dependencies": {
-    "@types/jest": "^26.0.19",
-    "@types/node": "^14.14.13",
+    "@seznam/compose-react-refs": "^1.0.6",
+    "@types/jest": "^26.0.22",
+    "@types/node": "^14.14.37",
     "@types/pouchdb": "^6.4.0",
-    "@types/react": "^17.0.0",
-    "@types/react-dom": "^17.0.0",
-    "@types/react-redux": "^7.1.12",
-    "@types/react-test-renderer": "^17.0.0",
+    "@types/react": "^17.0.3",
+    "@types/react-dom": "^17.0.3",
+    "@types/react-redux": "^7.1.16",
+    "@types/react-test-renderer": "^17.0.1",
     "@types/redux-first-router": "^2.1.5",
     "@types/uuid": "^8.3.0",
     "debug": "^4.3.1",
-    "husky": "^4.3.6",
-    "lint-staged": "^10.5.3",
+    "husky": "^4.3.8",
+    "lint-staged": "^10.5.4",
     "lodash.orderby": "^4.6.0",
+    "lodash.throttle": "^4.1.1",
     "pouchdb": "^7.2.2",
     "pouchdb-adapter-memory": "^7.2.2",
-    "pouchdb-all-dbs": "github:xMartin/pouchdb-all-dbs#grouptabs",
     "prettier": "^2.2.1",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
-    "react-redux": "^7.2.1",
-    "react-scripts": "4.0.0",
-    "react-test-renderer": "^17.0.1",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "react-redux": "^7.2.3",
+    "react-scripts": "4.0.3",
+    "react-test-renderer": "^17.0.2",
     "redux": "^4.0.5",
     "redux-first-router": "^2.1.5",
     "redux-thunk": "^2.3.0",
     "reselect": "^4.0.0",
     "smooth-scroll": "^16.1.3",
-    "typescript": "~4.0.3",
+    "typescript": "^4.2.3",
     "uuid": "^8.3.2",
     "workbox-background-sync": "^5.1.4",
     "workbox-broadcast-update": "^5.1.4",

diff --git a/release-notes.yml b/release-notes.yml
@@ -3,6 +3,13 @@ description: >
   Track expenses in a group of people!
 
 releases:
+  - version: 1.5.0
+    date: 2021-04-07
+    description: Animated screen transitions and smaller bugfixes and improvements
+    added:
+      - Animated screen transitions
+    changed:
+      - Removed migration from PouchDB's all-dbs data - it has been around for more than a year now
   - version: 1.4.0
     date: 2020-12-14
     description: Clean URLs and smaller bugfixes and improvements

diff --git a/src/app.ts b/src/app.ts
@@ -5,6 +5,7 @@ import {
   getTabs,
   getTransactions,
   getAccounts,
+  getCurrentLocation,
 } from "./redux/selectors";
 import {
   navigateToTabs,
@@ -34,6 +35,7 @@ import { Transaction } from "./types";
 function mapStateToProps(state: AllState) {
   return {
     location: state.location,
+    currentLocation: getCurrentLocation(state),
     initialLoadingDone: state.app.initialLoadingDone,
     tabInfo: getTabInfo(state),
     transaction: state.app.docsById[

diff --git a/src/components/__snapshots__/editentry.test.tsx.snap b/src/components/__snapshots__/editentry.test.tsx.snap
@@ -1,9 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`renders empty form 1`] = `
-<div
-  className="scene editEntryScene"
->
+Array [
   <div
     className="header"
   >
@@ -37,8 +35,10 @@ exports[`renders empty form 1`] = `
         />
       </svg>
     </button>
-  </div>
-  <div>
+  </div>,
+  <div
+    className="content"
+  >
     <form
       id="edit-entry-form"
       onSubmit={[Function]}
@@ -53,7 +53,6 @@ exports[`renders empty form 1`] = `
             className="form-row-input description"
           >
             <input
-              autoFocus={true}
               onChange={[Function]}
               placeholder="Description"
               type="text"
@@ -241,7 +240,7 @@ exports[`renders empty form 1`] = `
                   className="participant"
                 >
                   <input
-                    autoFocus={true}
+                    autoFocus={false}
                     onChange={[Function]}
                     placeholder="Name …"
                     type="text"
@@ -278,7 +277,7 @@ exports[`renders empty form 1`] = `
                   className="participant"
                 >
                   <input
-                    autoFocus={true}
+                    autoFocus={false}
                     onChange={[Function]}
                     placeholder="Name …"
                     type="text"
@@ -330,14 +329,12 @@ exports[`renders empty form 1`] = `
         className="row"
       />
     </form>
-  </div>
-</div>
+  </div>,
+]
 `;
 
 exports[`renders loader in edit mode with no data 1`] = `
-<div
-  className="scene editEntryScene"
->
+Array [
   <div
     className="header"
   >
@@ -357,8 +354,10 @@ exports[`renders loader in edit mode with no data 1`] = `
     <h2>
       Edit transaction
     </h2>
-  </div>
-  <div>
+  </div>,
+  <div
+    className="content"
+  >
     <div
       className="load-error"
     >
@@ -379,14 +378,12 @@ exports[`renders loader in edit mode with no data 1`] = `
         OK
       </button>
     </div>
-  </div>
-</div>
+  </div>,
+]
 `;
 
 exports[`renders loader when checking remote tab 1`] = `
-<div
-  className="scene editEntryScene"
->
+Array [
   <div
     className="header"
   >
@@ -406,19 +403,17 @@ exports[`renders loader when checking remote tab 1`] = `
     <h2>
       New transaction
     </h2>
-  </div>
+  </div>,
   <div
     className="loader tab-loader"
   >
     <div />
-  </div>
-</div>
+  </div>,
+]
 `;
 
 exports[`renders prefilled form 1`] = `
-<div
-  className="scene editEntryScene"
->
+Array [
   <div
     className="header"
   >
@@ -452,8 +447,10 @@ exports[`renders prefilled form 1`] = `
         />
       </svg>
     </button>
-  </div>
-  <div>
+  </div>,
+  <div
+    className="content"
+  >
     <form
       id="edit-entry-form"
       onSubmit={[Function]}
@@ -697,6 +694,6 @@ exports[`renders prefilled form 1`] = `
         </span>
       </div>
     </form>
-  </div>
-</div>
+  </div>,
+]
 `;
diff --git a/src/components/__snapshots__/form.test.tsx.snap b/src/components/__snapshots__/form.test.tsx.snap
@@ -15,7 +15,6 @@ exports[`renders empty form 1`] = `
         className="form-row-input description"
       >
         <input
-          autoFocus={true}
           onChange={[Function]}
           placeholder="Description"
           type="text"
@@ -203,7 +202,7 @@ exports[`renders empty form 1`] = `
               className="participant"
             >
               <input
-                autoFocus={true}
+                autoFocus={false}
                 onChange={[Function]}
                 placeholder="Name …"
                 type="text"
@@ -240,7 +239,7 @@ exports[`renders empty form 1`] = `
               className="participant"
             >
               <input
-                autoFocus={true}
+                autoFocus={false}
                 onChange={[Function]}
                 placeholder="Name …"
                 type="text"
@@ -483,7 +482,7 @@ exports[`renders prefilled form 1`] = `
                 className="amountInput"
               >
                 <input
-                  autoFocus={true}
+                  autoFocus={false}
                   onChange={[Function]}
                   placeholder="0"
                   step="any"