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.

Sign up for GitHub

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

Jump to bottom

Refactor workspace settings #5642

Merged
merged 135 commits into from
Oct 8, 2021
Merged

Refactor workspace settings #5642

Show file tree
Hide file tree
Changes from 80 commits
Commits
Show all changes
135 commits
Select commit Hold shift + click to select a range
36115d2
Add new routes and link configs
tgolen Oct 4, 2021
eb2a247
Rename some workspace pages
tgolen Oct 4, 2021
98e02af
Rename editor to settings
tgolen Oct 4, 2021
80f2d6d
Add new skeleton pages
tgolen Oct 4, 2021
719c713
Merge branch 'main' into tgolen-workspace-settings
tgolen Oct 5, 2021
4142566
Get site running with navigation pieces in place
tgolen Oct 5, 2021
cbe7b39
Update link text and icons
tgolen Oct 6, 2021
ae5a51e
Add copy and a new component for ordered list
tgolen Oct 6, 2021
0258acd
Add MenuItemList component
tgolen Oct 6, 2021
6bd1721
Add navigation to cards page
tgolen Oct 6, 2021
cabe79b
Move the view into a subView
tgolen Oct 6, 2021
20407a1
DRY up the code some and add a new view
tgolen Oct 6, 2021
a17caa7
Add third view and unDRY things
tgolen Oct 6, 2021
a15c8c8
Add logic for detecting the state of the VBA
tgolen Oct 6, 2021
73ff6ab
Move bank-account flow into workspace flow
marcaaron Oct 6, 2021
86b27c3
DRY up the code with a section component
tgolen Oct 6, 2021
7efa7e7
Move card pages into a folder
tgolen Oct 6, 2021
10563c7
Rename folder to just card
tgolen Oct 6, 2021
734184e
Move reimburse page to a folder
tgolen Oct 6, 2021
1e1615a
Add the reimburse pages
tgolen Oct 6, 2021
a7727f4
adding the basically done thing page but bank icons need a bankName a…
marcaaron Oct 6, 2021
b259d54
Add copy to clipboard component
tgolen Oct 6, 2021
bc53e47
Add the proper links to the reimburse pages
tgolen Oct 6, 2021
16a458e
Create interstitial page to redirect or show continue button
marcaaron Oct 6, 2021
eaa4780
Add the bill pay pages
tgolen Oct 6, 2021
191273d
Parse user's email domain
tgolen Oct 6, 2021
9e03ec0
fix subStep logic so that we remember the option selected;
marcaaron Oct 6, 2021
782816f
Remove loading indicators so pages will work offline
tgolen Oct 6, 2021
7039372
DRY up the section pages
tgolen Oct 6, 2021
4f15e2a
DRY up the reimburse page
tgolen Oct 6, 2021
5a9f472
DRY up the bills page
tgolen Oct 6, 2021
8519ad3
Fix bankName stuff
marcaaron Oct 6, 2021
e5efd86
DRY the card page
tgolen Oct 6, 2021
74e4a55
add initial english translations
marcaaron Oct 6, 2021
235b3d9
clean up getPaymentMethods
marcaaron Oct 6, 2021
93e9d35
use initWithStoredValues
marcaaron Oct 6, 2021
d87cfc8
Remove add work email and replace with Concierge
marcaaron Oct 7, 2021
1038edf
Add noop onPress
marcaaron Oct 7, 2021
72fb8d7
dont show the continue setup screen if we are in an open state
marcaaron Oct 7, 2021
04ed733
Add the invoices page
tgolen Oct 7, 2021
ecab72f
DRY up the bills page a little
tgolen Oct 7, 2021
a507a61
Fix component display name
tgolen Oct 7, 2021
8db44a0
fix weird bug that silently breaks navigating to a new step
marcaaron Oct 7, 2021
cd2d639
pop the WorkspaceBankAccountPage before navigating to /bank-account
marcaaron Oct 7, 2021
10e27c7
remove unneeded link out to olddot
marcaaron Oct 7, 2021
62a5191
Navigate to correct next step
marcaaron Oct 7, 2021
183903a
add missing propTypes
marcaaron Oct 7, 2021
8b32d0e
Adding product illustrations
shawnborton Oct 7, 2021
0b18732
Merge branch 'tgolen-workspace-settings' of github.com:Expensify/App …
tgolen Oct 7, 2021
16f511b
Add travel page
tgolen Oct 7, 2021
1ba208c
Rename asset files
tgolen Oct 7, 2021
2eaad80
Adding one color icons
shawnborton Oct 7, 2021
c1558d9
Merge branch 'tgolen-workspace-settings' of github.com:Expensify/App …
tgolen Oct 7, 2021
11e13d0
Add illustration icon file
tgolen Oct 7, 2021
4a30e0b
Update icon list
tgolen Oct 7, 2021
c647cca
Update icons on the card pages
tgolen Oct 7, 2021
18b47f6
Fix icons on the receipt page
tgolen Oct 7, 2021
a4e1758
Fix icons on the bills page
tgolen Oct 7, 2021
ee196da
Fix icons on the invoices page
tgolen Oct 7, 2021
e5cac37
Add Spanish translations for new workspaces
Gonals Oct 7, 2021
53d93d3
Fix icons on the travel page
tgolen Oct 7, 2021
864f709
Add back navigation to members and invite page
tgolen Oct 7, 2021
21a73c9
Update bills page for public domains
tgolen Oct 7, 2021
c4dfad5
Merge pull request #5711 from Expensify/alberto-workspace-settings-sp…
tgolen Oct 7, 2021
80da4a7
Use better back navigation for member page
tgolen Oct 7, 2021
f078520
Merge branch 'tgolen-workspace-settings' of github.com:Expensify/App …
tgolen Oct 7, 2021
1b7b3b4
Clean up some translation stuff
tgolen Oct 7, 2021
f981a76
Use ternarys and a few cleanups
tgolen Oct 7, 2021
81dea7f
add translations
marcaaron Oct 7, 2021
ca1d9a8
Merge branch 'main' into tgolen-workspace-settings
tgolen Oct 7, 2021
6bfe2e9
Add currency selector to settings page
iwiznia Oct 7, 2021
b695594
Lint
tgolen Oct 7, 2021
ac85502
add translations and assets
marcaaron Oct 7, 2021
665da6d
Merge branch 'tgolen-workspace-settings' into marcaaron-connectBankAc…
marcaaron Oct 7, 2021
18b05d3
remove unneeded import
marcaaron Oct 7, 2021
884e2a5
Disable currency field if vba is set and add some styles
iwiznia Oct 7, 2021
6dce153
update copy
marcaaron Oct 7, 2021
89a326f
change icon
marcaaron Oct 7, 2021
23fdff0
Add spanish translations
iwiznia Oct 7, 2021
480cefe
Address review comments
iwiznia Oct 7, 2021
1363f8f
Merge pull request #5713 from Expensify/ionatan_settings_page
tgolen Oct 7, 2021
198a064
remove assets
marcaaron Oct 7, 2021
cafbfdf
Force button to the bottom of the page
tgolen Oct 7, 2021
c06423f
remove unused things
marcaaron Oct 7, 2021
0326535
Remove unused imports
tgolen Oct 7, 2021
8a67d92
Move workspace screens into the settings stack
tgolen Oct 7, 2021
089ced3
Clean up unnecessary function nesting
tgolen Oct 7, 2021
87271a8
fix conflicts
marcaaron Oct 7, 2021
53b5f10
Use the correct reconciliation link
tgolen Oct 7, 2021
78da1f0
update route
marcaaron Oct 7, 2021
fafa0ce
Update src/pages/workspace/WorkspaceSettingsPage.js
tgolen Oct 7, 2021
4929f79
Update src/languages/en.js
tgolen Oct 7, 2021
75dffa7
Fix proptype warning
tgolen Oct 7, 2021
308bd4b
Clear setTimeout interval on unmount
tgolen Oct 7, 2021
3b998c1
Remove fragment
tgolen Oct 7, 2021
a447340
Add cursor pointer
tgolen Oct 7, 2021
1665825
DRY the style proptypes
tgolen Oct 7, 2021
50ab411
move loading false so ACHContractStep does not reshow
marcaaron Oct 7, 2021
62057fd
Merge branch 'tgolen-workspace-settings' of github.com:Expensify/App …
tgolen Oct 7, 2021
889f94c
Fix link position
tgolen Oct 7, 2021
459a721
Remove exact routes
tgolen Oct 7, 2021
f561152
Rename methods to have better names
tgolen Oct 7, 2021
978aae5
use lodashGet
tgolen Oct 7, 2021
b075c12
Improve policy imports
tgolen Oct 7, 2021
16085b9
Fix component name
tgolen Oct 7, 2021
fbe5495
Remove unnecessary compose
tgolen Oct 7, 2021
21e6742
Use the proper text component
tgolen Oct 7, 2021
075fc07
add workaround for navigation
marcaaron Oct 7, 2021
d8a9be7
fix conflicts
marcaaron Oct 7, 2021
d68da52
remove pop
marcaaron Oct 7, 2021
a409a59
Remove extra dismissModal as it is no longer needed. Add a dismissMod…
marcaaron Oct 7, 2021
0210427
Some extra translations for workspaces
Gonals Oct 8, 2021
67ec342
Merge pull request #5703 from Expensify/marcaaron-connectBankAccount2
tgolen Oct 8, 2021
d8b3023
Fix unnecessary fragments
tgolen Oct 8, 2021
1c9d8d6
Fixing some component names and other review comments
tgolen Oct 8, 2021
18db228
Merge branch 'main' into tgolen-workspace-settings
tgolen Oct 8, 2021
9151b74
Add display name
tgolen Oct 8, 2021
860e35c
style and typo
tgolen Oct 8, 2021
46bb911
Fix lint and remove unused translation
tgolen Oct 8, 2021
db6612f
add members
Gonals Oct 8, 2021
73b76c8
Merge branch 'tgolen-workspace-settings' into alberto-workspace-trans…
tgolen Oct 8, 2021
d521f9f
Merge pull request #5725 from Expensify/alberto-workspace-translation
tgolen Oct 8, 2021
da1b829
Fix image uploading
tgolen Oct 8, 2021
ad9868d
Fix propType warning
tgolen Oct 8, 2021
64cb9d4
Remove default prop
tgolen Oct 8, 2021
51bfb9b
Simplify function references
tgolen Oct 8, 2021
45011d6
Fix casing on menu item prop types
tgolen Oct 8, 2021
2fc0b74
Fix display name, delete unused file
tgolen Oct 8, 2021
a2bfa87
Fix undefined
tgolen Oct 8, 2021
fc61822
Remove event being passed to goBack()
tgolen Oct 8, 2021
905e48c
Simplify prop logic
tgolen Oct 8, 2021
ce2dabe
Remove uniqueId from keys
tgolen Oct 8, 2021
66838fa
Remove style prop and simplify component
tgolen Oct 8, 2021
318d90a
Merge branch 'main' into tgolen-workspace-settings
tgolen Oct 8, 2021
cc12068
Don't navigate after saving policy settings
tgolen Oct 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions assets/images/bill.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions assets/images/briefcase.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions assets/images/circle-hourglass.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions assets/images/concierge.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions assets/images/invoice.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions assets/images/luggage.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 10 additions & 13 deletions assets/images/paycheck.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
43 changes: 43 additions & 0 deletions assets/images/product-illustrations/bank-arrow--pink.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 50 additions & 0 deletions assets/images/product-illustrations/bank-mouse--green.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
48 changes: 48 additions & 0 deletions assets/images/product-illustrations/bank-user--green.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading