[DDW-911] Update newsfeed JSON and verification files hosting URLs (i…

…nput-output-hk#1580) * [DDW-911] Remove 'v' from Daedalus version on Automatic update overlay * [DDW-911] Update newsfeed JSON and verification files hosting URLs
fstoqnov-iohk · Oct 11, 2019 · a28b128 · a28b128
1 parent 7e9b0cb
commit a28b128
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,7 @@ Changelog
 
 ### Features
 
-- Implemented "Newsfeed" feature ([PR 1570](https://github.com/input-output-hk/daedalus/pull/1570), [PR 1578](https://github.com/input-output-hk/daedalus/pull/1578))
+- Implemented "Newsfeed" feature ([PR 1570](https://github.com/input-output-hk/daedalus/pull/1570), [PR 1578](https://github.com/input-output-hk/daedalus/pull/1578), [PR 1580](https://github.com/input-output-hk/daedalus/pull/1580))
 - Implemented "Wallet recovery phrase verification" feature ([PR 1565](https://github.com/input-output-hk/daedalus/pull/1565))
 - Implemented new "Automated update" notification design ([PR 1491](https://github.com/input-output-hk/daedalus/pull/1491))
 - Improved "Wallets" list scrollbar UX ([PR 1475](https://github.com/input-output-hk/daedalus/pull/1475))

diff --git a/source/renderer/app/components/notifications/AutomaticUpdateNotification.js b/source/renderer/app/components/notifications/AutomaticUpdateNotification.js
@@ -16,7 +16,7 @@ const messages = defineMessages({
   descriptionLine1: {
     id: 'automaticUpdate.description1',
     defaultMessage:
-      '!!!You are currently running Daedalus <b>v {currentAppVersion}</b> and <b>{nextAppVersion}</b> is available.',
+      '!!!You are currently running Daedalus <b>{currentAppVersion}</b> and <b>{nextAppVersion}</b> is available.',
     description: 'First description line of "Automatic update" overlay',
   },
   descriptionLine2: {
@@ -83,9 +83,9 @@ export default class AutomaticUpdateNotification extends Component<Props> {
                 {...messages.descriptionLine1}
                 values={{
                   currentAppVersion,
-                  nextUpdateVersion: nextUpdateVersion
-                    ? `v ${nextUpdateVersion}`
-                    : formatMessage(messages.newerVersionlabel),
+                  nextUpdateVersion:
+                    nextUpdateVersion ||
+                    formatMessage(messages.newerVersionlabel),
                 }}
               />
             </p>

diff --git a/source/renderer/app/config/urlsConfig.js b/source/renderer/app/config/urlsConfig.js
@@ -14,15 +14,15 @@ export const TESTNET_LATEST_VERSION_INFO_URL =
   'updates-cardano-testnet.s3.amazonaws.com';
 export const STAGING_LATEST_VERSION_INFO_URL = 'update-awstest.iohkdev.io';
 
-export const DEVELOPMENT_NEWS_URL = 'daedalus.io';
-export const MAINNET_NEWS_URL = 'daedalus.io';
-export const TESTNET_NEWS_URL = 'daedalus.io';
-export const STAGING_NEWS_URL = 'daedalus.io';
+export const DEVELOPMENT_NEWS_URL = 'newsfeed.daedalus.io';
+export const MAINNET_NEWS_URL = 'newsfeed.daedalus.io';
+export const TESTNET_NEWS_URL = 'newsfeed.daedalus.io';
+export const STAGING_NEWS_URL = 'newsfeed.daedalus.io';
 
-export const DEVELOPMENT_NEWS_HASH_URL = 'daedaluswallet.io';
-export const MAINNET_NEWS_HASH_URL = 'daedaluswallet.io';
-export const TESTNET_NEWS_HASH_URL = 'daedaluswallet.io';
-export const STAGING_NEWS_HASH_URL = 'daedaluswallet.io';
+export const DEVELOPMENT_NEWS_HASH_URL = 'newsfeed.daedaluswallet.io';
+export const MAINNET_NEWS_HASH_URL = 'newsfeed.daedaluswallet.io';
+export const TESTNET_NEWS_HASH_URL = 'newsfeed.daedaluswallet.io';
+export const STAGING_NEWS_HASH_URL = 'newsfeed.daedaluswallet.io';
 
 export const ALLOWED_EXTERNAL_HOSTNAMES = [
   MAINNET_EXPLORER_URL,

diff --git a/source/renderer/app/i18n/locales/defaultMessages.json b/source/renderer/app/i18n/locales/defaultMessages.json
@@ -1186,7 +1186,7 @@
         }
       },
       {
-        "defaultMessage": "!!!You are currently running Daedalus <b>v {currentAppVersion}</b> and <b>{nextAppVersion}</b> is available.",
+        "defaultMessage": "!!!You are currently running Daedalus <b>{currentAppVersion}</b> and <b>{nextAppVersion}</b> is available.",
         "description": "First description line of \"Automatic update\" overlay",
         "end": {
           "column": 3,

diff --git a/source/renderer/app/i18n/locales/en-US.json b/source/renderer/app/i18n/locales/en-US.json
@@ -18,7 +18,7 @@
   "api.errors.WalletAlreadyRestoredError": "Wallet you are trying to restore already exists.",
   "api.errors.WalletFileImportError": "Wallet could not be imported, please make sure you are providing a correct file.",
   "automaticUpdate.accept.button.label": "Restart Daedalus and Update",
-  "automaticUpdate.description1": "You are currently running Daedalus <b>v {currentAppVersion}</b> and <b>{nextUpdateVersion}</b> is available.",
+  "automaticUpdate.description1": "You are currently running Daedalus <b>{currentAppVersion}</b> and <b>{nextUpdateVersion}</b> is available.",
   "automaticUpdate.description2": "Would you like to install the update? If choose to postpone, the update will be installed automatically on the next Daedalus launch.",
   "automaticUpdate.newerVersion.label": "a newer version",
   "automaticUpdate.postpone.button.label": "Postpone until Daedalus restart",

diff --git a/source/renderer/app/i18n/locales/ja-JP.json b/source/renderer/app/i18n/locales/ja-JP.json
@@ -18,7 +18,7 @@
   "api.errors.WalletAlreadyRestoredError": "復元しようとしているウォレットは既に存在します",
   "api.errors.WalletFileImportError": "ウォレットをインポートできませんでした。有効なファイルを指定していることを確認してください",
   "automaticUpdate.accept.button.label": "Daedalusを再起動して更新する",
-  "automaticUpdate.description1": "現在実行中のDaedalus <b>v {currentAppVersion}</b> は <b>{nextUpdateVersion}</b> に更新できます。",
+  "automaticUpdate.description1": "現在実行中のDaedalus <b>{currentAppVersion}</b> は <b>{nextUpdateVersion}</b> に更新できます。",
   "automaticUpdate.description2": "今すぐ最新版をインストールしますか。更新を保留すると、Daedalusを次回起動する時に自動的にインストールされます。",
   "automaticUpdate.newerVersion.label": "最新バージョン",
   "automaticUpdate.postpone.button.label": "Daedalusの次回起動時まで保留する",