Skip to content
This repository has been archived by the owner on Nov 21, 2019. It is now read-only.

Commit

Permalink
v2.8 - confirmed withdrawals are wroking
Browse files Browse the repository at this point in the history
  • Loading branch information
tayvano committed Jul 20, 2016
1 parent 62ee9a7 commit ad7c41a
Show file tree
Hide file tree
Showing 9 changed files with 4,031 additions and 35 deletions.
13 changes: 3 additions & 10 deletions app/includes/dao.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -72,22 +72,15 @@
<br /><br /><br />
<div class=" text-center">
<a class="btn btn-danger btn-lg" data-toggle="modal" data-target="#withdrawTransaction"> WITHDRAW YOUR DAO TOKENS FOR ETH </a>
<p><small> Yes. Just push the big red button. It's that easy. Well actually... </small></p>
<p><small> Yes. Just push the big red button. It's that easy. </small></p>
<div class="form-group col-xs-12" ng-bind-html="sendTxStatus"></div>
<div class="form-group col-xs-12" ng-bind-html="withdrawTxStatus"></div>
</div>

<h5> Do NOT push this button until the Hard Fork has successfully occured. You will just waste gas if you do. </h5>
<br /><br /><br />
<ul>
<li> There is no deadline for the withdrawals. The safest thing to do is wait a day. </li>
<li> The Hard Fork will occur at block 1,920,000, or at approximately 6:30AM PDT on July 20th, 2016. </li>
<li> There may be some time needed to see which chain won. </li>
<li> The MyEtherWallet team is sleeping. We will answer any questions when we wake up, and remove this bullet. </li>
<li> There is no deadline for the withdrawals. Waiting is not the worst idea. </li>
<li> If you are getting an <em>insufficient balance for gas * ... </em> error, you must have a small amount of ETH in your account in order to cover the cost of gas. Add .01 ETH to this account and try again. </li>
<li><a href="http://time.is/PDT" target="_blank">What time is it PDT?</a></li>
<li><a href="http://slacknation.github.io/medium/11/11.html" target="_blank">Hardfork Countdown</a></li>
</ul>

</section>
<!-- / Withdraw DAO Tokens -->

Expand Down
4 changes: 2 additions & 2 deletions app/includes/header.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<header class="container-fluid bg-gradient text-white">
<section class="container">
<a href="https://www.myetherwallet.com/"><img src="images/etherwallet-logo.png" height="70px" width="auto" alt="My Ether Wallet" /></a>
<p>Open Source JavaScript Client-Side Ether Wallet &middot; v2.7</p>
<p>Open Source JavaScript Client-Side Ether Wallet &middot; v2.8</p>
</section>
</header>
}
Expand All @@ -58,7 +58,7 @@
<header class="container-fluid bg-gradient text-white">
<section class="container">
<a href="/cx-wallet.html"><img src="images/etherwalletcx-logo.png" height="70px" width="auto" alt="My Ether Wallet" /></a>
<p>Open Source JavaScript Client-Side Ether Wallet Chrome Extension &middot; v2.7</p>
<p>Open Source JavaScript Client-Side Ether Wallet Chrome Extension &middot; v2.8</p>
</section>
</header>
}
Expand Down
15 changes: 4 additions & 11 deletions chrome-extension/cx-wallet.html
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<header class="container-fluid bg-gradient text-white">
<section class="container">
<a href="/cx-wallet.html"><img src="images/etherwalletcx-logo.png" height="70px" width="auto" alt="My Ether Wallet" /></a>
<p>Open Source JavaScript Client-Side Ether Wallet Chrome Extension &middot; v2.7</p>
<p>Open Source JavaScript Client-Side Ether Wallet Chrome Extension &middot; v2.8</p>
</section>
</header>

Expand Down Expand Up @@ -823,22 +823,15 @@ <h4> Account Information </h4>
<br /><br /><br />
<div class=" text-center">
<a class="btn btn-danger btn-lg" data-toggle="modal" data-target="#withdrawTransaction"> WITHDRAW YOUR DAO TOKENS FOR ETH </a>
<p><small> Yes. Just push the big red button. It's that easy. Well actually... </small></p>
<p><small> Yes. Just push the big red button. It's that easy. </small></p>
<div class="form-group col-xs-12" ng-bind-html="sendTxStatus"></div>
<div class="form-group col-xs-12" ng-bind-html="withdrawTxStatus"></div>
</div>

<h5> Do NOT push this button until the Hard Fork has successfully occured. You will just waste gas if you do. </h5>
<br /><br /><br />
<ul>
<li> There is no deadline for the withdrawals. The safest thing to do is wait a day. </li>
<li> The Hard Fork will occur at block 1,920,000, or at approximately 6:30AM PDT on July 20th, 2016. </li>
<li> There may be some time needed to see which chain won. </li>
<li> The MyEtherWallet team is sleeping. We will answer any questions when we wake up, and remove this bullet. </li>
<li> There is no deadline for the withdrawals. Waiting is not the worst idea. </li>
<li> If you are getting an <em>insufficient balance for gas * ... </em> error, you must have a small amount of ETH in your account in order to cover the cost of gas. Add .01 ETH to this account and try again. </li>
<li><a href="http://time.is/PDT" target="_blank">What time is it PDT?</a></li>
<li><a href="http://slacknation.github.io/medium/11/11.html" target="_blank">Hardfork Countdown</a></li>
</ul>

</section>
<!-- / Withdraw DAO Tokens -->

Expand Down
224 changes: 224 additions & 0 deletions chrome-extension/embedded-daoproposals.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,224 @@
<!DOCTYPE html>
<html lang="en" ng-app="mewApp">
<head>
<meta charset="utf-8">
<title>MyEtherWallet: Open Source JavaScript Client-Side Ether Wallet</title>
<link rel="canonical" href="https://www.myetherwallet.com" />
<meta name="description" content="Ether Wallet: Open Source JavaScript Client-Side Ether Wallet">
<meta name="author" content="">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="stylesheet" href="css/etherwallet-master.min.css">
<script type="text/javascript" src="js/etherwallet-static.min.js"></script>
<script type="text/javascript" src="js/etherwallet-master.js"></script>
<link rel="apple-touch-icon" sizes="60x60" href="images/fav/apple-touch-icon-60x60.png">
<link rel="apple-touch-icon" sizes="76x76" href="images/fav/apple-touch-icon-76x76.png">
<link rel="apple-touch-icon" sizes="120x120" href="images/fav/apple-touch-icon-120x120.png">
<link rel="apple-touch-icon" sizes="152x152" href="images/fav/apple-touch-icon-152x152.png">
<link rel="apple-touch-icon" sizes="180x180" href="images/fav/apple-touch-icon-180x180.png">
<link rel="icon" type="image/png" href="images/fav/favicon-32x32.png" sizes="32x32">
<link rel="icon" type="image/png" href="images/fav/favicon-194x194.png" sizes="194x194">
<link rel="icon" type="image/png" href="images/fav/favicon-96x96.png" sizes="96x96">
<link rel="icon" type="image/png" href="images/fav/android-chrome-192x192.png" sizes="192x192">
<link rel="icon" type="image/png" href="images/fav/favicon-16x16.png" sizes="16x16">
<link rel="manifest" href="images/fav/manifest.json">
<link rel="shortcut icon" href="images/favicon.ico">
<meta name="msapplication-TileColor" content="#2e4868">
<meta name="msapplication-TileImage" content="images/fav/mstile-144x144.png">
<meta name="msapplication-config" content="images/fav/browserconfig.xml">
<meta name="theme-color" content="#2e4868">
</head>

<body>

<header class="container-fluid bg-gradient text-white">
<section class="container">
<a href="https://www.myetherwallet.com/"><img src="images/etherwallet-logo.png" height="50px" width="auto" alt="Ether Wallet" /></a>
</section>
</header>


<section class="container" style="min-height: 50%" ng-controller='viewCtrl'>

<!-- tab panes -->

<div class="tab-content" >

<!-- The DAO Proposals -->
<div class="dao-proposals-embedded">
<br/><br/>
<section class="proposal-container" ng-controller='theDaoProposalCtrl'>
<!-- DAO Filters -->
<article class="proposal-item col-xs-12" ng-show="objProposal.show" ng-repeat="objProposal in AllProposals | filter:filters:comparator | orderBy : '-id' " >
<section class="proposal-top clearfix" ng-click="showProposal(objProposal.id)">
<div class="graph-container">
<div class="graph-unfilled" style="width:100%"></div>
<div class="graph-needed" style="width:{{ objProposal.quorumPer | number:2 }}%"></div>
<div class="graph-yes" style="width:{{ ( objProposal.yea * 100 ) / totRaised | number:2 }}%"></div>
<div class="graph-no" style="width:{{ ( objProposal.nay * 100 ) / totRaised | number:2 }}%;
left: {{ ( objProposal.yea * 100 ) / totRaised | number:2 }}%;"></div>
</div>
<div class="col-xs-9 clearfix">
<h4>{{objProposal.description}} </h4>
<p>
Proposal ID: <strong >{{objProposal.id}}</strong> &middot;
<span class="text-success" ng-show="objProposal.votingDeadline.getTime() >= objProposal.today.getTime()">ends: <strong>{{objProposal.votingDeadline | date:'medium'}}</strong></span>
<span class="text-danger" ng-show="objProposal.votingDeadline.getTime() < objProposal.today.getTime()">ended: <strong>{{objProposal.votingDeadline | date:'medium'}}</strong>
</p></span>
</div>
<div class="col-xs-3 clearfix text-right" ng-show="objProposal.split==false">
<h4> &nbsp; {{objProposal.amount}}</h4>
<p> ETH </p>
</div>
<div class="col-xs-3 clearfix text-right" ng-show="objProposal.split==true">
<h4> Split </h4>
<p> &nbsp; </p>
</div>
</section>
<section class="proposal-expanded col-xs-12">
<div class="description-html" ng-bind-html="objProposal.descriptionHTML"></div>
<p ng-show="objProposal.split==true"><em>This is a proposal to Split the DAO. If you vote yes, you must then call the SplitDAO function via Mist in order to join this new Split DAO. <a href="https://daowiki.atlassian.net/wiki/display/DAO/Step-by-Step%3A+Splitting+the+DAO" target="_blank"> Lean More Here.</a></em></p>
<table class="table">
<tr>
<td class="label">Votes Yea:</td>
<td class="output votes-yes">
{{ ( objProposal.yea * 100 ) / totRaised | number:2 }}% of total
&middot;
{{objProposal.yeaPer | number:2}}% of votes
&middot;
<em>({{ (objProposal.yea * 100) | number:2 }} DAO) </em></td>
</tr>
<tr>
<td class="label">Votes Nay:</td>
<td class="output votes-no">
{{ ( objProposal.nay * 100 ) / totRaised | number:2 }}% of total
&middot;
{{objProposal.nayPer | number:2}}% of votes
&middot;
<em>({{ (objProposal.nay * 100) | number:2 }} DAO) </em></td>
</tr>
<tr ng-show="objProposal.split==false">
<td class="label">Quorum:</td>
<td class="output">
<div class="votes-needed">{{ objProposal.quorumCurrent | number:2 }}% of {{ objProposal.quorumPer | number:2}}%</div>
</td>
</tr>
<tr>
<td class="label">Creator:</td>
<td class="output"><div class="address-identicon-container small"><div id="addressIdenticon" title="Address Indenticon" blockie-address="{{objProposal.creator}}" watch-var="objProposal"></div></div>
{{objProposal.creator}}</td>
</tr>
<tr>
<td class="label">Recipient:</td>
<td class="output"> <div class="address-identicon-container small"><div id="addressIdenticon" title="Address Indenticon" blockie-address="{{objProposal.recipient}}" watch-var="objProposal"></div></div>
{{objProposal.recipient}} </td>
</tr>
<tr>
<td class="label">New Curator:</td>
<td class="output"><span ng-class="objProposal.split==true ? 'boolean-yes' : 'boolean-no'"> {{objProposal.splitEnglish}} </span></td>
</tr>
<tr>
<td class="label">Open:</td>
<td class="output"><span ng-class="objProposal.open==true ? 'boolean-yes' : 'boolean-no'"> {{objProposal.openEnglish}} </span></td>
</tr>
<tr>
<td class="label">Proposal Passed:</td>
<td class="output"><span ng-class="objProposal.proposalPassed==true ? 'boolean-yes' : 'boolean-no'"> {{objProposal.proposalPassedEnglish}} </span></td>
</tr>
<tr>
<td class="label">Proposal Hash:</td>
<td class="output">{{objProposal.proposalHash}}</td>
</tr>
<tr>
<td class="label">Proposal Deposit:</td>
<td class="output">{{objProposal.proposalDeposit}} Ether</td>
</tr>
</table>
<div class="form-group" ng-show="objProposal.votingDeadline.getTime() > objProposal.today.getTime()">
<a class="btn btn-primary" ng-click="openVote(objProposal.id)">VOTE ON THIS PROPOSAL</a>
</div>
</section>
</article>

<!-- Vote Modal -->
<div class="modal fade" tabindex="-1" role="dialog" aria-labelledby="sendTransactionLabel" id="voteProposal">
<div class="modal-dialog" role="document">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h3 class="modal-title" id="myModalLabel">Unlock your Wallet to Vote on Proposal #{{voteID}}</h3>
</div>
<div class="modal-body">

<!-- Step 1: Unlock Your Wallet -->
<div>


<wallet-decrypt-drtv></wallet-decrypt-drtv>

</div>
<!-- / Step 1: Unlock Your Wallet -->

<hr />
<div ng-show="wallet!=null">
<!-- Step 2: Confirm and Vote -->
<h4>You are about to vote on Proposal <strong>#{{voteID}}</strong>: {{AllProposals[voteID].description}}.</h4>
<h4 class="text-light">Please vote carefully, there are no do-overs or take-backs.</h4>
<div class="row">
<div class="col-sm-4 marg-v-md">
<button type="button" class="btn btn-block btn-danger" ng-click="generateVoteTx(false)" ng-show="showVoteNo">VOTE NO</button>
</div>
<div class="col-sm-4 marg-v-md">
<button type="button" class="btn btn-block btn-default" data-dismiss="modal">GET ME OUT OF HERE</button>
</div>
<div class="col-sm-4 marg-v-md">
<button type="button" class="btn btn-block btn-primary" ng-click="generateVoteTx(true)" ng-show="showVoteYes">VOTE YES</button>
</div>
</div>
<div class="row">
<div class="form-group col-xs-12" ng-bind-html="sendTxStatus"></div>
<div class="form-group col-xs-12" ng-bind-html="voteTxStatus"></div>
</div>
<!-- / Step 2: Confirm and Vote -->
</div>
</div>
</div>
</div>
</div>
<!-- / Vote Modal -->

<!-- TODO: make these work, change active class on click -->


</section>
<!-- / DAO Filters -->


</section>
<!-- /DAO Proposals -->
</div>
<!-- / The DAO Proposals -->



</div>

<!-- /tab panes -->

</section>


<footer class="container-fluid">
<div class="container">
<p>Client-side wallet generation by <a href="https://www.myetherwallet.com" target="_blank">www.MyEtherWallet.com</a>: an open source tool for generating Ether wallets & sending transactions.</p>
<p>
<a href="https://www.myetherwallet.com/#help" target="_blank"> Help / FAQs </a> &middot;
<a href="https://github.com/kvhnuke/etherwallet" target="_blank">Github</a> &middot;
<a href="mailto:[email protected]" target="_blank"> Email Us </a> &middot;
<a href="https://twitter.com/myetherwallet" target="_blank"> @MyEtherWallet </a> &middot;
Created by <a href="https://github.com/kvhnuke" target="_blank">kvhnuke</a> & <a href="https://github.com/tayvano" target="_blank">tayvano</a>
</p>
</div>
</footer>
</body>
</html>

Loading

0 comments on commit ad7c41a

Please sign in to comment.