Client dashboard - Language History TM-2290 #1706
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
…te with real data
|
I'll take a look at resolving conflicts |
scott062
commented
Aug 26, 2021
| @@ -79,7 +81,6 @@ const ProfileDashboard = ({ | |||
| <BoxShadow className="usa-width-one-whole user-dashboard-section favorites-section"> | |||
| <SavedSearches /> | |||
| </BoxShadow> | |||
| { isBidder() && favoritesContainer() } | |||
There was a problem hiding this comment.
i don't think i meant to remove this. Will check
scott062
commented
Aug 27, 2021
| @@ -120,46 +121,56 @@ const ProfileDashboard = ({ | |||
| </div> | |||
| } | |||
| { | |||
| isPublic && showClassifications && !userClassificationsHasErrored && | |||
There was a problem hiding this comment.
Broke out isPublic logic to encapsulate all the other checks - deleted lines 139
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.
WIP - still need to remove fake data and integrate with WS endpoint. Haven't checked if we are already mapping the languages that are already coming through (also should double check that they STILL come through on client response).
Possible merge conflcit with elizabeth's favorites update on client dashboard