Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dark Theme Reports/Settings #1512

Merged
merged 19 commits into from
Sep 13, 2023
Merged

Conversation

carkom
Copy link
Contributor

@carkom carkom commented Aug 11, 2023

Dark theme phase five to include Reports and Settings pages and elements

@trafico-bot trafico-bot bot added the 🚧 WIP label Aug 11, 2023
@netlify
Copy link

netlify bot commented Aug 11, 2023

Deploy Preview for actualbudget ready!

Name Link
🔨 Latest commit ab388ad
🔍 Latest deploy log https://app.netlify.com/sites/actualbudget/deploys/6501f19494d3ae0007a8d86c
😎 Deploy Preview https://deploy-preview-1512.demo.actualbudget.org/
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@github-actions
Copy link
Contributor

github-actions bot commented Aug 11, 2023

Bundle Stats — desktop-client

Hey there, this message comes from a GitHub action that helps you and reviewers to understand how these changes affect the size of this project's bundle.

As this PR is updated, I'll keep you updated on how the bundle size is impacted.

Total

Files count Total bundle size % Changed
16 2.47 MB → 2.47 MB (+2.22 kB) +0.09%
Changeset
File Δ Size
src/style/themes/development.ts 📈 +592 B (+6.28%) 9.21 kB → 9.79 kB
src/style/themes/light.ts 📈 +465 B (+4.57%) 9.94 kB → 10.4 kB
src/style/themes/dark.ts 📈 +418 B (+4.17%) 9.8 kB → 10.21 kB
src/components/common/Label.tsx 📈 +14 B (+3.20%) 438 B → 452 B
src/components/common/Card.tsx 📈 +19 B (+2.37%) 803 B → 822 B
src/components/reports/Change.js 📈 +12 B (+2.20%) 546 B → 558 B
src/components/reports/Tooltip.js 📈 +44 B (+1.87%) 2.29 kB → 2.34 kB
src/components/settings/UI.tsx 📈 +33 B (+1.37%) 2.36 kB → 2.39 kB
src/components/reports/chart-theme.js 📈 +37 B (+1.34%) 2.7 kB → 2.74 kB
src/components/budget/report/BudgetSummary.tsx 📈 +202 B (+1.06%) 18.54 kB → 18.73 kB
src/components/reports/DateRange.js 📈 +11 B (+1.06%) 1.02 kB → 1.03 kB
src/components/reports/graphs/common.tsx 📈 +29 B (+1.02%) 2.77 kB → 2.8 kB
src/components/reports/graphs/NetWorthGraph.tsx 📈 +35 B (+0.84%) 4.06 kB → 4.1 kB
src/components/settings/Experimental.tsx 📈 +30 B (+0.72%) 4.1 kB → 4.13 kB
src/components/settings/index.tsx 📈 +55 B (+0.63%) 8.53 kB → 8.58 kB
src/components/budget/report/components.tsx 📈 +82 B (+0.51%) 15.76 kB → 15.84 kB
src/components/reports/graphs/CategorySpendingGraph.tsx 📈 +14 B (+0.50%) 2.75 kB → 2.77 kB
src/components/reports/NetWorth.js 📈 +21 B (+0.34%) 6.04 kB → 6.07 kB
src/components/settings/Global.tsx 📈 +9 B (+0.32%) 2.71 kB → 2.72 kB
src/components/settings/FixSplits.tsx 📈 +10 B (+0.25%) 3.87 kB → 3.88 kB
src/components/reports/CashFlow.js 📈 +18 B (+0.21%) 8.39 kB → 8.41 kB
src/components/settings/Encryption.tsx 📈 +6 B (+0.13%) 4.36 kB → 4.37 kB
src/components/reports/Overview.js 📉 -13 B (-0.07%) 17.87 kB → 17.86 kB
src/components/reports/Header.js 📉 -274 B (-4.16%) 6.43 kB → 6.17 kB
src/components/reports/graphs/CashFlowGraph.tsx 📉 -193 B (-6.87%) 2.74 kB → 2.56 kB
View detailed bundle breakdown

Added

No assets were added

Removed

No assets were removed

Bigger

