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.

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

Fix/review contracts 398 #403

Merged
merged 7 commits into from
Feb 13, 2023
Merged

Fix/review contracts 398 #403

merged 7 commits into from
Feb 13, 2023

Conversation

Torresmorah
Copy link
Collaborator

Review contracts

What does this PR do?

Steps to test

  1. Check the changes.

@Torresmorah Torresmorah added the WIP Work In Progress label Feb 13, 2023
@Torresmorah Torresmorah self-assigned this Feb 13, 2023
Copy link
Contributor

@xavier506 xavier506 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@xavier506 xavier506 merged commit 56919d8 into dev Feb 13, 2023
xavier506 added a commit that referenced this pull request Mar 1, 2023
* Fix/review contracts 398 (#403)

* 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/add translation to spanish (#405)

* 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/last tx users 335 (#406)

* fix(webapp): add link to transaction in last tx

* fix(webapp): use correct url to link ricardian contract

* Feat/agree terms and conditions 332 (#417)

* 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

* Fix/contracts conflicts (#419)

---------

Co-authored-by: Helbertson Torres <66583677+Torresmorah@users.noreply.github.com>
xavier506 pushed a commit that referenced this pull request Mar 10, 2023
* Fix/review contracts 398 (#403)

* 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/add translation to spanish (#405)

* 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/last tx users 335 (#406)

* fix(webapp): add link to transaction in last tx

* fix(webapp): use correct url to link ricardian contract

* Feat/agree terms and conditions 332 (#417)

* 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

* Fix/contracts conflicts (#419)

* Feat/approve rejected payments 402 (#416)

* 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

* fix(postgres):Update postgres versio (#424)

* fix(webapp): resolve conflicts

* fix(kubernetes): resolve conflicts

* chore(contracts): compile contract

---------

Co-authored-by: Francis Gómez <96137247+fagomezra@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
WIP Work In Progress
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Review reference of XPR Price Review approvals contract
2 participants