diff --git a/Scripts/Packager/build-linux-x64.sh b/Scripts/Packager/build-linux-x64.sh index 8140cb02..b52eb11d 100755 --- a/Scripts/Packager/build-linux-x64.sh +++ b/Scripts/Packager/build-linux-x64.sh @@ -22,7 +22,7 @@ dotnet --info # Initialize dependencies echo $log_prefix STARTED restoring dotnet and npm packages cd $build_directory -git submodule update --init --recursive +#git submodule update --init --recursive cd $build_directory/StratisCore.UI @@ -33,7 +33,7 @@ echo $log_prefix FINISHED restoring dotnet and npm packages # dotnet publish echo $log_prefix running 'dotnet publish' -cd $build_directory/xds/src/Xds +cd $build_directory/xds/XDS/src/XdsD #sudo dotnet clean #sudo dotnet restore sudo dotnet publish -c $configuration -r $os_platform-$arch -v m -o $build_directory/StratisCore.UI/daemon diff --git a/Scripts/Packager/build-win-x64.sh b/Scripts/Packager/build-win-x64.sh index 7bcd4ae2..7c6996d2 100755 --- a/Scripts/Packager/build-win-x64.sh +++ b/Scripts/Packager/build-win-x64.sh @@ -22,7 +22,7 @@ dotnet --info # Initialize dependencies echo $log_prefix STARTED restoring dotnet and npm packages cd $build_directory -git submodule update --init --recursive +#git submodule update --init --recursive cd $build_directory/StratisCore.UI @@ -35,7 +35,7 @@ echo $log_prefix FINISHED restoring dotnet and npm packages # dotnet publish echo $log_prefix running 'dotnet publish' -cd $build_directory/xds/src/Xds +cd $build_directory/xds/XDS/src/XdsD #dotnet clean #dotnet restore dotnet publish -c $configuration -r $os_platform-$arch -v m -o $build_directory/StratisCore.UI/daemon diff --git a/StratisCore.UI/e2e/app.e2e-spec.ts b/StratisCore.UI/e2e/app.e2e-spec.ts index a2d1a9d7..ca09bff2 100644 --- a/StratisCore.UI/e2e/app.e2e-spec.ts +++ b/StratisCore.UI/e2e/app.e2e-spec.ts @@ -8,8 +8,8 @@ describe('stratis-core App', () => { page = new AngularElectronPage(); }); - it('Page title should be XDS Core Wallet', () => { + it('Page title should be Trustaking XDS Core Wallet', () => { page.navigateTo('/'); - expect(page.getTitle()).toEqual('XDS Core Wallet'); + expect(page.getTitle()).toEqual('Trustaking XDS Core Wallet'); }); }); diff --git a/StratisCore.UI/electron-builder.json b/StratisCore.UI/electron-builder.json index 14f1dcd7..da06a011 100644 --- a/StratisCore.UI/electron-builder.json +++ b/StratisCore.UI/electron-builder.json @@ -1,6 +1,6 @@ { "appId": "com.xds.core", - "productName": "XDS Core Wallet", + "productName": "Trustaking XDS Core Wallet", "publish": null, "directories": { "output": "app-builds" diff --git a/StratisCore.UI/main.ts b/StratisCore.UI/main.ts index f8a284ef..c85008be 100644 --- a/StratisCore.UI/main.ts +++ b/StratisCore.UI/main.ts @@ -55,7 +55,7 @@ function createWindow() { frame: true, minWidth: 1150, minHeight: 650, - title: "XDS Core Wallet", + title: "Trustaking XDS Core Wallet", webPreferences: { webSecurity: false }, @@ -237,7 +237,7 @@ function createTray() { } } ]); - systemTray.setToolTip('XDS Core Wallet'); + systemTray.setToolTip('Trustaking XDS Core Wallet'); systemTray.setContextMenu(contextMenu); systemTray.on('click', function() { if (!mainWindow.isVisible()) { diff --git a/StratisCore.UI/package.json b/StratisCore.UI/package.json index d520f2d0..91c58126 100644 --- a/StratisCore.UI/package.json +++ b/StratisCore.UI/package.json @@ -1,14 +1,15 @@ { "name": "XDS-core", - "description": "XDS Core Wallet", - "version": "1.0.6", + "description": "Trustaking XDS Core Wallet", + "version": "1.0.7", "author": { - "name": "XDS Platform", - "email": "anon@XDS.com" + "name": "Trustaking Platform", + "email": "admin@trustaking.com" }, "license": "MIT", - "homepage": "https://github.com/sonofsatoshi2020/xds.git", + "homepage": "https://trustaking.com", "keywords": [ + "trustaking.com", "fullnode", "ui", "XDS", @@ -85,7 +86,7 @@ "core-js": "2.6.5", "electron": "4.1.1", "electron-builder": "20.39.0", - "electron-builder-squirrel-windows": "^22.4.1", + "electron-builder-squirrel-windows": "^22.5.1", "electron-reload": "1.4.0", "electron-winstaller": "^4.0.0", "http-server": "^0.11.1", diff --git a/StratisCore.UI/src/app/app.component.ts b/StratisCore.UI/src/app/app.component.ts index e1913f8b..55b8853a 100644 --- a/StratisCore.UI/src/app/app.component.ts +++ b/StratisCore.UI/src/app/app.component.ts @@ -75,7 +75,7 @@ export class AppComponent implements OnInit, OnDestroy { } private setTitle() { - let applicationName = "XDS Core Wallet"; + let applicationName = "Trustaking XDS Core Wallet"; let applicationVersion = this.globalService.getApplicationVersion(); let newTitle = applicationName + " " + applicationVersion; this.titleService.setTitle(newTitle); diff --git a/StratisCore.UI/src/app/login/login.component.html b/StratisCore.UI/src/app/login/login.component.html index 6090ef94..6e5e3d4a 100644 --- a/StratisCore.UI/src/app/login/login.component.html +++ b/StratisCore.UI/src/app/login/login.component.html @@ -3,7 +3,7 @@
-

 XDS Core Wallet

