- {this.props.ERC20NAME}
+ {token.name}
diff --git a/src/components/Receipt.js b/src/components/Receipt.js
index 12bf72089..dca063c6b 100644
--- a/src/components/Receipt.js
+++ b/src/components/Receipt.js
@@ -8,18 +8,11 @@ import RecentTransactions from './RecentTransactions';
import { scroller } from 'react-scroll'
import i18n from '../i18n';
import axios from 'axios';
-const QRCode = require('qrcode.react');
const BockieSize = 12
export default class Receive extends React.Component {
-
- constructor(props) {
- super(props);
- let initialState = {
- }
- }
componentDidMount(){
console.log("RECEIPT LOADED",this.props)
if(this.props.receipt && this.props.receipt.daiposOrderId){
@@ -50,7 +43,7 @@ export default class Receive extends React.Component {
}
}
render() {
- let {receipt,buttonStyle,ERC20TOKEN,address, balance, changeView, dollarDisplay,account} = this.props
+ const { receipt, dollarDisplay } = this.props
let message = ""
diff --git a/src/components/Receive.js b/src/components/Receive.js
index 582b7a7ab..15549ad71 100644
--- a/src/components/Receive.js
+++ b/src/components/Receive.js
@@ -6,17 +6,12 @@ import Blockies from 'react-blockies';
import RecentTransactions from './RecentTransactions';
import { scroller } from 'react-scroll'
import i18n from '../i18n';
-const QRCode = require('qrcode.react');
+import QRCode from 'qrcode.react';
+import { token } from '../assets';
export default class Receive extends React.Component {
-
- constructor(props) {
- super(props);
- let initialState = {
- }
- }
render() {
- let {dollarDisplay,view,buttonStyle,ERC20TOKEN,address, balance, changeAlert, changeView, subBalanceDisplay,account} = this.props
+ const {dollarDisplay,view,buttonStyle,address, changeAlert, changeView } = this.props
let qrSize = Math.min(document.documentElement.clientWidth,512)-90
@@ -49,12 +44,11 @@ export default class Receive extends React.Component {
view={view}
max={5}
buttonStyle={buttonStyle}
- ERC20TOKEN={ERC20TOKEN}
- transactionsByAddress={ERC20TOKEN?this.props.fullTransactionsByAddress:this.props.transactionsByAddress}
+ transactionsByAddress={token ? this.props.fullTransactionsByAddress : this.props.transactionsByAddress}
changeView={changeView}
address={address}
block={this.props.block}
- recentTxs={ERC20TOKEN?this.props.fullRecentTxs:this.props.recentTxs}
+ recentTxs={token ? this.props.fullRecentTxs : this.props.recentTxs}
/>
diff --git a/src/components/RecentTransactions.js b/src/components/RecentTransactions.js
index d7b6ae122..b0cea488f 100644
--- a/src/components/RecentTransactions.js
+++ b/src/components/RecentTransactions.js
@@ -2,8 +2,11 @@ import React from 'react';
import { Blockie } from "dapparatus";
import Ruler from "./Ruler";
import { Scaler } from "dapparatus";
+import { token } from '../assets';
-export default ({dollarDisplay, view, max, buttonStyle, ERC20TOKEN, vendorName, address, recentTxs, block, changeView}) => {
+export default ({
+ dollarDisplay, view, max, buttonStyle, vendorName, address, recentTxs, block, changeView
+}) => {
let txns = []
let count=0
if(!max) max=9999
@@ -39,7 +42,7 @@ export default ({dollarDisplay, view, max, buttonStyle, ERC20TOKEN, vendorName,
}
let dollarView
- if(ERC20TOKEN){
+ if(token){
if(recentTxs[r].token){
dollarView = (
diff --git a/src/components/SendBadge.js b/src/components/SendBadge.js
index d00948b82..04e615c51 100644
--- a/src/components/SendBadge.js
+++ b/src/components/SendBadge.js
@@ -78,8 +78,6 @@ export default class SendBadge extends React.Component {
}
send = async () => {
let { toAddress, amount } = this.state;
- let {ERC20TOKEN} = this.props
-
if(this.state.canSend){
diff --git a/src/components/SendToAddress.js b/src/components/SendToAddress.js
index 81a14f087..539292b6c 100644
--- a/src/components/SendToAddress.js
+++ b/src/components/SendToAddress.js
@@ -5,8 +5,9 @@ import cookie from 'react-cookies'
import {CopyToClipboard} from "react-copy-to-clipboard";
import Blockies from 'react-blockies';
import { scroller } from 'react-scroll'
+import queryString from 'query-string';
import i18n from '../i18n';
-const queryString = require('query-string');
+import { token } from '../assets';
export default class SendToAddress extends React.Component {
@@ -159,29 +160,29 @@ export default class SendToAddress extends React.Component {
send = async () => {
let { toAddress, amount } = this.state;
- let {ERC20TOKEN, dollarDisplay, convertToDollar} = this.props
+ let { dollarDisplay, convertToDollar } = this.props
amount = convertToDollar(amount)
console.log("CONVERTED TO DOLLAR AMOUNT",amount)
if(this.state.canSend){
- if(ERC20TOKEN){
+ if(token){
console.log("this is a token")
}else{
console.log("this is not a token")
}
- console.log("ERC20TOKEN",ERC20TOKEN,"this.props.balance",parseFloat(this.props.balance),"amount",parseFloat(amount))
+ console.log("ERC20TOKEN", token.name, "this.props.balance",parseFloat(this.props.balance),"amount",parseFloat(amount))
- if(!ERC20TOKEN && parseFloat(this.props.balance) <= 0){
- console.log("No funds!?!",ERC20TOKEN,parseFloat(this.props.balance))
+ if(!token && parseFloat(this.props.balance) <= 0){
+ console.log("No funds!?!", token.name, parseFloat(this.props.balance))
this.props.changeAlert({type: 'warning', message: "No Funds."})
- }else if(!ERC20TOKEN && parseFloat(this.props.balance)-0.0001<=parseFloat(amount)){
+ }else if(!token && parseFloat(this.props.balance)-0.0001<=parseFloat(amount)){
let extraHint = ""
- if(!ERC20TOKEN && parseFloat(amount)-parseFloat(this.props.balance)<=.01){
+ if(!token && parseFloat(amount)-parseFloat(this.props.balance)<=.01){
extraHint = "(gas costs)"
}
this.props.changeAlert({type: 'warning', message: 'Not enough funds: '+dollarDisplay(Math.floor((parseFloat(this.props.balance)-0.0001)*100)/100)+' '+extraHint})
- }else if((ERC20TOKEN && (parseFloat(this.props.balance){
+ tx(contracts.VendingMachine.addProduct(prod.id,prod.name,prod.cost,!prod.isAvailable),240000,0,0,(result)=>{
console.log("===PRODUCT:",result)
let changingAvailable = this.state.changingAvailable
changingAvailable[p] = false
@@ -142,7 +142,7 @@ export default class Advanced extends React.Component {