Asset File Size % Changed
static/js/main.js 1.11 MB → 1.11 MB (+1.6 kB) +0.14%
static/js/wide-components.chunk.js 125.59 kB → 126.09 kB (+515 B) +0.40%
static/js/reports.chunk.js 28.65 kB → 28.73 kB (+86 B) +0.29%
static/js/narrow-components.chunk.js 34.13 kB → 34.17 kB (+36 B) +0.10%

Smaller

No assets were smaller

Unchanged

Asset File Size % Changed
static/js/678.chunk.js 420.74 kB 0%
static/media/Inter-italic.var.woff2 239.29 kB 0%
static/media/Inter-roman.var.woff2 221.86 kB 0%
static/js/713.chunk.js 156.56 kB 0%
static/js/231.chunk.js 117.37 kB 0%
static/js/473.chunk.js 13 kB 0%
static/js/389.chunk.js 12.76 kB 0%
static/js/resize-observer-polyfill.chunk.js 8.88 kB 0%
static/css/main.css 7.41 kB 0%
asset-manifest.json 2.07 kB 0%
index.html 1.66 kB 0%
static/media/browser-server.js 903 B 0%

@github-actions
Copy link
Contributor

github-actions bot commented Aug 11, 2023

Bundle Stats — loot-core

Hey there, this message comes from a GitHub action that helps you and reviewers to understand how these changes affect the size of this project's bundle.

As this PR is updated, I'll keep you updated on how the bundle size is impacted.

Total

Files count Total bundle size % Changed
2 2.22 MB 0%

Changeset

No files were changed

View detailed bundle breakdown

Added

No assets were added

Removed

No assets were removed

Bigger

No assets were bigger

Smaller

No assets were smaller

Unchanged

Asset File Size % Changed
kcab.worker.js 1.23 MB 0%
xfo.xfo.kcab.worker.js 1014.46 kB 0%

@carkom
Copy link
Contributor Author

carkom commented Sep 11, 2023

Still WIP

@carkom carkom changed the title [WIP] Dark Theme Reports/Settings Dark Theme Reports/Settings Sep 12, 2023
@carkom
Copy link
Contributor Author

carkom commented Sep 12, 2023

@MatissJanis, VRT is failing due to what looks like a border being added to the cashflowcard on the reports overview page. I haven't added anything like this to the code so I'm not sure what's causing it. I've searched my changes and haven't made any code changes to bar borders. Can you help?

This is all that's preventing this PR from being ready for review.

@MatissJanis
Copy link
Member

MatissJanis commented Sep 12, 2023

Search for styles.cardShadow. That's the problem I think.

@carkom
Copy link
Contributor Author

carkom commented Sep 12, 2023

Search for styles.cardShadow. That's the problem I think.

Removed them all but still getting errors.

@carkom
Copy link
Contributor Author

carkom commented Sep 13, 2023

@MatissJanis this one is ready for review.

Copy link
Member

@MatissJanis MatissJanis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall LGTM. Noticed a few color differences that we should fix though. Some of them are more noticeable than others.

