Skip to content

Commit f95759f

Browse files
xMartinxMartin
committed
Merge branch 'develop' into production
2 parents 3993c47 + 7bc1df1 commit f95759f

33 files changed

+3604
-3124
lines changed

‎package-lock.json

Lines changed: 2779 additions & 2586 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,34 +11,35 @@
1111
},
1212
"homepage": "https://grouptabs.net/",
1313
"dependencies": {
14-
"@types/jest": "^26.0.19",
15-
"@types/node": "^14.14.13",
14+
"@seznam/compose-react-refs": "^1.0.6",
15+
"@types/jest": "^26.0.22",
16+
"@types/node": "^14.14.37",
1617
"@types/pouchdb": "^6.4.0",
17-
"@types/react": "^17.0.0",
18-
"@types/react-dom": "^17.0.0",
19-
"@types/react-redux": "^7.1.12",
20-
"@types/react-test-renderer": "^17.0.0",
18+
"@types/react": "^17.0.3",
19+
"@types/react-dom": "^17.0.3",
20+
"@types/react-redux": "^7.1.16",
21+
"@types/react-test-renderer": "^17.0.1",
2122
"@types/redux-first-router": "^2.1.5",
2223
"@types/uuid": "^8.3.0",
2324
"debug": "^4.3.1",
24-
"husky": "^4.3.6",
25-
"lint-staged": "^10.5.3",
25+
"husky": "^4.3.8",
26+
"lint-staged": "^10.5.4",
2627
"lodash.orderby": "^4.6.0",
28+
"lodash.throttle": "^4.1.1",
2729
"pouchdb": "^7.2.2",
2830
"pouchdb-adapter-memory": "^7.2.2",
29-
"pouchdb-all-dbs": "github:xMartin/pouchdb-all-dbs#grouptabs",
3031
"prettier": "^2.2.1",
31-
"react": "^17.0.1",
32-
"react-dom": "^17.0.1",
33-
"react-redux": "^7.2.1",
34-
"react-scripts": "4.0.0",
35-
"react-test-renderer": "^17.0.1",
32+
"react": "^17.0.2",
33+
"react-dom": "^17.0.2",
34+
"react-redux": "^7.2.3",
35+
"react-scripts": "4.0.3",
36+
"react-test-renderer": "^17.0.2",
3637
"redux": "^4.0.5",
3738
"redux-first-router": "^2.1.5",
3839
"redux-thunk": "^2.3.0",
3940
"reselect": "^4.0.0",
4041
"smooth-scroll": "^16.1.3",
41-
"typescript": "~4.0.3",
42+
"typescript": "^4.2.3",
4243
"uuid": "^8.3.2",
4344
"workbox-background-sync": "^5.1.4",
4445
"workbox-broadcast-update": "^5.1.4",

‎release-notes.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@ description: >
33
Track expenses in a group of people!
44
55
releases:
6+
- version: 1.5.0
7+
date: 2021-04-07
8+
description: Animated screen transitions and smaller bugfixes and improvements
9+
added:
10+
- Animated screen transitions
11+
changed:
12+
- Removed migration from PouchDB's all-dbs data - it has been around for more than a year now
613
- version: 1.4.0
714
date: 2020-12-14
815
description: Clean URLs and smaller bugfixes and improvements

‎src/app.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import {
55
getTabs,
66
getTransactions,
77
getAccounts,
8+
getCurrentLocation,
89
} from "./redux/selectors";
910
import {
1011
navigateToTabs,
@@ -34,6 +35,7 @@ import { Transaction } from "./types";
3435
function mapStateToProps(state: AllState) {
3536
return {
3637
location: state.location,
38+
currentLocation: getCurrentLocation(state),
3739
initialLoadingDone: state.app.initialLoadingDone,
3840
tabInfo: getTabInfo(state),
3941
transaction: state.app.docsById[

‎src/components/__snapshots__/editentry.test.tsx.snap

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
// Jest Snapshot v1, https://goo.gl/fbAQLP
22

33
exports[`renders empty form 1`] = `
4-
<div
5-
className="scene editEntryScene"
6-
>
4+
Array [
75
<div
86
className="header"
97
>
@@ -37,8 +35,10 @@ exports[`renders empty form 1`] = `
3735
/>
3836
</svg>
3937
</button>
40-
</div>
41-
<div>
38+
</div>,
39+
<div
40+
className="content"
41+
>
4242
<form
4343
id="edit-entry-form"
4444
onSubmit={[Function]}
@@ -53,7 +53,6 @@ exports[`renders empty form 1`] = `
5353
className="form-row-input description"
5454
>
5555
<input
56-
autoFocus={true}
5756
onChange={[Function]}
5857
placeholder="Description"
5958
type="text"
@@ -241,7 +240,7 @@ exports[`renders empty form 1`] = `
241240
className="participant"
242241
>
243242
<input
244-
autoFocus={true}
243+
autoFocus={false}
245244
onChange={[Function]}
246245
placeholder="Name …"
247246
type="text"
@@ -278,7 +277,7 @@ exports[`renders empty form 1`] = `
278277
className="participant"
279278
>
280279
<input
281-
autoFocus={true}
280+
autoFocus={false}
282281
onChange={[Function]}
283282
placeholder="Name …"
284283
type="text"
@@ -330,14 +329,12 @@ exports[`renders empty form 1`] = `
330329
className="row"
331330
/>
332331
</form>
333-
</div>
334-
</div>
332+
</div>,
333+
]
335334
`;
336335

337336
exports[`renders loader in edit mode with no data 1`] = `
338-
<div
339-
className="scene editEntryScene"
340-
>
337+
Array [
341338
<div
342339
className="header"
343340
>
@@ -357,8 +354,10 @@ exports[`renders loader in edit mode with no data 1`] = `
357354
<h2>
358355
Edit transaction
359356
</h2>
360-
</div>
361-
<div>
357+
</div>,
358+
<div
359+
className="content"
360+
>
362361
<div
363362
className="load-error"
364363
>
@@ -379,14 +378,12 @@ exports[`renders loader in edit mode with no data 1`] = `
379378
OK
380379
</button>
381380
</div>
382-
</div>
383-
</div>
381+
</div>,
382+
]
384383
`;
385384

386385
exports[`renders loader when checking remote tab 1`] = `
387-
<div
388-
className="scene editEntryScene"
389-
>
386+
Array [
390387
<div
391388
className="header"
392389
>
@@ -406,19 +403,17 @@ exports[`renders loader when checking remote tab 1`] = `
406403
<h2>
407404
New transaction
408405
</h2>
409-
</div>
406+
</div>,
410407
<div
411408
className="loader tab-loader"
412409
>
413410
<div />
414-
</div>
415-
</div>
411+
</div>,
412+
]
416413
`;
417414

418415
exports[`renders prefilled form 1`] = `
419-
<div
420-
className="scene editEntryScene"
421-
>
416+
Array [
422417
<div
423418
className="header"
424419
>
@@ -452,8 +447,10 @@ exports[`renders prefilled form 1`] = `
452447
/>
453448
</svg>
454449
</button>
455-
</div>
456-
<div>
450+
</div>,
451+
<div
452+
className="content"
453+
>
457454
<form
458455
id="edit-entry-form"
459456
onSubmit={[Function]}
@@ -697,6 +694,6 @@ exports[`renders prefilled form 1`] = `
697694
</span>
698695
</div>
699696
</form>
700-
</div>
701-
</div>
697+
</div>,
698+
]
702699
`;

‎src/components/__snapshots__/form.test.tsx.snap

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ exports[`renders empty form 1`] = `
1515
className="form-row-input description"
1616
>
1717
<input
18-
autoFocus={true}
1918
onChange={[Function]}
2019
placeholder="Description"
2120
type="text"
@@ -203,7 +202,7 @@ exports[`renders empty form 1`] = `
203202
className="participant"
204203
>
205204
<input
206-
autoFocus={true}
205+
autoFocus={false}
207206
onChange={[Function]}
208207
placeholder="Name …"
209208
type="text"
@@ -240,7 +239,7 @@ exports[`renders empty form 1`] = `
240239
className="participant"
241240
>
242241
<input
243-
autoFocus={true}
242+
autoFocus={false}
244243
onChange={[Function]}
245244
placeholder="Name …"
246245
type="text"
@@ -483,7 +482,7 @@ exports[`renders prefilled form 1`] = `
483482
className="amountInput"
484483
>
485484
<input
486-
autoFocus={true}
485+
autoFocus={false}
487486
onChange={[Function]}
488487
placeholder="0"
489488
step="any"

0 commit comments

Comments
 (0)