Skip to content

Commit

Permalink
3.3.211011
Browse files Browse the repository at this point in the history
- gpUSD default to /borrow
- change borow-icon dezign
- fix paper-wallet_header
- add api node (xchng)
- change listing goals
  • Loading branch information
serdrdoor committed Oct 11, 2021
1 parent 53f03a0 commit bc2be67
Show file tree
Hide file tree
Showing 10 changed files with 69 additions and 145 deletions.
8 changes: 8 additions & 0 deletions app/api/apiConfig.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,14 @@ export const settingsAPIs = {
operator: "Witness: graphene-lab",
contact: "telegram:Denis_GL"
},
{
url: "wss://gph-api.xchng.finance",
region: "Finland",
country: "Finland",
location: "Helsinki",
operator: "Witness: xchng",
contact: "telegram:Lososeg"
},
{
url: "wss://node.hk.graphene.fans",
region: "Eastern Asia",
Expand Down
83 changes: 2 additions & 81 deletions app/assets/icons/borrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/icons/paper-wallet-header.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion app/assets/locales/locale-ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -2226,7 +2226,7 @@
"borrow": {
"borrow_tooltip": "Вы также можете найти эту функцию на своей инфопанели во вкладке «Маржинальные позиции» или нажав «Занять» на бирже",
"choose": " Выберите SmartCoin, для которого вы хотите создать позицию",
"description": "Займите gpAsset у блокчейна Graphene путем блокировки в нем залогового обеспечения (например, gpUSD, gpCNY и т.д.)",
"description": "Займите gpAsset у блокчейна Graphene путем блокировки в нем залогового обеспечения (например, gpUSD, gpRUB и т.д.)",
"do_it": " Сделаем это!",
"get_started": " Начало работы",
"navigate_with_keys": " Механизм генерации SmartCoin будет объяснен в следующих шагах. Вы также можете использовать клавиши со стрелками для навигации",
Expand Down
107 changes: 51 additions & 56 deletions app/branding.js
Original file line number Diff line number Diff line change
Expand Up @@ -293,13 +293,13 @@ export function getFeaturedMarkets(quotes = []) {

["RUDEX.BTC", "GPH"],
["RUDEX.BTC", "RUDEX.PPY"],
["RUDEX.BTC", "RUDEX.NBS"],
//["RUDEX.BTC", "RUDEX.NBS"],
["RUDEX.BTC", "RUDEX.ETH"],
["RUDEX.BTC", "RUDEX.XMR"],
["RUDEX.BTC", "RUDEX.EOS"],
["RUDEX.BTC", "RUDEX.GOLOS"],
["RUDEX.BTC", "RUDEX.STEEM"],
["RUDEX.BTC", "RUDEX.WLS"],
//["RUDEX.BTC", "RUDEX.WLS"],
//["RUDEX.BTC", "RUDEX.SMOKE"], delisted
["RUDEX.BTC", "RUDEX.BTS"],
["RUDEX.BTC", "RUDEX.TRX"],
Expand Down Expand Up @@ -403,96 +403,91 @@ export function getListingCoins() {
votes: 0
},*/
{
name: "Litecoin",
ticker: "LTC",
account: "rudex-litecoin",
goal: 5000,
name: "Idena",
ticker: "DNA",
account: "rudex-idena",
goal: 10000,
votes: 0
},
{
name: "Dogecoin",
ticker: "DOGE",
account: "rudex-dogecoin",
goal: 5000,
name: "Zcash",
ticker: "ZEC",
account: "rudex-zec",
goal: 2000,
votes: 0
},
{
name: "Dash",
ticker: "DASH",
account: "rudex-dash",
goal: 5000,
name: "ADAMANT Messenger",
ticker: "ADM",
account: "rudex-adamant",
goal: 8000,
votes: 0
},
/* {
name: "Waves",
ticker: "WAVES",
account: "rudex-waves",
goal: 10000,
votes: 0
},*/
{
name: "Telos",
ticker: "TLOS",
account: "rudex-telos",
goal: 5000,
name: "Hive",
ticker: "HIVE",
account: "rudex-hive",
goal: 3000,
votes: 0
},
/* {
name: "Tron",
ticker: "TRX",
account: "rudex-tron",
goal: 10000,
{
name: "Litecoin",
ticker: "LTC",
account: "rudex-litecoin",
goal: 2000,
votes: 0
},*/
},
{
name: "Minter Network",
ticker: "BIP",
account: "rudex-bip",
goal: 5000,
goal: 7000,
votes: 0
},
/* {
name: "Neo",
ticker: "NEO",
account: "rudex-neo",
goal: 10000,
{
name: "Dogecoin",
ticker: "DOGE",
account: "rudex-dogecoin",
goal: 2000,
votes: 0
},*/
},
{
name: "Idena",
ticker: "DNA",
account: "rudex-idena",
goal: 10000,
name: "Telos",
ticker: "TLOS",
account: "rudex-telos",
goal: 2000,
votes: 0
},
{
name: "Zcash",
ticker: "ZEC",
account: "rudex-zec",
name: "Dash",
ticker: "DASH",
account: "rudex-dash",
goal: 2000,
votes: 0
}

//Disabled
/*{
name: "Waves",
ticker: "WAVES",
account: "rudex-waves",
goal: 10000,
votes: 0
},
{
name: "Hive",
ticker: "HIVE",
account: "rudex-hive",
name: "Neo",
ticker: "NEO",
account: "rudex-neo",
goal: 10000,
votes: 0
},
/* {
{
name: "Revain",
ticker: "REV",
account: "rudex-revain",
goal: 10000,
votes: 0
}*/
{
name: "ADAMANT Messenger",
ticker: "ADM",
account: "rudex-adamant",
goal: 8000,
votes: 0
}
];
}

Expand Down
4 changes: 2 additions & 2 deletions app/components/Showcases/Borrow.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class Borrow extends Component {
super();
this.state = {
isBorrowBaseModalVisible: false,
selectedAsset: null,
selectedAsset: "1.3.27",
step: 0
};
this.steps = [
Expand Down Expand Up @@ -148,7 +148,7 @@ class Borrow extends Component {
}}
assets={[
"1.3.27" // gpUSD
/* "1.3.120",
/*"1.3.120",
"1.3.121",
"1.3.1325",
"1.3.105",
Expand Down
2 changes: 1 addition & 1 deletion app/lib/common/paperWallet.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ const _createPaperWalletAsPDF = function(

Promise.all(content).then(() => {
pdf.save(
"bitshares" +
"graphene" +
"-paper-wallet-" +
(locked ? "public-" : "private-") +
accountName +
Expand Down
4 changes: 2 additions & 2 deletions app/lib/common/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -439,8 +439,8 @@ var Utils = {
}
if (!dynGlobalObject) {
// mainnet estimation
head_block = 37025190;
head_block_time = new Date("2019-04-30T07:55:24Z");
head_block = 4418454;
head_block_time = new Date("2021-09-13T10:00:12Z");
} else {
head_block = dynGlobalObject.get("head_block_number");
head_block_time = new Date(dynGlobalObject.get("time") + "Z");
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "RuDEX3-light",
"version": "3.3.210910",
"version": "3.3.211011",
"description": "Advanced wallet interface for the Graphene financial blockchain.",
"homepage": "https://github.com/blckchnd/rudex-ui",
"author": "RuDEX Team <[email protected]>",
Expand Down

0 comments on commit bc2be67

Please sign in to comment.