@trafico-bot trafico-bot bot added ⚠️ Changes requested Pull Request needs changes before it can be reviewed again and removed 🔍 Ready for Review labels Sep 13, 2023
@trafico-bot trafico-bot bot added 🔍 Ready for Review and removed ⚠️ Changes requested Pull Request needs changes before it can be reviewed again labels Sep 13, 2023
@MatissJanis MatissJanis merged commit 0cc3479 into actualbudget:master Sep 13, 2023
17 checks passed
@trafico-bot trafico-bot bot added ✨ Merged Pull Request has been merged successfully and removed ✅ Approved labels Sep 13, 2023
shall0pass pushed a commit to shall0pass/actual that referenced this pull request Sep 16, 2023
* 🔥 removing privacyMode feature flag (actualbudget#1688)

* 🎨  fix multiline label in schedules modal (actualbudget#1687)

* Update Visual Regression README File (actualbudget#1689)

* Fix typo in GoCardlessLink.js (actualbudget#1684)

happend -> happened

* queried cleared balance for tooltip (actualbudget#1678)

* Dark Theme Reports/Settings (actualbudget#1512)

* 🐛 Mobile account transaction list: Fix sticky date section headers (actualbudget#1698)

* 👷  do not cancel github ci jobs on master branch (actualbudget#1692)

* Sidebar Account Fix (actualbudget#1703)

* Dark Theme Final (actualbudget#1513)

* Category autocomplete should only search selectable categories  (actualbudget#1681)

* set colors based on a goal value

* extra comment

---------

Co-authored-by: Matiss Janis Aboltins <[email protected]>
Co-authored-by: Crazypkr1099 <[email protected]>
Co-authored-by: Ikko Eltociear Ashimine <[email protected]>
Co-authored-by: Shaan Khosla <[email protected]>
Co-authored-by: Neil <[email protected]>
Co-authored-by: Trevor Farlow <[email protected]>
shall0pass added a commit that referenced this pull request Sep 24, 2023
* first pass at progress bar

* db migration / enter goal in db

* add getGoal function

* stabilize

* whoops

* TS

* reset goal in db if no template found

* reconfirm

* release note

* typo

* rename migration

* to ms

* move priority logic, consistent variable names,

* fixup

* clear goal if template removed

* Visual goals (#40)

* 🔥 removing privacyMode feature flag (#1688)

* 🎨  fix multiline label in schedules modal (#1687)

* Update Visual Regression README File (#1689)

* Fix typo in GoCardlessLink.js (#1684)

happend -> happened

* queried cleared balance for tooltip (#1678)

* Dark Theme Reports/Settings (#1512)

* 🐛 Mobile account transaction list: Fix sticky date section headers (#1698)

* 👷  do not cancel github ci jobs on master branch (#1692)

* Sidebar Account Fix (#1703)

* Dark Theme Final (#1513)

* Category autocomplete should only search selectable categories  (#1681)

* set colors based on a goal value

* extra comment

---------

Co-authored-by: Matiss Janis Aboltins <[email protected]>
Co-authored-by: Crazypkr1099 <[email protected]>
Co-authored-by: Ikko Eltociear Ashimine <[email protected]>
Co-authored-by: Shaan Khosla <[email protected]>
Co-authored-by: Neil <[email protected]>
Co-authored-by: Trevor Farlow <[email protected]>

* update release note

* lint

* use null as cleared state

* show goal status via colors (#41)

* cleanup

* I think its working

* lint

* fix the error by adding colors to the report side (#42)

* [refactor] Migrate Schedules Table to typescript (#1691)

* 🔧  removing unnecessary manual module resolution (#1707)

* 🐛 (mobile) scrolling in lists with pull-to-refresh (#1706)

* 💄 (mobile) updating apple home-screen icon (#1705)

* Enhance Y-Axis Scaling on Net Worth Graph (#1709)

* fix report budget, by adding in the goal coloring

---------

Co-authored-by: Mohamed Muhsin <[email protected]>
Co-authored-by: Matiss Janis Aboltins <[email protected]>
Co-authored-by: Crazypkr1099 <[email protected]>

* report budget database updates

* Fix schedule searchbar (#1729)

---------

Co-authored-by: youngcw <[email protected]>
Co-authored-by: Matiss Janis Aboltins <[email protected]>
Co-authored-by: Crazypkr1099 <[email protected]>
Co-authored-by: Ikko Eltociear Ashimine <[email protected]>
Co-authored-by: Shaan Khosla <[email protected]>
Co-authored-by: Neil <[email protected]>
Co-authored-by: Trevor Farlow <[email protected]>
Co-authored-by: Mohamed Muhsin <[email protected]>
@carkom carkom deleted the darkThemeReports branch October 3, 2023 17:58
youngcw added a commit that referenced this pull request Nov 8, 2023
* first pass at progress bar

* db migration / enter goal in db

* add getGoal function

* stabilize

* whoops

* TS

* reset goal in db if no template found

* reconfirm

* release note

* typo

* rename migration

* to ms

* move priority logic, consistent variable names,

* fixup

* clear goal if template removed

* Visual goals (#40)

* 🔥 removing privacyMode feature flag (#1688)

* 🎨  fix multiline label in schedules modal (#1687)

* Update Visual Regression README File (#1689)

* Fix typo in GoCardlessLink.js (#1684)

happend -> happened

* queried cleared balance for tooltip (#1678)

* Dark Theme Reports/Settings (#1512)

* 🐛 Mobile account transaction list: Fix sticky date section headers (#1698)

* 👷  do not cancel github ci jobs on master branch (#1692)

* Sidebar Account Fix (#1703)

* Dark Theme Final (#1513)

* Category autocomplete should only search selectable categories  (#1681)

* set colors based on a goal value

* extra comment

---------

Co-authored-by: Matiss Janis Aboltins <[email protected]>
Co-authored-by: Crazypkr1099 <[email protected]>
Co-authored-by: Ikko Eltociear Ashimine <[email protected]>
Co-authored-by: Shaan Khosla <[email protected]>
Co-authored-by: Neil <[email protected]>
Co-authored-by: Trevor Farlow <[email protected]>

* update release note

* lint

* use null as cleared state

* show goal status via colors (#41)

* cleanup

* I think its working

* lint

* fix report budget, by adding in the goal coloring

* fix the error by adding colors to the report side (#42)

* [refactor] Migrate Schedules Table to typescript (#1691)

* 🔧  removing unnecessary manual module resolution (#1707)

* 🐛 (mobile) scrolling in lists with pull-to-refresh (#1706)

* 💄 (mobile) updating apple home-screen icon (#1705)

* Enhance Y-Axis Scaling on Net Worth Graph (#1709)

* fix report budget, by adding in the goal coloring

---------

Co-authored-by: Mohamed Muhsin <[email protected]>
Co-authored-by: Matiss Janis Aboltins <[email protected]>
Co-authored-by: Crazypkr1099 <[email protected]>

* report budget database updates

* Goal progress bar (#1734)

* first pass at progress bar

* db migration / enter goal in db

* add getGoal function

* stabilize

* whoops

* TS

* reset goal in db if no template found

* reconfirm

* release note

* typo

* rename migration

* to ms

* move priority logic, consistent variable names,

* fixup

* clear goal if template removed

* Visual goals (#40)

* 🔥 removing privacyMode feature flag (#1688)

* 🎨  fix multiline label in schedules modal (#1687)

* Update Visual Regression README File (#1689)

* Fix typo in GoCardlessLink.js (#1684)

happend -> happened

* queried cleared balance for tooltip (#1678)

* Dark Theme Reports/Settings (#1512)

* 🐛 Mobile account transaction list: Fix sticky date section headers (#1698)

* 👷  do not cancel github ci jobs on master branch (#1692)

* Sidebar Account Fix (#1703)

* Dark Theme Final (#1513)

* Category autocomplete should only search selectable categories  (#1681)

* set colors based on a goal value

* extra comment

---------

Co-authored-by: Matiss Janis Aboltins <[email protected]>
Co-authored-by: Crazypkr1099 <[email protected]>
Co-authored-by: Ikko Eltociear Ashimine <[email protected]>
Co-authored-by: Shaan Khosla <[email protected]>
Co-authored-by: Neil <[email protected]>
Co-authored-by: Trevor Farlow <[email protected]>

* update release note

* lint

* use null as cleared state

* show goal status via colors (#41)

* cleanup

* I think its working

* lint

* fix the error by adding colors to the report side (#42)

* [refactor] Migrate Schedules Table to typescript (#1691)

* 🔧  removing unnecessary manual module resolution (#1707)

* 🐛 (mobile) scrolling in lists with pull-to-refresh (#1706)

* 💄 (mobile) updating apple home-screen icon (#1705)

* Enhance Y-Axis Scaling on Net Worth Graph (#1709)

* fix report budget, by adding in the goal coloring

---------

Co-authored-by: Mohamed Muhsin <[email protected]>
Co-authored-by: Matiss Janis Aboltins <[email protected]>
Co-authored-by: Crazypkr1099 <[email protected]>

* report budget database updates

* Fix schedule searchbar (#1729)

---------

Co-authored-by: youngcw <[email protected]>
Co-authored-by: Matiss Janis Aboltins <[email protected]>
Co-authored-by: Crazypkr1099 <[email protected]>
Co-authored-by: Ikko Eltociear Ashimine <[email protected]>
Co-authored-by: Shaan Khosla <[email protected]>
Co-authored-by: Neil <[email protected]>
Co-authored-by: Trevor Farlow <[email protected]>
Co-authored-by: Mohamed Muhsin <[email protected]>

* working dynamic colors.  Need to figure out what changes are actually needed

* cleanup

* more cleanup

* lint

* reset the goal when applying a single template

* make getCategory function

* remove some unneeded changes

* actually remove the changes, not just comment

* cleanup some unneeded code that was causing some bugs. Works for me, but should be vetted more

* lint

* add json definitions to database

* use template feature flag to enable colors

* some fixes

* don't set goals for remainders, remove unneeded change

* lint

* release note

* lint again

* fix mobile crash

* undo changes in CellValue.tsx

* lint

* use getStyle

* move status calc to helper

* lint

* recommendations

* suggestion

Co-authored-by: Joel Jeremy Marquez <[email protected]>

---------

Co-authored-by: shall0pass <[email protected]>
Co-authored-by: Matiss Janis Aboltins <[email protected]>
Co-authored-by: Crazypkr1099 <[email protected]>
Co-authored-by: Ikko Eltociear Ashimine <[email protected]>
Co-authored-by: Shaan Khosla <[email protected]>
Co-authored-by: Neil <[email protected]>
Co-authored-by: Trevor Farlow <[email protected]>
Co-authored-by: Mohamed Muhsin <[email protected]>
Co-authored-by: Joel Jeremy Marquez <[email protected]>
FlorianLang06 pushed a commit to FlorianLang06/actual that referenced this pull request Mar 7, 2024
FlorianLang06 pushed a commit to FlorianLang06/actual that referenced this pull request Mar 7, 2024
…albudget#1780)

* first pass at progress bar

* db migration / enter goal in db

* add getGoal function

* stabilize

* whoops

* TS

* reset goal in db if no template found

* reconfirm

* release note

* typo

* rename migration

* to ms

* move priority logic, consistent variable names,

* fixup

* clear goal if template removed

* Visual goals (#40)

* 🔥 removing privacyMode feature flag (actualbudget#1688)

* 🎨  fix multiline label in schedules modal (actualbudget#1687)

* Update Visual Regression README File (actualbudget#1689)

* Fix typo in GoCardlessLink.js (actualbudget#1684)

happend -> happened

* queried cleared balance for tooltip (actualbudget#1678)

* Dark Theme Reports/Settings (actualbudget#1512)

* 🐛 Mobile account transaction list: Fix sticky date section headers (actualbudget#1698)

* 👷  do not cancel github ci jobs on master branch (actualbudget#1692)

* Sidebar Account Fix (actualbudget#1703)

* Dark Theme Final (actualbudget#1513)

* Category autocomplete should only search selectable categories  (actualbudget#1681)

* set colors based on a goal value

* extra comment

---------

Co-authored-by: Matiss Janis Aboltins <[email protected]>
Co-authored-by: Crazypkr1099 <[email protected]>
Co-authored-by: Ikko Eltociear Ashimine <[email protected]>
Co-authored-by: Shaan Khosla <[email protected]>
Co-authored-by: Neil <[email protected]>
Co-authored-by: Trevor Farlow <[email protected]>

* update release note

* lint

* use null as cleared state

* show goal status via colors (actualbudget#41)

* cleanup

* I think its working

* lint

* fix report budget, by adding in the goal coloring

* fix the error by adding colors to the report side (actualbudget#42)

* [refactor] Migrate Schedules Table to typescript (actualbudget#1691)

* 🔧  removing unnecessary manual module resolution (actualbudget#1707)

* 🐛 (mobile) scrolling in lists with pull-to-refresh (actualbudget#1706)

* 💄 (mobile) updating apple home-screen icon (actualbudget#1705)

* Enhance Y-Axis Scaling on Net Worth Graph (actualbudget#1709)

* fix report budget, by adding in the goal coloring

---------

Co-authored-by: Mohamed Muhsin <[email protected]>
Co-authored-by: Matiss Janis Aboltins <[email protected]>
Co-authored-by: Crazypkr1099 <[email protected]>

* report budget database updates

* Goal progress bar (actualbudget#1734)

* first pass at progress bar

* db migration / enter goal in db

* add getGoal function

* stabilize

* whoops

* TS

* reset goal in db if no template found

* reconfirm

* release note

* typo

* rename migration

* to ms

* move priority logic, consistent variable names,

* fixup

* clear goal if template removed

* Visual goals (#40)

* 🔥 removing privacyMode feature flag (actualbudget#1688)

* 🎨  fix multiline label in schedules modal (actualbudget#1687)

* Update Visual Regression README File (actualbudget#1689)

* Fix typo in GoCardlessLink.js (actualbudget#1684)

happend -> happened

* queried cleared balance for tooltip (actualbudget#1678)

* Dark Theme Reports/Settings (actualbudget#1512)

* 🐛 Mobile account transaction list: Fix sticky date section headers (actualbudget#1698)

* 👷  do not cancel github ci jobs on master branch (actualbudget#1692)

* Sidebar Account Fix (actualbudget#1703)

* Dark Theme Final (actualbudget#1513)

* Category autocomplete should only search selectable categories  (actualbudget#1681)

* set colors based on a goal value

* extra comment

---------

Co-authored-by: Matiss Janis Aboltins <[email protected]>
Co-authored-by: Crazypkr1099 <[email protected]>
Co-authored-by: Ikko Eltociear Ashimine <[email protected]>
Co-authored-by: Shaan Khosla <[email protected]>
Co-authored-by: Neil <[email protected]>
Co-authored-by: Trevor Farlow <[email protected]>

* update release note

* lint

* use null as cleared state

* show goal status via colors (actualbudget#41)

* cleanup

* I think its working

* lint

* fix the error by adding colors to the report side (actualbudget#42)

* [refactor] Migrate Schedules Table to typescript (actualbudget#1691)

* 🔧  removing unnecessary manual module resolution (actualbudget#1707)

* 🐛 (mobile) scrolling in lists with pull-to-refresh (actualbudget#1706)

* 💄 (mobile) updating apple home-screen icon (actualbudget#1705)

* Enhance Y-Axis Scaling on Net Worth Graph (actualbudget#1709)

* fix report budget, by adding in the goal coloring

---------

Co-authored-by: Mohamed Muhsin <[email protected]>
Co-authored-by: Matiss Janis Aboltins <[email protected]>
Co-authored-by: Crazypkr1099 <[email protected]>

* report budget database updates

* Fix schedule searchbar (actualbudget#1729)

---------

Co-authored-by: youngcw <[email protected]>
Co-authored-by: Matiss Janis Aboltins <[email protected]>
Co-authored-by: Crazypkr1099 <[email protected]>
Co-authored-by: Ikko Eltociear Ashimine <[email protected]>
Co-authored-by: Shaan Khosla <[email protected]>
Co-authored-by: Neil <[email protected]>
Co-authored-by: Trevor Farlow <[email protected]>
Co-authored-by: Mohamed Muhsin <[email protected]>

* working dynamic colors.  Need to figure out what changes are actually needed

* cleanup

* more cleanup

* lint

* reset the goal when applying a single template

* make getCategory function

* remove some unneeded changes

* actually remove the changes, not just comment

* cleanup some unneeded code that was causing some bugs. Works for me, but should be vetted more

* lint

* add json definitions to database

* use template feature flag to enable colors

* some fixes

* don't set goals for remainders, remove unneeded change

* lint

* release note

* lint again

* fix mobile crash

* undo changes in CellValue.tsx

* lint

* use getStyle

* move status calc to helper

* lint

* recommendations

* suggestion

Co-authored-by: Joel Jeremy Marquez <[email protected]>

---------

Co-authored-by: shall0pass <[email protected]>
Co-authored-by: Matiss Janis Aboltins <[email protected]>
Co-authored-by: Crazypkr1099 <[email protected]>
Co-authored-by: Ikko Eltociear Ashimine <[email protected]>
Co-authored-by: Shaan Khosla <[email protected]>
Co-authored-by: Neil <[email protected]>
Co-authored-by: Trevor Farlow <[email protected]>
Co-authored-by: Mohamed Muhsin <[email protected]>
Co-authored-by: Joel Jeremy Marquez <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
✨ Merged Pull Request has been merged successfully
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants