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

cancelSubscription contract functionality and minor fixes to index.html and detail.html #2501

Merged
merged 15 commits into from
Oct 23, 2018

Conversation

captnseagraves
Copy link
Contributor

cancelSubscription contract functionality and minor fixes to index.html and detail.html

pgweb:
image: sosedoff/pgweb
environment:
- DATABASE_URL=postgres://postgres:postgres@db:5432?sslmode=disable

Choose a reason for hiding this comment

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

[error] wrong indentation: expected 6 but found 8 (indentation)

environment:
- DATABASE_URL=postgres://postgres:postgres@db:5432?sslmode=disable
links:
- db

Choose a reason for hiding this comment

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

[error] wrong indentation: expected 6 but found 8 (indentation)

links:
- db
ports:
- "8081:8081"

Choose a reason for hiding this comment

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

[error] wrong indentation: expected 6 but found 8 (indentation)

@codecov
Copy link

codecov bot commented Oct 20, 2018

Codecov Report

Merging #2501 into grants will increase coverage by 0.16%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           grants    #2501      +/-   ##
==========================================
+ Coverage   29.57%   29.73%   +0.16%     
==========================================
  Files         155      154       -1     
  Lines       12306    12116     -190     
  Branches     1657     1618      -39     
==========================================
- Hits         3639     3603      -36     
+ Misses       8546     8395     -151     
+ Partials      121      118       -3
Impacted Files Coverage Δ
app/retail/emails.py 19.76% <0%> (-2.41%) ⬇️
app/avatar/utils.py 18.43% <0%> (-0.27%) ⬇️
...board/management/commands/cleanup_dupe_profiles.py

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 48794b9...b802437. Read the comment docs.

@mbeacom
Copy link
Contributor

mbeacom commented Oct 20, 2018

@captnseagraves Updating this PR to use grants as the base.

@mbeacom mbeacom changed the base branch from master to grants October 20, 2018 19:58
app/assets/v2/js/grants/fund_grant.js Outdated Show resolved Hide resolved
app/assets/v2/js/grants/new.js Outdated Show resolved Hide resolved
@@ -712,7 +712,8 @@ var trigger_primary_form_web3_hooks = function() {

if ($('#primary_form').length) {
var is_zero_balance_not_okay = document.location.href.indexOf('/faucet') == -1;
var unlock_metamask_error = web3.eth.coinbase ? web3.eth.coinbase : web3.eth.getCoinbase();
// var unlock_metamask_error = web3.eth.coinbase ? web3.eth.coinbase : web3.eth.getCoinbase();
var unlock_metamask_error = '0x0000000000000000000000000000000000000000';
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need to revisit this @SaptakS @captnseagraves ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

yes, we do. I think creating a solution for web3.js 1.0 in grants that is imported along with the needed functions will probably be best to not mess with bounties functionality. I added this work-around to keep moving. Happy to work on this issue today.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do I need to change this in order to get the rest of the changes merged in?

docker-compose.yml Show resolved Hide resolved
@captnseagraves
Copy link
Contributor Author

@mbeacom whoops! thank you! 🙏

@mbeacom mbeacom added frontend This needs frontend expertise. needs review labels Oct 20, 2018
app/assets/v2/js/grants/fund_grant.js Show resolved Hide resolved
app/assets/v2/js/grants/fund_grant.js Outdated Show resolved Hide resolved
app/assets/v2/js/grants/fund_grant.js Outdated Show resolved Hide resolved
app/assets/v2/js/grants/fund_grant.js Show resolved Hide resolved
app/assets/v2/js/grants/fund_grant.js Outdated Show resolved Hide resolved
app/assets/v2/js/grants/new.js Outdated Show resolved Hide resolved
app/assets/v2/js/grants/new.js Outdated Show resolved Hide resolved
app/assets/v2/js/grants/new.js Outdated Show resolved Hide resolved
app/assets/v2/js/grants/new.js Outdated Show resolved Hide resolved
app/assets/v2/js/grants/new.js Outdated Show resolved Hide resolved
@@ -151,6 +151,8 @@ <h1 class="grant__title font-title-xl mb-4">
</div>
</div>

<div class="update-milestone">

<div class="container mt-4">
Copy link
Member

Choose a reason for hiding this comment

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

@captnseagraves could we indent this by 1 ?

@captnseagraves
Copy link
Contributor Author

@mbeacom with comments adressed, is this good to merge?

@captnseagraves
Copy link
Contributor Author

@mbeacom @thelostone-mc @SaptakS Any other comments on this PR? Going to merge today if nothing else.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
frontend This needs frontend expertise.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants