Merge pull request #8 from bancorprotocol/revert-7-feature/remove-redeem

bancorprotocol · Jan 24, 2022 · 9584e1e · 9584e1e
2 parents 4d864d4 + 7907ee3
commit 9584e1e
Show file tree

Hide file tree

Showing 10 changed files with 15,449 additions and 14,523 deletions.
diff --git a/client/public/index.html b/client/public/index.html
@@ -7,7 +7,7 @@
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
-      content="Buy & Sell Bancor BNTees & Swag."
+      content="Buy, Sell & Redeem Bancor BNTees & Swag."
     />
     <link rel="apple-touch-icon" href="%PUBLIC_URL%/favicon.png" />
     <!--

diff --git a/client/src/components/dialogs/BuyTokenDialog.js b/client/src/components/dialogs/BuyTokenDialog.js
@@ -183,6 +183,9 @@ export default class BuyTokenDialog extends Component {
                   <div className="total-container">
                     Total {returnPrice.priceUSD ? new Intl.NumberFormat('en-US', {style: 'currency', currency: 'USD'}).format(returnPrice.priceUSD) : ''}
                   </div>
+                  <div className="total-sub">
+                    Each token is redeemable for 1 {buyProduct.productName} shirt.
+                  </div>
                 </Col>
                 <Col lg={5}>
                   {errorMessageDisplay}

diff --git a/client/src/components/dialogs/ClaimProductDialog.js b/client/src/components/dialogs/ClaimProductDialog.js
@@ -117,6 +117,13 @@ export default class ClaimProductDialog extends Component {
           <div className="claim-product-label">
             Please fill in the order details to receive your purchase.
           </div>
+          <div className="claim-product-label claim-product-sublabel">
+
+            <div>&#9888;&nbsp;You can only redeem one product at a time.
+            Check the "redeemable items" tab at the top of the shop to redeem additional items
+            after completing this order.&nbsp;&#9888;</div>
+
+          </div>
         <div className="claim-address-form">
         <Form onSubmit={this.submitClaimForm}>
         <Form.Group>

diff --git a/client/src/components/dialogs/ThankYouDialog.js b/client/src/components/dialogs/ThankYouDialog.js
@@ -16,6 +16,10 @@ export default class ThankYouDialog extends Component {
           <div className="nft-claim-btn">
             <a href={`${productClaim.openseaLink}`} target="_blank">Click here to claim your NFTee</a>
           </div>
+          <div className="thankyou-footer">
+            <div>See the "redeemable items" tab to view remaining physical items</div>
+            <div>that you are eligible to claim.</div>
+          </div>
         </div>
       </Modal>
       )

diff --git a/client/src/components/product/ProductDisplay.js b/client/src/components/product/ProductDisplay.js
@@ -71,6 +71,9 @@ export default class ProductDisplay extends Component {
           <div className="app-info-container">
             <Row>
               <Col lg={6} xs={6} className="card-pricing-info">
+                <div>
+                  {totalRedeemed} Redeemed
+                </div>
                 <div className="card-available">
                   {tokensInPool} / {maximumTokens} available
                 </div>
@@ -89,9 +92,12 @@ export default class ProductDisplay extends Component {
           </Col>
         </Row>
         <Row className="sell-container">
-          <Col lg={12}>
+          <Col lg={6}>
             <Button className="sell-btn" onClick={()=>this.props.sellToken(currentProduct)}>Sell</Button>
           </Col>
+          <Col lg={6}>
+            <Button className="sell-btn" onClick={()=>this.props.redeemToken(currentProduct)}>Redeem</Button>
+          </Col>
         </Row>
         </div>
         </div>

diff --git a/client/src/components/product/ProductInfo.js b/client/src/components/product/ProductInfo.js
@@ -28,6 +28,7 @@ export default class ProductInfo extends Component {
       <div className="product-info-container">
        <ListGroup>
         <ListGroupItem>&#128085;&nbsp; <span className="info-label">Initial {currentProduct.tokenSymbol}s</span> <span className="list-group-value">{initialProductValue}</span></ListGroupItem>
+        <ListGroupItem>&#128230;&nbsp; <span className="info-label">Redeemed {currentProduct.tokenSymbol}s</span> <span className="list-group-value">{redeemedProductValue}</span></ListGroupItem>
         <ListGroupItem>&#127946;&nbsp; <span className="info-label">BNTee pool value: </span> <span className="list-group-value">{mainTokenHolding} {currentProduct.tokenSymbol} {reserveTokenHolding} BNT</span></ListGroupItem>
        </ListGroup>
        <div className="price-info-label">