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.

Sign up for GitHub

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

Jump to bottom

adds OZR token #1596

Merged
merged 2 commits into from
Jul 3, 2018
Merged

adds OZR token #1596

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
94f9b36
adds OZR token
owocki Jul 2, 2018
532cd7e
Ran make fix-eslint
mbeacom Jul 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/assets/v2/js/tokens.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,8 @@ var tokens = function(network_id) {
{ 'addr': '0x58b6a8a3302369daec383334672404ee733ab239', 'name': 'LPT', 'decimals': 18 },
{ 'addr': '0x09617f6fd6cf8a71278ec86e23bbab29c04353a7', 'name': 'ULT', 'decimals': 18 },
{ 'addr': '0x4CEdA7906a5Ed2179785Cd3A40A69ee8bc99C466', 'name': 'AION', 'decimals': 8 },
{ 'addr': '0x4162178B78D6985480A308B2190EE5517460406D', 'name': 'CLN', 'decimals': 18 }
{ 'addr': '0x4162178B78D6985480A308B2190EE5517460406D', 'name': 'CLN', 'decimals': 18 },
{ 'addr': '0x7338809d1a2c6fbb6e755470ab2a28e8c5dac63c', 'name': 'OZR', 'decimals': 18}

];
} else if (network_id == 'ropsten') { // ropsten
Expand Down
2 changes: 1 addition & 1 deletion app/assets/yge/youvegoteth/send.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ var promptForAuth = function(event) {

token_contract(tokenAddress).allowance.call(from, to, function(error, result) {
if (error || result.toNumber() == 0) {
_alert({'message':"You have not yet enabled this token. To enable this token, go to the <a style='padding-left:5px;' href='/settings/tokens'> Token Settings page and enable it</a>. (this is only needed one time per token)"},'warning');
_alert({'message': "You have not yet enabled this token. To enable this token, go to the <a style='padding-left:5px;' href='/settings/tokens'> Token Settings page and enable it</a>. (this is only needed one time per token)"}, 'warning');
$('input, textarea, select').prop('disabled', 'disabled');
$('select[name=deonomination]').prop('disabled', '');
} else {
Expand Down
3 changes: 2 additions & 1 deletion app/assets/yge/youvegoteth/tokens.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,8 @@ var tokens = function(network_id) {
{'addr': '0x58b6a8a3302369daec383334672404ee733ab239', 'name': 'LPT', 'decimals': 18},
{'addr': '0x09617f6fd6cf8a71278ec86e23bbab29c04353a7', 'name': 'ULT', 'decimals': 18},
{'addr': '0x4CEdA7906a5Ed2179785Cd3A40A69ee8bc99C466', 'name': 'AION', 'decimals': 8},
{'addr': '0x4162178B78D6985480A308B2190EE5517460406D', 'name': 'CLN', 'decimals': 18}
{'addr': '0x4162178B78D6985480A308B2190EE5517460406D', 'name': 'CLN', 'decimals': 18},
{'addr': '0x7338809d1a2c6fbb6e755470ab2a28e8c5dac63c', 'name': 'OZR', 'decimals': 18}
];
} else if (network_id == 'ropsten') { // ropsten
_tokens = [
Expand Down
2 changes: 2 additions & 0 deletions app/dashboard/tokens.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,8 @@
{"addr": "0x09617f6fd6cf8a71278ec86e23bbab29c04353a7", "name": "ULT", "decimals": 18},
{"addr": "0x4CEdA7906a5Ed2179785Cd3A40A69ee8bc99C466", "name": "AION", "decimals": 8},
{"addr": "0x4162178B78D6985480A308B2190EE5517460406D", "name": "CLN", "decimals": 18},
{"addr": "0x7338809d1a2c6fbb6e755470ab2a28e8c5dac63c", "name": "OZR", "decimals": 18},


]

Expand Down