Fix/resolve main conflicts #426
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
* fix(env): use right endpoint * fix(readme): use right url * fix(contracts): admin now can approve payment after expiration and use XPR price from API * fix(hapi): query XPR price directly instead of BTC * chore(vscode): add cpp properties for Linux * chore(contracts): install dependecies * chore(vscode): add needed configuration
* fix(webapp): translate home, about and help routes * fix(webapp): add spanish translation in home page * fix(webapp): add spanish translation and fix proptype * fix(webapp): add translation to spanish in admin route * fix(webapp): minor fix in spanish text * chore(webapp): display the current year in the footer and change text
* fix(webapp): add link to transaction in last tx * fix(webapp): use correct url to link ricardian contract
* feat(webapp): add agreement checkbox required to join or complete the referral * fix(webapp): disable button to join when the status is pending kyc or pending approval * fix(webapp): minor fix in spanish text
* feat(webapp): show rejected payments in admin section * feat(webapp): add rejected referrals into the referall payments section * feat(webapp): add button to reapprove rejected payment * feat(webapp): perform transaction to pay rejected referral * fix(webapp): fix filter referrals payments and avoid to show duplicated values * feat(contracts): add contract to approve and pay a rejected referral * fix(webapp): change text * feat(contracts): add payrejected action * fix(contracts): set correct authorization - chore(contracts): add case to payrejected action in test file * fix(contracts): add 'eosio.code' permission to affiliate in the unit tests * fix(contracts): set usd_reward_amount before use it * fix(webapp): unselect checkbox when performs a transaction sucessfully * fix(contracts): first check if invitee is an account and remove unneeded conversion
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.
Resolve conflicts
Resolve conflicts to perform a production release