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

Upgrade actix to v4.0.0-beta.4 (and associated fall-out) #317

Merged
merged 2 commits into from
Mar 26, 2021
Merged

Upgrade actix to v4.0.0-beta.4 (and associated fall-out) #317

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3978085
Upgrade actix to v4.0.0-beta.4 (and associated fall-out)
dvdplm Mar 25, 2021
11044db
oops
dvdplm Mar 25, 2021
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
Prev Previous commit
oops
  • Loading branch information
@dvdplm
dvdplm committed Mar 25, 2021
commit 11044dbd49a23472cbbc21e0c50bc2490bb60410
20 changes: 10 additions & 10 deletions frontend/src/Connection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,19 @@ export class Connection {
private static readonly address = Connection.getAddress();

private static getAddress(): string {
// const ENV_URL = 'SUBSTRATE_TELEMETRY_URL';
const ENV_URL = 'SUBSTRATE_TELEMETRY_URL';

// if (process.env && process.env[ENV_URL]) {
// return process.env[ENV_URL] as string;
// }
if (process.env && process.env[ENV_URL]) {
return process.env[ENV_URL] as string;
}

// if (window.process_env && window.process_env[ENV_URL]) {
// return window.process_env[ENV_URL];
// }
if (window.process_env && window.process_env[ENV_URL]) {
return window.process_env[ENV_URL];
}

// if (window.location.protocol === 'https:') {
// return `wss://${window.location.hostname}/feed/`;
// }
if (window.location.protocol === 'https:') {
return `wss://${window.location.hostname}/feed/`;
}

return `ws://127.0.0.1:8000/feed`;
}
Expand Down