Skip to content

Commit 53187b3

Browse files
committed
Merge branch 'develop' into production
2 parents f95759f + 6cee515 commit 53187b3

18 files changed

+12288
-17953
lines changed

package-lock.json

Lines changed: 0 additions & 17757 deletions
This file was deleted.

package.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,34 +12,34 @@
1212
"homepage": "https://grouptabs.net/",
1313
"dependencies": {
1414
"@seznam/compose-react-refs": "^1.0.6",
15-
"@types/jest": "^26.0.22",
16-
"@types/node": "^14.14.37",
15+
"@types/jest": "^26.0.24",
16+
"@types/node": "^14.17.32",
1717
"@types/pouchdb": "^6.4.0",
18-
"@types/react": "^17.0.3",
19-
"@types/react-dom": "^17.0.3",
20-
"@types/react-redux": "^7.1.16",
18+
"@types/react": "^17.0.34",
19+
"@types/react-dom": "^17.0.11",
20+
"@types/react-redux": "^7.1.20",
2121
"@types/react-test-renderer": "^17.0.1",
22-
"@types/redux-first-router": "^2.1.5",
23-
"@types/uuid": "^8.3.0",
24-
"debug": "^4.3.1",
22+
"@types/redux-first-router": "^2.1.7",
23+
"@types/uuid": "^8.3.1",
24+
"debug": "^4.3.2",
2525
"husky": "^4.3.8",
2626
"lint-staged": "^10.5.4",
2727
"lodash.orderby": "^4.6.0",
2828
"lodash.throttle": "^4.1.1",
29-
"pouchdb": "^7.2.2",
3029
"pouchdb-adapter-memory": "^7.2.2",
31-
"prettier": "^2.2.1",
30+
"pouchdb-browser": "^7.2.2",
31+
"prettier": "^2.4.1",
3232
"react": "^17.0.2",
3333
"react-dom": "^17.0.2",
34-
"react-redux": "^7.2.3",
34+
"react-redux": "^7.2.6",
3535
"react-scripts": "4.0.3",
3636
"react-test-renderer": "^17.0.2",
37-
"redux": "^4.0.5",
37+
"redux": "^4.1.2",
3838
"redux-first-router": "^2.1.5",
39-
"redux-thunk": "^2.3.0",
40-
"reselect": "^4.0.0",
39+
"redux-thunk": "^2.4.0",
40+
"reselect": "^4.1.2",
4141
"smooth-scroll": "^16.1.3",
42-
"typescript": "^4.2.3",
42+
"typescript": "^4.4.4",
4343
"uuid": "^8.3.2",
4444
"workbox-background-sync": "^5.1.4",
4545
"workbox-broadcast-update": "^5.1.4",

public/index.html

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
<meta charset="utf-8">
55
<link rel="icon" href="%PUBLIC_URL%/favicon.ico">
66
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no">
7-
<meta name="theme-color" content="#131313">
7+
<meta name="theme-color" content="#f5f5f5" media="(prefers-color-scheme: light)">
8+
<meta name="theme-color" content="#131313" media="(prefers-color-scheme: dark)">
89
<meta name="apple-mobile-web-app-capable" content="yes">
10+
<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
911
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
1012
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
1113
<title>Grouptabs</title>

public/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020
],
2121
"start_url": ".",
2222
"display": "standalone",
23-
"theme_color": "#131313",
23+
"theme_color": "#f5f5f5",
2424
"background_color": "#f5f5f5"
2525
}

release-notes.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@ description: >
33
Track expenses in a group of people!
44
55
releases:
6+
- version: 1.5.1
7+
date: 2022-04-04
8+
description: Small improvements and updates
9+
improved:
10+
- Optimize display of status bar on mobile devices (color fits app background)
11+
changed:
12+
- Switch from npm to yarn for better developer experience
13+
- Use specific browser distribution of PouchDB for faster developer dependencies installation
614
- version: 1.5.0
715
date: 2021-04-07
816
description: Animated screen transitions and smaller bugfixes and improvements

src/components/__snapshots__/main.test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ exports[`renders summary and transaction list 1`] = `
232232
9/20/2020
233233
</div>
234234
<div
235-
className="transaction"
235+
className="transaction list-item-with-arrow"
236236
onClick={[Function]}
237237
>
238238
<table>

src/components/__snapshots__/tabs.test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ exports[`renders tab view 1`] = `
103103
className="row tabs"
104104
>
105105
<button
106-
className="full-width"
106+
className="full-width list-item-with-arrow"
107107
onClick={[Function]}
108108
>
109109
TAB NAME

src/components/main.tsx

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ const useTransactionHeadingScroller = (
6262
newTransactionsHeadingIsOutOfViewport !==
6363
transactionsHeadingIsOutOfViewportRef.current
6464
) {
65-
transactionsHeadingIsOutOfViewportRef.current = newTransactionsHeadingIsOutOfViewport;
65+
transactionsHeadingIsOutOfViewportRef.current =
66+
newTransactionsHeadingIsOutOfViewport;
6667
setTransactionsHeadingIsOutOfViewport(
6768
newTransactionsHeadingIsOutOfViewport
6869
);
@@ -102,14 +103,10 @@ const Main: FunctionComponent<Props> = (props) => {
102103

103104
const [isScrolled, scrollContainerRef] = useScrollIndicator();
104105

105-
const {
106-
transactionsHeadingIsOutOfViewport,
107-
scrollToTransactionHeading,
108-
} = useTransactionHeadingScroller(
109-
contentContainerRef,
110-
transactionsHeadingRef,
111-
[props.accounts]
112-
);
106+
const { transactionsHeadingIsOutOfViewport, scrollToTransactionHeading } =
107+
useTransactionHeadingScroller(contentContainerRef, transactionsHeadingRef, [
108+
props.accounts,
109+
]);
113110

114111
const handleNewEntryClick = () => {
115112
if (!props.tabId) {

src/components/tablistbutton.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ interface Props {
88

99
const TabListButton: FunctionComponent<Props> = ({ data, onClick }) => {
1010
return (
11-
<button className="full-width" onClick={() => onClick(data.id)}>
11+
<button className="full-width list-item-with-arrow" onClick={() => onClick(data.id)}>
1212
{data.info?.name}
1313
</button>
1414
);

src/components/transactionlist.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ interface DateGroup {
1515

1616
const groupTransactions = (transactions: Transaction[]): DateGroup[] => {
1717
if (!transactions.length) {
18-
return (transactions as unknown) as DateGroup[];
18+
return transactions as unknown as DateGroup[];
1919
}
2020
// XXX Refactor structuring of date groups with a proper loop
2121
let date = formatHumanDate(transactions[0].date);

0 commit comments

Comments
 (0)