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

Issue 2329 - Adds the word testnet to the node access pop up #2347

Merged
merged 2 commits into from
Dec 20, 2018
Merged

Issue 2329 - Adds the word testnet to the node access pop up #2347

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
b324fed
Adds the word TESTNET to footer when using a testnet node
Kennybll Dec 15, 2018
f63952d
Changes the testnet check
Kennybll Dec 20, 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: 3 additions & 0 deletions app/assets/stylesheets/themes/_theme-template.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2009,6 +2009,9 @@
}
.footer {
div.footer-status {
> span.testnet {
font-size: 0.85rem;
}
> span.success {
color: $success-color;
}
Expand Down
15 changes: 11 additions & 4 deletions app/components/Layout/Footer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,8 @@ class Footer extends React.Component {

const {props} = this;

const testNet = node.url.indexOf("testnet") !== -1;

let title = node.operator + " " + !!node.location ? node.location : "";
if ("country" in node) {
title = node.country + (!!title ? " - " + title : "");
Expand All @@ -201,7 +203,8 @@ class Footer extends React.Component {
ping:
node.url in props.apiLatencies
? props.apiLatencies[node.url]
: -1
: -1,
testNet
};
}

Expand Down Expand Up @@ -592,6 +595,11 @@ class Footer extends React.Component {
}}
>
<div className="footer-status">
{connected && activeNode.testNet && (
<span className="testnet">
<Translate content="settings.testnet_nodes" />{" "}
</span>
)}
{!connected ? (
<span className="warning">
<Translate content="footer.disconnected" />
Expand All @@ -611,9 +619,8 @@ class Footer extends React.Component {
{!connected
? "-"
: !activeNode.ping
? "-"
: activeNode.ping +
"ms"}
? "-"
: activeNode.ping + "ms"}
&nbsp;/&nbsp;
<span className="footer-block-title">
<Translate content="footer.block" />
Expand Down