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

Return back Send Link functionality at xdai.io #255

Merged
merged 3 commits into from May 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -48,7 +48,7 @@
"react-stack-grid": "^0.7.1",
"s3": "^4.4.0",
"scrypt": "^6.0.3",
"tabookey-gasless": "0.3.3",
"tabookey-gasless": "0.4.5",
"web3": "1.0.0-beta.33"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions src/App.js
Expand Up @@ -787,8 +787,8 @@ class App extends Component {
let options = {
from: this.state.account,
to: this.state.contracts.Links._address,
txfee: 12,
gas_limit: 150000,
txfee: 70,
gas_limit: 200000,
gas_price: Math.trunc(1000000000 * 25)
}
console.log("Hitting relayClient with relayTransaction()",claimData, options)
Expand Down
9 changes: 9 additions & 0 deletions src/components/MainCard.js
Expand Up @@ -47,6 +47,15 @@ export default ({buttonStyle,ERC20TOKEN,address, balance, changeAlert, changeVie
</button>
</div>
</div>
<div className="content ops row">
<div className="col-12 p-1" onClick={() => changeView('send_with_link')}>
<button className="btn btn-large w-100" style={buttonStyle.secondary}>
<Scaler config={{startZoomAt:400,origin:"50% 50%"}}>
<i className="fas fa-money-bill-alt" /> {i18next.t('main_card.link')}
</Scaler>
</button>
</div>
</div>
</div>
)

Expand Down
1 change: 1 addition & 0 deletions src/contracts/Links.abi.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/contracts/Links.address.js
@@ -0,0 +1 @@
module.exports = "0x5170DA7a3eF514c9F12A3A49EACAF9d026162a1f"
1 change: 1 addition & 0 deletions src/contracts/Links.blocknumber.js
@@ -0,0 +1 @@
module.exports = "9646453"