Skip to content

Commit

Permalink
xds changes
Browse files Browse the repository at this point in the history
  • Loading branch information
thecrypt0hunter committed Jan 21, 2020
1 parent 5301665 commit 1c24ee3
Show file tree
Hide file tree
Showing 12 changed files with 28 additions and 27 deletions.
4 changes: 2 additions & 2 deletions StratisCore.UI/e2e/app.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ describe('stratis-core App', () => {
page = new AngularElectronPage();
});

it('Page title should be Obsidian Core', () => {
it('Page title should be XDS Core', () => {
page.navigateTo('/');
expect(page.getTitle()).toEqual('Obsidian Core');
expect(page.getTitle()).toEqual('XDS Core');
});
});
6 changes: 3 additions & 3 deletions StratisCore.UI/electron-builder.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"appId": "com.obsidian.core",
"productName": "Obsidian Core",
"appId": "com.xds.core",
"productName": "XDS Core",
"publish": null,
"directories": {
"output": "app-builds"
Expand Down Expand Up @@ -32,7 +32,7 @@
"target": [
"AppImage"
],
"synopsis": "ObsidianX Staking Wallet.",
"synopsis": "XDS Staking Wallet.",
"category": "Utility",
"artifactName": "${productName}-v${version}-${os}-${arch}.${ext}"
},
Expand Down
12 changes: 6 additions & 6 deletions StratisCore.UI/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ nodaemon = args.some(val => val === "--nodaemon" || val === "-nodaemon");