+

 Trustaking XDS Core Wallet

Secure Anonymous Messenger

diff --git a/StratisCore.UI/src/app/setup/create/confirm-mnemonic/confirm-mnemonic.component.html b/StratisCore.UI/src/app/setup/create/confirm-mnemonic/confirm-mnemonic.component.html index fd0c51f3..ba44992c 100644 --- a/StratisCore.UI/src/app/setup/create/confirm-mnemonic/confirm-mnemonic.component.html +++ b/StratisCore.UI/src/app/setup/create/confirm-mnemonic/confirm-mnemonic.component.html @@ -1,7 +1,7 @@
-

 XDS Core Wallet

+

 Trustaking XDS Core Wallet

Secure Anonymous Messenger

diff --git a/StratisCore.UI/src/app/setup/create/create.component.html b/StratisCore.UI/src/app/setup/create/create.component.html index 546cc58e..aca614c7 100644 --- a/StratisCore.UI/src/app/setup/create/create.component.html +++ b/StratisCore.UI/src/app/setup/create/create.component.html @@ -1,7 +1,7 @@
-

 XDS Core Wallet

+

 Trustaking XDS Core Wallet

Secure Anonymous Messenger

diff --git a/StratisCore.UI/src/app/setup/create/show-mnemonic/show-mnemonic.component.html b/StratisCore.UI/src/app/setup/create/show-mnemonic/show-mnemonic.component.html index bf9e21a5..b89a501c 100644 --- a/StratisCore.UI/src/app/setup/create/show-mnemonic/show-mnemonic.component.html +++ b/StratisCore.UI/src/app/setup/create/show-mnemonic/show-mnemonic.component.html @@ -1,7 +1,7 @@
-

 XDS Core Wallet

+

 Trustaking XDS Core Wallet

Secure Anonymous Messenger

diff --git a/StratisCore.UI/src/app/setup/recover/recover.component.html b/StratisCore.UI/src/app/setup/recover/recover.component.html index fcd6a088..ddf84253 100644 --- a/StratisCore.UI/src/app/setup/recover/recover.component.html +++ b/StratisCore.UI/src/app/setup/recover/recover.component.html @@ -1,7 +1,7 @@
-

 XDS Core Wallet

+

 Trustaking XDS Core Wallet

Secure Anonymous Messenger

diff --git a/StratisCore.UI/src/app/setup/setup.component.html b/StratisCore.UI/src/app/setup/setup.component.html index 855b185d..fc84e9f0 100644 --- a/StratisCore.UI/src/app/setup/setup.component.html +++ b/StratisCore.UI/src/app/setup/setup.component.html @@ -1,7 +1,7 @@
-

 XDS Core Wallet

+

 Trustaking XDS Core Wallet

Secure Anonymous Messenger

diff --git a/StratisCore.UI/src/app/wallet/dashboard/dashboard.component.html b/StratisCore.UI/src/app/wallet/dashboard/dashboard.component.html index f20cf3c2..db50b8b2 100644 --- a/StratisCore.UI/src/app/wallet/dashboard/dashboard.component.html +++ b/StratisCore.UI/src/app/wallet/dashboard/dashboard.component.html @@ -13,7 +13,6 @@

    -
  • {{ (awaitingMaturity | coinNotation) || (0 | coinNotation) }} (staking)
  • {{ (unconfirmedBalance | coinNotation) || (0 | coinNotation) }} {{ coinUnit }} (unconfirmed)
@@ -111,7 +110,7 @@

Latest Transactions

Details
-
+
diff --git a/StratisCore.UI/src/index.html b/StratisCore.UI/src/index.html index 55185134..89110840 100644 --- a/StratisCore.UI/src/index.html +++ b/StratisCore.UI/src/index.html @@ -3,7 +3,7 @@ - XDS Core Wallet + Trustaking XDS Core Wallet diff --git a/xds b/xds index 393fe3e7..4882013d 160000 --- a/xds +++ b/xds @@ -1 +1 @@ -Subproject commit 393fe3e764c07759c9641124c578bdccd5fa7857 +Subproject commit 4882013de20a357017c73820bd9ed9635d75b3e4