[PR #762] [MERGED] Move the welcome modal to an interstitial, add import button #3309

Closed
opened 2026-02-28 20:39:42 -06:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/actualbudget/actual/pull/762
Author: @j-f1
Created: 3/16/2023
Status: Merged
Merged: 3/18/2023
Merged by: @j-f1

Base: masterHead: jed/welcome


📝 Commits (10+)

  • f6d0eab Move the welcome modal to an interstitial that guides people toward import
  • b0a314f Release notes
  • 1307ab2 Copy edit, make the links more obvious
  • 5fe19e7 Explain what the buttons do
  • 351ef8b Fix import modal not showing up
  • f4d4e7d Make the BudgetList not be a modal anymore, improve responsiveness
  • ba3ff2c convert BudgetTable to a function component
  • f7eb083 Convert BudgetList to a function component
  • 45a12eb Remove 'select-budget' modal
  • dc8ea4b Actions go into props directly

📊 Changes

15 files changed (+255 additions, -417 deletions)

View changed files

📝 packages/desktop-client/e2e/page-models/configuration-page.js (+0 -1)
📝 packages/desktop-client/src/components/Modals.js (+0 -5)
📝 packages/desktop-client/src/components/manager/ManagementApp.js (+12 -47)
📝 packages/desktop-client/src/components/manager/Modals.js (+1 -13)
packages/desktop-client/src/components/manager/WelcomeScreen.js (+76 -0)
packages/desktop-client/src/components/modals/WelcomeScreen.js (+0 -72)
📝 packages/loot-core/src/client/actions/budgets.js (+0 -4)
📝 packages/loot-core/src/client/actions/index.js (+0 -1)
packages/loot-core/src/client/actions/tutorial.js (+0 -22)
📝 packages/loot-design/src/components/manager/BudgetList.js (+131 -122)
📝 packages/loot-design/src/components/manager/Import.js (+24 -62)
📝 packages/loot-design/src/components/manager/ImportActual.js (+2 -20)
📝 packages/loot-design/src/components/manager/ImportYNAB4.js (+2 -24)
📝 packages/loot-design/src/components/manager/ImportYNAB5.js (+1 -24)
upcoming-release-notes/762.md (+6 -0)

📄 Description

I noticed that the first run flow is suboptimal for people who want to import an existing file from Actual/YNAB. I’ve moved the welcome modal into the management app and set it up to appear when there are no budgets available (which also has the benefit of allowing people to see the modal again!)

I think there’s some weirdness around getting the modal to reappear when deleting a budget file which I want to work out before merging this.

This PR also reorganizes the management app a bit to reduce usage of modals (currently, hitting escape while the budget list is open leaves you with a blank page).

Screenshot_2023-03-18 08 53 54
  • Ensure modal consistently appears when needed (no longer a modal!)
  • Fix e2e tests

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/actualbudget/actual/pull/762 **Author:** [@j-f1](https://github.com/j-f1) **Created:** 3/16/2023 **Status:** ✅ Merged **Merged:** 3/18/2023 **Merged by:** [@j-f1](https://github.com/j-f1) **Base:** `master` ← **Head:** `jed/welcome` --- ### 📝 Commits (10+) - [`f6d0eab`](https://github.com/actualbudget/actual/commit/f6d0eab126310eb1c2c7be0d77374135f7c7f2ad) Move the welcome modal to an interstitial that guides people toward import - [`b0a314f`](https://github.com/actualbudget/actual/commit/b0a314f194e13377a01e2c98c2b9167ec63ce4ae) Release notes - [`1307ab2`](https://github.com/actualbudget/actual/commit/1307ab2e8e5a12a74575bd6eb72b65ee90887979) Copy edit, make the links more obvious - [`5fe19e7`](https://github.com/actualbudget/actual/commit/5fe19e7a4669259fbcc06f1d0a276c7fbdb93da7) Explain what the buttons do - [`351ef8b`](https://github.com/actualbudget/actual/commit/351ef8b657429d49f7772d647ea03f888015e8a0) Fix import modal not showing up - [`f4d4e7d`](https://github.com/actualbudget/actual/commit/f4d4e7d5c1a50d36f1371aac312ee9a421817318) Make the BudgetList not be a modal anymore, improve responsiveness - [`ba3ff2c`](https://github.com/actualbudget/actual/commit/ba3ff2cf88339074ce07542c7e0c9b76f9b208c2) convert BudgetTable to a function component - [`f7eb083`](https://github.com/actualbudget/actual/commit/f7eb08301f8ce3d9212a81e517a7a86d186adc2b) Convert BudgetList to a function component - [`45a12eb`](https://github.com/actualbudget/actual/commit/45a12ebf47516e790999492b0441b08d9234c6ea) Remove 'select-budget' modal - [`dc8ea4b`](https://github.com/actualbudget/actual/commit/dc8ea4b6465867a2318e00e9d7a0ebbf86ac47b9) Actions go into props directly ### 📊 Changes **15 files changed** (+255 additions, -417 deletions) <details> <summary>View changed files</summary> 📝 `packages/desktop-client/e2e/page-models/configuration-page.js` (+0 -1) 📝 `packages/desktop-client/src/components/Modals.js` (+0 -5) 📝 `packages/desktop-client/src/components/manager/ManagementApp.js` (+12 -47) 📝 `packages/desktop-client/src/components/manager/Modals.js` (+1 -13) ➕ `packages/desktop-client/src/components/manager/WelcomeScreen.js` (+76 -0) ➖ `packages/desktop-client/src/components/modals/WelcomeScreen.js` (+0 -72) 📝 `packages/loot-core/src/client/actions/budgets.js` (+0 -4) 📝 `packages/loot-core/src/client/actions/index.js` (+0 -1) ➖ `packages/loot-core/src/client/actions/tutorial.js` (+0 -22) 📝 `packages/loot-design/src/components/manager/BudgetList.js` (+131 -122) 📝 `packages/loot-design/src/components/manager/Import.js` (+24 -62) 📝 `packages/loot-design/src/components/manager/ImportActual.js` (+2 -20) 📝 `packages/loot-design/src/components/manager/ImportYNAB4.js` (+2 -24) 📝 `packages/loot-design/src/components/manager/ImportYNAB5.js` (+1 -24) ➕ `upcoming-release-notes/762.md` (+6 -0) </details> ### 📄 Description I noticed that the first run flow is suboptimal for people who want to import an existing file from Actual/YNAB. I’ve moved the welcome modal into the management app and set it up to appear when there are no budgets available (which also has the benefit of allowing people to see the modal again!) I think there’s some weirdness around getting the modal to reappear when deleting a budget file which I want to work out before merging this. This PR also reorganizes the management app a bit to reduce usage of modals (currently, hitting escape while the budget list is open leaves you with a blank page). <img width="539" alt="Screenshot_2023-03-18 08 53 54" src="https://user-images.githubusercontent.com/25517624/226107462-b2b88791-1015-4397-b290-c64e7fcc0f41.png"> - [x] Ensure modal consistently appears when needed (no longer a modal!) - [x] Fix e2e tests --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-02-28 20:39:42 -06:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/actual#3309