let apiPort;
if (testnet && !sidechain) {
apiPort = 47221;
apiPort = 48334;
} else if (!testnet && !sidechain) {
apiPort = 47221;
apiPort = 48334;
} else if (sidechain && testnet) {
apiPort = 38225;
} else if (sidechain && !testnet) {
Expand Down Expand Up @@ -55,7 +55,7 @@ function createWindow() {
frame: true,
minWidth: 1150,
minHeight: 650,
title: "Obsidian Core",
title: "XDS Core",
webPreferences: {
webSecurity: false
},
Expand Down Expand Up @@ -107,7 +107,7 @@ app.on('ready', () => {
if (sidechain && !nodaemon) {
startDaemon("Stratis.SidechainD");
} else if (!nodaemon) {
startDaemon("Obsidian.OxD")
startDaemon("Daemon")
}
}
createTray();
Expand Down Expand Up @@ -185,7 +185,7 @@ function startDaemon(daemonName) {
});

daemonProcess.stdout.on('data', (data) => {
writeLog(`Obsidian: ${data}`);
writeLog(`XDS: ${data}`);
});
}

Expand Down Expand Up @@ -213,7 +213,7 @@ function createTray() {
}
}
]);
systemTray.setToolTip('Obsidian Core');
systemTray.setToolTip('XDS Core');
systemTray.setContextMenu(contextMenu);
systemTray.on('click', function() {
if (!mainWindow.isVisible()) {
Expand Down
14 changes: 7 additions & 7 deletions StratisCore.UI/package.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{
"name": "obsidian-core",
"description": "Obsidian Core Wallet",
"name": "XDS-core",
"description": "XDS Core Wallet",
"version": "1.0.1",
"author": {
"name": "Obsidian Platform",
"email": "support@Obsidian.com"
"name": "XDS Platform",
"email": "support@XDS.com"
},
"license": "MIT",
"homepage": "https://github.com/Obsidian/ObsidianCore",
"homepage": "https://github.com/sonofsatoshi2020/xds.git",
"keywords": [
"fullnode",
"ui",
"obsidian",
"obsidianplatform",
"XDS",
"XDSplatform",
"core",
"bitcoin",
"angular",
Expand Down
4 changes: 2 additions & 2 deletions StratisCore.UI/src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@ export class AppComponent implements OnInit, OnDestroy {
}

private setTitle() {
let applicationName = "Obsidian Core";
let applicationName = "XDS Core";
let applicationVersion = this.globalService.getApplicationVersion();
let newTitle = applicationName + " " + applicationVersion;
this.titleService.setTitle(newTitle);
}

public openSupport() {
this.electronService.shell.openExternal("https://github.com/obsidianproject");
this.electronService.shell.openExternal("https://github.com/sonofsatoshi2020/xds.git");
}
}
4 changes: 2 additions & 2 deletions StratisCore.UI/src/app/shared/services/global.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ export class GlobalService {
private applicationVersion: string = "3.0.0";
private testnet: boolean = false;
private sidechain: boolean = false;
private mainApiPort: number = 47221;
private testApiPort: number = 47221;
private mainApiPort: number = 48334;
private testApiPort: number = 48334;
private mainSideChainApiPort: number = 38225;
private testSideChainApiPort: number = 38225;
private apiPort: number;
Expand Down
2 changes: 1 addition & 1 deletion StratisCore.UI/src/app/wallet/receive/receive.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ export class ReceiveComponent {
response => {
this.address = response;
// TODO: fix this later to use the actual sidechain name instead of 'cirrus'
const networkName = this.globalService.getSidechainEnabled() ? 'cirrus' : 'Obsidian';
const networkName = this.globalService.getSidechainEnabled() ? 'cirrus' : 'XDS';
this.qrString = `${networkName}:${response}`;
}
);
Expand Down
2 changes: 1 addition & 1 deletion StratisCore.UI/src/app/wallet/send/send.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ export class SendComponent implements OnInit, OnDestroy {
'amount': {
'required': 'An amount is required.',
'pattern': 'Enter a valid transaction amount. Only positive numbers and no more than 8 decimals are allowed.',
'min': "The amount has to be more or equal to 0.00001 Obsidian.",
'min': "The amount has to be more or equal to 0.00001 XDS.",
'max': 'The total transaction amount exceeds your spendable balance.'
},
'fee': {
Expand Down
2 changes: 1 addition & 1 deletion StratisCore.UI/src/app/wallet/split/split.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ export class SplitComponent implements OnInit, OnDestroy {
'amount': {
'required': 'An amount is required.',
'pattern': 'Enter a valid transaction amount. Only positive numbers and no more than 8 decimals are allowed.',
'min': "The amount has to be more or equal to 0.00001 Obsidian.",
'min': "The amount has to be more or equal to 0.00001 XDS.",
'max': 'The total transaction amount exceeds your spendable balance.'
},
'password': {
Expand Down
2 changes: 1 addition & 1 deletion StratisCore.UI/src/assets/images/license_en.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ By installing this software the user agrees to all of the following:

That this software is an experimental release and any use of it shall be at the users own discretion and risk.
That the sole and exclusive remedy for any problem(s), malfunctions or defects in the product, software and / or service shall be to uninstall and/or to stop using it .
In no event shall Obsidian, its officers, shareholders, investors, employees, agents, directors, subsidiaries, affiliates, successors, assignees or suppliers be liable for
In no event shall XDS, its officers, shareholders, investors, employees, agents, directors, subsidiaries, affiliates, successors, assignees or suppliers be liable for
Any indirect, incidental, punitive, exemplary or consequential damages
Any loss of data, use, sales, business (including profits) whether direct or indirect in any and all cases arising out of use or inability to use the software including any form of security breach, hack or attack.
Any loss, errors, omissions or misplacement of coins or any other digital asset transacted through the software or otherwise.
Expand Down
2 changes: 1 addition & 1 deletion StratisCore.UI/src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<base href="./">
<meta charset="utf-8">
<title>Obsidian Core</title>
<title>XDS Core</title>
<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
<link rel="icon" href="./assets/images/icon.ico" type="image/x-icon" />
</head>
Expand Down
1 change: 1 addition & 0 deletions X42-BlockCore
Submodule X42-BlockCore added at 9a37d8

0 comments on commit 1c24ee3

Please sign in to comment.