diff --git a/app/assets/coins-logo/bam.png b/app/assets/coins-logo/bam.png
new file mode 100644
index 0000000000..76537807fc
Binary files /dev/null and b/app/assets/coins-logo/bam.png differ
diff --git a/app/assets/coins-logo/bat.png b/app/assets/coins-logo/bat.png
new file mode 100644
index 0000000000..edf604749b
Binary files /dev/null and b/app/assets/coins-logo/bat.png differ
diff --git a/app/assets/coins-logo/coins.js b/app/assets/coins-logo/coins.js
index ce0c79c47f..04782331cd 100644
--- a/app/assets/coins-logo/coins.js
+++ b/app/assets/coins-logo/coins.js
@@ -23,5 +23,7 @@ require("file-loader?name=coins-logo/[name].png!./wca.png");
require("file-loader?name=coins-logo/[name].png!./camino.png");
require("file-loader?name=coins-logo/[name].png!./ojx.png");
require("file-loader?name=coins-logo/[name].png!./donr.png");
+require("file-loader?name=coins-logo/[name].png!./bat.png");
+require("file-loader?name=coins-logo/[name].png!./bam.png");
require("file-loader?name=coins-logo/[name].png!./pzm.png");
diff --git a/app/assets/locales/locale-en.json b/app/assets/locales/locale-en.json
index c25e7a6330..fa0408ee76 100644
--- a/app/assets/locales/locale-en.json
+++ b/app/assets/locales/locale-en.json
@@ -3062,6 +3062,16 @@
"t2": "and our teams initiates the listing procedure, that includes gateway creation and set up of the trading pairs for the asset.",
"t3": "Please note that the RuDEX team reserves the right to delist assets to protect our own interests and the interests of our customers."
},
+ "terms": {
+ "t1": "If your token is included in the voting section for subsequent listing, then the target amount of DONATE tokens for its implementation will be formed according to the following rule:",
+ "t2": "The amount is determined by the position in the rating on CoinMarketCap – the higher the rating, the lower the required amount; you can see the target for each range in parentheses.",
+ "tu1": "1-100 (3000 DONATE)",
+ "tu2": "101-300 (4000 DONATE)",
+ "tu3": "301-500 (5000 DONATE)",
+ "tu4": "500-1000 (7000 DONATE)",
+ "tu5": "1001 и ниже (10000 DONATE)",
+ "t3": "For BEP20 / ERC20 / TRC20 tokens the amount is also determined by the list above, however, for those below the top 300, the target amount will be 5000 DONATE."
+ },
"rules": {
"header": "Checklist for asset listing on RuDEX:",
"rule_1": "Please check ",
diff --git a/app/assets/locales/locale-ru.json b/app/assets/locales/locale-ru.json
index e8cd1ce881..6b814baa7f 100644
--- a/app/assets/locales/locale-ru.json
+++ b/app/assets/locales/locale-ru.json
@@ -3081,6 +3081,16 @@
"t2": "сжигаются, а наша команда приступает непосредственно к процедуре листинга, включающей запуск шлюза и настройку торговых пар для данного токена.",
"t3": "Обратите внимание что команда RuDEX оставляет за собой право делистинга токенов с целью защиты собственных интересов и интересов пользователей."
},
+ "terms": {
+ "t1": "Если ваш токен будет включен в раздел голосования для последующего листинга, то целевая сумма сбора в токенах DONATE для его осуществления будет формироваться по следующему правилу:",
+ "t2": "Сумма определяется по месту нахождения в рейтинге на CoinMarketCap – чем рейтинг выше, тем нужная сумма меньше; в скобках указана цель для каждого диапазона.",
+ "tu1": "1-100 (3000 DONATE)",
+ "tu2": "101-300 (4000 DONATE)",
+ "tu3": "301-500 (5000 DONATE)",
+ "tu4": "500-1000 (7000 DONATE)",
+ "tu5": "1001 и ниже (10000 DONATE)",
+ "t3": "Для токенов BEP20 / ERC20/ TRC20 сумма также определяется по списку выше, однако для тех из них, что находятся в рейтинге ниже топ-300, целевая сумма составит 5000 DONATE."
+ },
"rules": {
"header": "Порядок размещения актива на RuDEX:",
"rule_1": "Изучите ",
diff --git a/app/assets/stylesheets/themes/_theme-template.scss b/app/assets/stylesheets/themes/_theme-template.scss
index 2ccb81d790..0a93ed6ea5 100644
--- a/app/assets/stylesheets/themes/_theme-template.scss
+++ b/app/assets/stylesheets/themes/_theme-template.scss
@@ -2820,33 +2820,33 @@ div.customizable-column--selector--dropdown {
padding: 5px;
}
-@media only all and (max-width: 1040px) {
+@media only all and (max-width: 870px) {
.footer .footer-support {
display: none !important;
}
}
-@media only all and (max-width: 920px) {
+@media only all and (max-width: 770px) {
.footer .footer-listing {
display: none !important;
}
}
-@media only all and (max-width: 840px) {
- .footer .logo {
+@media only all and (max-width: 690px) {
+ .footer .footer-audit {
display: none !important;
}
}
-@media only all and (max-width: 770px) {
- .footer .footer-audit {
+@media only all and (max-width: 640px) {
+ .footer .logo {
display: none !important;
}
}
-@media only all and (max-width: 680px) {
+@media only all and (max-width: 480px) {
.footer[class*="grid-block"]:not(.ng-hide) {
- display: none !important;
+ //display: none !important;
}
}
diff --git a/app/branding.js b/app/branding.js
index fb92aea608..7301745414 100644
--- a/app/branding.js
+++ b/app/branding.js
@@ -466,7 +466,7 @@ export function getListingCoins() {
ticker: "ZEC",
page: "https://z.cash/",
account: "rudex-zec",
- goal: 2000,
+ goal: 3000,
votes: 0
},
{
@@ -474,7 +474,7 @@ export function getListingCoins() {
ticker: "ADM",
page: "https://adamant.im",
account: "rudex-adamant",
- goal: 8000,
+ goal: 10000,
votes: 0
},
{
@@ -482,7 +482,7 @@ export function getListingCoins() {
ticker: "HIVE",
page: "https://hive.io",
account: "rudex-hive",
- goal: 3000,
+ goal: 4000,
votes: 0
},
{
@@ -498,7 +498,7 @@ export function getListingCoins() {
ticker: "DASH",
page: "https://www.dash.org",
account: "rudex-dash",
- goal: 2000,
+ goal: 3000,
votes: 0
},
{
@@ -506,7 +506,7 @@ export function getListingCoins() {
ticker: "DOGE",
page: "https://dogecoin.com",
account: "rudex-dogecoin",
- goal: 2000,
+ goal: 3000,
votes: 0
},
{
@@ -514,7 +514,7 @@ export function getListingCoins() {
ticker: "TLOS",
page: "https://www.telos.net",
account: "rudex-telos",
- goal: 3000,
+ goal: 5000,
votes: 0
},
{
@@ -522,7 +522,7 @@ export function getListingCoins() {
ticker: "ARK",
page: "https://ark.io",
account: "rudex-ark",
- goal: 3000,
+ goal: 5000,
votes: 0
},
{
@@ -530,7 +530,7 @@ export function getListingCoins() {
page: "https://cri.network",
ticker: "CRI",
account: "rudex-cri",
- goal: 10000,
+ goal: 5000,
votes: 0
},
{
@@ -596,6 +596,22 @@ export function getListingCoins() {
account: "rudex-donr",
goal: 5000,
votes: 0
+ },
+ {
+ name: "Basic Attention Token",
+ ticker: "BAT",
+ page: "https://basicattentiontoken.org",
+ account: "rudex-bat",
+ goal: 3000,
+ votes: 0
+ },
+ {
+ name: "JustBam",
+ ticker: "BAM",
+ page: "https://bam.justbam.money",
+ account: "rudex-bam",
+ goal: 5000,
+ votes: 0
}
//Disabled
diff --git a/app/components/Account/AccountVesting.jsx b/app/components/Account/AccountVesting.jsx
index 4239d0731c..ca7fd49b18 100644
--- a/app/components/Account/AccountVesting.jsx
+++ b/app/components/Account/AccountVesting.jsx
@@ -9,6 +9,7 @@ import {Button} from "bitshares-ui-style-guide";
import PaginatedList from "components/Utility/PaginatedList";
import SearchInput from "../Utility/SearchInput";
import counterpart from "counterpart";
+import {Link} from "react-router-dom";
class AccountVesting extends React.Component {
constructor(props) {
@@ -355,6 +356,13 @@ class AccountVesting extends React.Component {