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

Fix #580 #626

Merged
merged 26 commits into from
Oct 23, 2017
Merged

Fix #580 #626

merged 26 commits into from
Oct 23, 2017

Conversation

happyconcepts
Copy link
Contributor

Fix #580 added linethrough class for Annual Fee

Scurious and others added 26 commits July 17, 2017 12:06
@happyconcepts
Update README.md
0c5270b
@happyconcepts
Merge pull request #1 from happyconcepts/happyconcepts-patch-1
c55e8eb 
Update README.md - correct spelling of webpack dependency
@happyconcepts
Merge branch 'bitshares' of https://github.com/bitshares/bitshares-ui …
7aa09f7 
…into bitshares
@happyconcepts
Merge remote-tracking branch 'upstream/bitshares' into bitshares
b353d34
@happyconcepts
Merge branch 'bitshares' of https://github.com/bitshares/bitshares-ui …
3c0c8f6 
…into bitshares
@happyconcepts
Merge remote-tracking branch 'upstream/bitshares' into bitshares
3df0286
@happyconcepts
Merge branch 'bitshares' of https://github.com/bitshares/bitshares-ui …
2ae4336 
…into bitshares
@happyconcepts
Merge remote-tracking branch 'upstream/bitshares' into bitshares
c67c2b1
@happyconcepts
Merge branch 'bitshares' of https://github.com/bitshares/bitshares-ui …
9d090d2 
…into bitshares
@fletchertyler914 @svk31
Issue 315 - Add Chart Clamp To Settings Dropdown (bitshares#373)
4b5e84c 
* Add Chart Clamp To Settings Dropdown

* Removed Unused Variable

Merging as is and then we'll see about handling the redraw bug in the next sprint.
@happyconcepts
Merge branch 'bitshares' of https://github.com/bitshares/bitshares-ui …
a6dfafb 
…into bitshares
@happyconcepts
Merge branch 'master' of https://github.com/bitshares/bitshares-ui
9929753
@happyconcepts
Merge branch 'staging' of https://github.com/bitshares/bitshares-ui i…
ecbf26c 
…nto staging
@happyconcepts
Sync/Merge branch 'staging' of https://github.com/bitshares/bitshares-ui
d6b99d4 
 into staging
@happyconcepts
Merge branch 'staging' of https://github.com/bitshares/bitshares-ui i…
cfe729f 
…nto staging
@happyconcepts
Merge branch 'staging' of https://github.com/bitshares/bitshares-ui i…
6900473 
…nto staging
@happyconcepts
Merge branch 'staging' of https://github.com/bitshares/bitshares-ui i…
2807ed0 
…nto staging
@happyconcepts
Merge branch 'staging' of https://github.com/bitshares/bitshares-ui i…
1e4ef88 
…nto staging
@happyconcepts
Merge branch 'staging' of https://github.com/bitshares/bitshares-ui i…
2044a65 
…nto staging
@happyconcepts
Merge branch 'staging' of https://github.com/bitshares/bitshares-ui i…
3efd24a 
…nto staging
@happyconcepts
resolve conflict
5a457f7
@happyconcepts
Update README.md
28cc1a8
@happyconcepts
Merge branch 'staging' of https://github.com/happyconcepts/bitshares-ui…
b403ada 
… into staging
@happyconcepts
Merge branch 'staging' of https://github.com/bitshares/bitshares-ui i…
19a38e3 
…nto staging
@happyconcepts
Fix bitshares#580 add linethrough class
735e761
@happyconcepts
Fix bitshares#580 Annual fee
4c8dfcd
@svk31
Copy link
Contributor

svk31 commented Oct 23, 2017

This is fine but it would've been cleaner to just add the if check to the className, like this:

<span className={feeTypes[key]==="Annual Membership" ? "linethrough" : ""}>xxx</span>

@svk31 svk31 merged commit 2456823 into bitshares:staging Oct 23, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@happyconcepts @svk31 @fletchertyler914