Dmirano/3782 proposed budget restructure #3914
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…dmirano/3776-apd-component-restructure
…omponent-restructure fixed merge conflict in Wrapper.js
|
merge conflicts will be solved once executive summary refactor is in (#3912) |
tbolt
approved these changes
Apr 1, 2022
mirano-darren
changed the base branch from
main
to
dmirano/3784-executive-summary-restructure
thetif
requested changes
Apr 5, 2022
web/src/pages/apd/ApdReadOnly.js
Outdated
| @@ -17,7 +17,7 @@ import ApdSummary from '../../containers/viewOnly/ApdSummary'; | |||
| import PreviousActivities from './previous-activities/PreviousActivities'; | |||
| import Activities from '../../containers/viewOnly/activities/All'; | |||
| import ScheduleSummary from './schedule-summary/ScheduleSummaryReadOnly'; | |||
| import ProposedBudget from '../../containers/viewOnly/ProposedBudget'; | |||
| import ProposedBudget from './proposed-budget/ProposedBudget'; | |||
There was a problem hiding this comment.
I think you are using the wrong one here, should be ProposedBudgetReadOnly
There was a problem hiding this comment.
ahhh!!! keep making the same mistake. will make sure to double check this once I create the other PRs :)
There was a problem hiding this comment.
just pushed up the fix
Base automatically changed from
dmirano/3784-executive-summary-restructure
to
main
April 6, 2022 19:38
…sed-budget-restructure
Codecov Report
@@ Coverage Diff @@
## main #3914 +/- ##
=======================================
Coverage 83.53% 83.53%
=======================================
Files 313 313
Lines 6400 6400
Branches 1210 1210
=======================================
Hits 5346 5346
Misses 960 960
Partials 94 94
Continue to review full report at Codecov.
|
|
This deploy was cleaned up. |
thetif
approved these changes
Apr 7, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #3782
Description-
proposed budget refactor
This pull request changes...
This pull request was tested in the follow ways…
Steps to manually verify this change...
This pull request is ready to review when...
This pull request can be merged when…