Merge pull request #720 from dmytroshch/feature/update-logo

(feature) Update logo
bitfinexcom · Nov 14, 2024 · 4cf25ce · 4cf25ce
2 parents 654b6c9 + 0f2167c
commit 4cf25ce
Show file tree

Hide file tree

Showing 28 changed files with 160 additions and 188 deletions.
diff --git a/public/HF-icon.png b/public/HF-icon.png
diff --git a/public/HF-logo.png b/public/HF-logo.png
diff --git a/public/favicon-16x16.png b/public/favicon-16x16.png
diff --git a/public/favicon-32x32.png b/public/favicon-32x32.png
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/locales/en-US/translations.json b/public/locales/en-US/translations.json
@@ -440,12 +440,9 @@
     "title": "Atomic Orders",
     "noOrders": "No active atomic orders"
   },
-  "badConnectionModal": {
-    "title": "Connection issue",
-    "description": "There has been a connection issue, all running strategies and algorithmic orders have been cancelled.",
-    "checkbox": "{{action}} automatically",
-    "reboot": "Reboot",
-    "restart": "Restart"
+  "longTermClosedSessionModal": {
+    "title": "Warning - session closed for too long",
+    "description": "The connection to Bitfinex has been down for over 30 minutes, this might have brought instabilities to your trading operations. <bold>Please review carefully all your current trading activity on LIVE mode.</bold>"
   },
   "noConnectionActionModal": {
     "title": "Connection issue",
@@ -920,7 +917,8 @@
     "launchNoSave": "Launch without saving",
     "updateAndRestart": "Update and Restart",
     "saveAndContinue": "Save and Continue",
-    "starred": "Starred"
+    "starred": "Starred",
+    "continueToApp": "Continue to the App"
   },
   "crashHandler": {
     "text1": "An error occurred that caused the Bitfinex Honey UI to halt. Please, restart the application to proceed working with it",

diff --git a/public/locales/es-EM/translations.json b/public/locales/es-EM/translations.json
@@ -358,16 +358,6 @@
     "title": "Órdenes Atómicas",
     "noOrders": "Sin órdenes atómicas activas"
   },
-  "badConnectionModal": {
-    "title": "Error de conexión",
-    "text1": "Hemos notado varios problemas de conexión a internet. Es necesario {{action}} la aplicación para continuar con el funcionamiento normal.",
-    "text2": "Asegúrate de tener una conexión a internet estable y buena.",
-    "text3": "Bitfinex Honey hará {{action}} después de presionar 'Aceptar'.",
-    "text4": "La aplicación hará {{action}} automáticamente en {{countdown}} segundos.",
-    "checkbox": "{{action}} automáticamente",
-    "reboot": "reiniciar",
-    "restart": "Reiniciar"
-  },
   "balancesTableModal": {
     "title": "Balances",
     "hideZeroCheckbox": "Ocultar Balances Cero",

diff --git a/public/locales/pt-BR/translations.json b/public/locales/pt-BR/translations.json
@@ -358,16 +358,6 @@
     "title": "Ordens Atomic",
     "noOrders": "Nenhuma ordem atomic ativa"
   },
-  "badConnectionModal": {
-    "title": "Problema com a conexão",
-    "text1": "Notamos vários problemas de conexão com a internet. É necessário {{action}} o aplicativo para que ele continue a funcionar normalmente.",
-    "text2": "Certifique-se de ter uma conexão com a internet estável e boa.",
-    "text3": "O Bitfinex Honey irá {{action}} depois de você pressionar \"Ok\".",
-    "text4": "O aplicativo irá {{action}} automaticamente em {{countdown}} segundos.",
-    "checkbox": "{{action}} automaticamente",
-    "reboot": "reiniciar",
-    "restart": "Reiniciar"
-  },
   "balancesTableModal": {
     "title": "Saldos",
     "hideZeroCheckbox": "Ocultar saldos de Zero",

diff --git a/public/locales/ru-RU/translations.json b/public/locales/ru-RU/translations.json
@@ -358,16 +358,6 @@
     "title": "Atomic ордеры",
     "noOrders": "Нет активных atomic ордеров"
   },
-  "badConnectionModal": {
-    "title": "Не удалось подключиться",
-    "text1": "Мы заметили проблемы с подключением к Интернету. Для продолжения нормальной работы необходимо выполнить {{action}} приложения.",
-    "text2": "Убедитесь, что у вас стабильное и хорошее интернет-соединение.",
-    "text3": "Bitfinex Honey совершит {{action}} после того, как вы нажмете «ОК».",
-    "text4": "Приложение автоматически совершит {{action}} через {{countdown}} секунд.",
-    "checkbox": "совершать {{action}} автоматически",
-    "reboot": "перезагрузку",
-    "restart": "Перезапуск"
-  },
   "balancesTableModal": {
     "title": "Балансы",
     "hideZeroCheckbox": "Скрыть небольшие остатки",

diff --git a/public/locales/tr-TR/translations.json b/public/locales/tr-TR/translations.json
@@ -358,16 +358,6 @@
     "title": "Atomic Orders",
     "noOrders": "No active atomic orders"
   },
-  "badConnectionModal": {
-    "title": "Connection issue",
-    "text1": "Birkaç internet bağlantısı sorunu fark ettik. Normal çalışmaya devam edebilmek için uygulamanın {{action}} yapılması gerekir.",
-    "text2": "Please make sure you have stable and good internet connection.",
-    "text3": "Bitfinex Honey, siz 'Tamam' a bastıktan sonra {{action}} yapacaktır.",
-    "text4": "Uygulama, {{countdown}} saniye içinde otomatik olarak {{action}} yapacaktır.",
-    "checkbox": "Otomatik olarak {{action}}",
-    "reboot": "yeniden başlat",
-    "restart": "Yeniden Başlat"
-  },
   "balancesTableModal": {
     "title": "Balances",
     "hideZeroCheckbox": "Hide Zero Balances",

diff --git a/public/locales/zh-CN/translations.json b/public/locales/zh-CN/translations.json
@@ -358,16 +358,6 @@
     "title": "自动订单",
     "noOrders": "无待成交自动订单"
   },
-  "badConnectionModal": {
-    "title": "连接问题",
-    "text1": "我们注意到数次连接问题。此需{{action}} 应用程式以继续正常运作。",
-    "text2": "请确保您有稳定且良好的网路连接",
-    "text3": "点击Okay后，将{{action}} Bitfinex Honey。",
-    "text4": "将于{{countdown}} 秒内，自动{{action}} 应用程式。",
-    "checkbox": "自动{{action}}",
-    "reboot": "重新启用",
-    "restart": "重新开始"
-  },
   "balancesTableModal": {
     "title": "余额",
     "hideZeroCheckbox": "隐藏无余额",

diff --git a/public/locales/zh-TW/translations.json b/public/locales/zh-TW/translations.json
@@ -358,16 +358,6 @@
     "title": "自動訂單",
     "noOrders": "無待執行的自動訂單"
   },
-  "badConnectionModal": {
-    "title": "連線問題",
-    "text1": "網路連線發生問題。 請 {{action}} 應用程序以恢復正常運作。",
-    "text2": "請確保您的網路連線狀態穩定且良好。",
-    "text3": "按下「Okay」後，Bitfinex Honey 將 {{action}}。",
-    "text4": "此應用程序將在 {{countdown}} 秒後自動 {{action}}。",
-    "checkbox": "自動 {{action}}",
-    "reboot": "重新加載",
-    "restart": "重新啟動"
-  },
   "balancesTableModal": {
     "title": "餘額",
     "hideZeroCheckbox": "隱藏0餘額",

diff --git a/src/components/Navbar/style.scss b/src/components/Navbar/style.scss
@@ -32,9 +32,9 @@ body.hosted {
   transition: margin-top 0.2s ease-in;
 
   .hfui-navbar__logo {
-    width: 83px;
-    margin-right: spacing();
+    margin-right: spacing(0.5);
     height: 100%;
+    width: 100px;
   }
 
   &.marginTop {

diff --git a/src/modals/BadConnectionModal/BadConnectionModal.container.js b/src/modals/BadConnectionModal/BadConnectionModal.container.js
diff --git a/src/modals/BadConnectionModal/BadConnectionModal.js b/src/modals/BadConnectionModal/BadConnectionModal.js
diff --git a/src/modals/BadConnectionModal/index.js b/src/modals/BadConnectionModal/index.js
diff --git a/src/modals/BadConnectionModal/style.scss b/src/modals/BadConnectionModal/style.scss
diff --git a/src/modals/LongTermClosedSessionModal/LongTermClosedSessionModal.js b/src/modals/LongTermClosedSessionModal/LongTermClosedSessionModal.js
@@ -0,0 +1,48 @@
+import React from 'react'
+import { useDispatch, useSelector } from 'react-redux'
+
+import { Trans, useTranslation } from 'react-i18next'
+import { getUIModalStateForKey } from '../../redux/selectors/ui'
+import { UI_MODAL_KEYS } from '../../redux/constants/modals'
+import UIActions from '../../redux/actions/ui'
+import Modal from '../../ui/Modal'
+
+const LongTermClosedSessionModal = () => {
+  const isVisible = useSelector(state => getUIModalStateForKey(
+    state,
+    UI_MODAL_KEYS.LONG_TERM_CLOSED_SESSION_MODAL,
+  ))
+
+  const dispatch = useDispatch()
+  const { t } = useTranslation()
+
+  const onClose = () => dispatch(UIActions.changeUIModalState(
+    UI_MODAL_KEYS.LONG_TERM_CLOSED_SESSION_MODAL,
+    false,
+  ))
+
+  return (
+    <Modal
+      label={t('longTermClosedSessionModal.title')}
+      className='hfui-bad-conn-modal__wrapper'
+      isOpen={isVisible}
+      onClose={onClose}
+      onSubmit={onClose}
+    >
+      <Trans
+        t={t}
+        i18nKey='longTermClosedSessionModal.description'
+        components={{
+          bold: <b />,
+        }}
+      />
+      <Modal.Footer>
+        <Modal.Button onClick={onClose} primary>
+          {t('ui.continueToApp')}
+        </Modal.Button>
+      </Modal.Footer>
+    </Modal>
+  )
+}
+
+export default LongTermClosedSessionModal
diff --git a/src/modals/ModalsWrapper/ModalsWrapper.js b/src/modals/ModalsWrapper/ModalsWrapper.js
@@ -3,8 +3,8 @@ import PropTypes from 'prop-types'
 import AppSettingsModal from '../AppSettingsModal'
 import CloseSessionModal from '../CloseSessionModal'
 import DMSRemovalDisclaimerModal from '../DMSRemovalDisclaimerModal'
+import LongTermClosedSessionModal from '../LongTermClosedSessionModal/LongTermClosedSessionModal'
 
-const BadConnectionModal = lazy(() => import('../BadConnectionModal'))
 const NoConnectionActionModal = lazy(() => import('../NoConnectionActionModal'))
 const OldFormatModal = lazy(() => import('../OldFormatModal'))
 const AOPauseModal = lazy(() => import('../AOPauseModal'))
@@ -28,7 +28,7 @@ const ModalsWrapper = ({ isElectronApp }) => {
         </>
       )}
       <NoConnectionActionModal />
-      <BadConnectionModal />
+      <LongTermClosedSessionModal />
       <CcyInfoModal />
       <EditOrderModal />
       <ClosePositionModal />

diff --git a/src/pages/Authentication/style.scss b/src/pages/Authentication/style.scss
@@ -16,6 +16,10 @@
       height: 60px;
       padding-top: 5px;
       padding-bottom: 5px;
+
+      svg {
+        width: 100px;
+      }
     }
 
     .hfui-authenticationpage__content {
@@ -33,7 +37,8 @@
       width: 100%;
     }
 
-    .hfui-authenticationpage__trading-mode, .hfui-dropdown__wrapper {
+    .hfui-authenticationpage__trading-mode,
+    .hfui-dropdown__wrapper {
       width: 100% !important;
     }
   }
@@ -216,7 +221,7 @@
   }
 
   input:focus {
-    border: 1px solid var(--light-background-mix)
+    border: 1px solid var(--light-background-mix);
   }
 }
 

diff --git a/src/redux/actions/ws.js b/src/redux/actions/ws.js
@@ -148,6 +148,11 @@ export default {
     payload: { balance },
   }),
 
+  setAPIClientStatus: ({ status, mode }) => ({
+    type: t.DATA_SET_API_CLIENT_STATUS,
+    payload: { status, mode },
+  }),
+
   recvOrders: ({ orders }) => ({
     type: t.DATA_ORDERS,
     payload: { orders },

diff --git a/src/redux/constants/modals.js b/src/redux/constants/modals.js
@@ -14,4 +14,6 @@ export const UI_MODAL_KEYS = {
   RESET_PAPER_API_KEY_MODAL: 'ResetPaperApiKeyModal',
   HELP_US_IMPROVE_HONEY_MODAL: 'HelpUsImproveHoneyModal',
   DMS_REMOVAL_DISCLAIMER: 'DMSRemovalDisclaimerModal',
+  LONG_TERM_CLOSED_SESSION_MODAL: 'longTermClosedSessionModal',
+  LONG_TERM_CLOSED_SESSION_MODAL_ALREADY_SHOWN: 'longTermClosedSessionModalAlreadyShown',
 }
diff --git a/src/redux/constants/ws.js b/src/redux/constants/ws.js
@@ -32,6 +32,7 @@ export default {
   DATA_API_CREDENTIALS_CONFIGURED: 'WS_DATA_API_CREDENTIALS_CONFIGURED',
   UPDATE_API_CREDENTIALS_CONFIGURED: 'WS_UPDATE_API_CREDENTIALS_CONFIGURED',
   DATA_CLIENT_STATUS_UPDATE: 'WS_DATA_CLIENT_STATUS_UPDATE',
+  DATA_SET_API_CLIENT_STATUS: 'WS_DATA_SET_API_CLIENT_STATUS',
   DATA_POSITIONS: 'WS_DATA_POSITIONS',
   DATA_POSITION: 'WS_DATA_POSITION',
   DATA_POSITION_CLOSE: 'WS_DATA_POSITION_CLOSE',

diff --git a/src/redux/middleware/ws/on_message.js b/src/redux/middleware/ws/on_message.js
@@ -17,7 +17,7 @@ import tokenStore from '../../../util/token_store'
 import { isElectronApp, HONEY_AUTH_URL } from '../../config'
 import { UI_MODAL_KEYS } from '../../constants/modals'
 import { UI_KEYS } from '../../constants/ui_keys'
-import { WS_CONNECTION } from '../../constants/ws'
+
 import { SETTINGS_KEYS, getCurrentStrategy } from '../../selectors/ui'
 import { LOG_LEVELS } from '../../../constants/logging'
 
@@ -323,14 +323,6 @@ export default (alias, store) => (e = {}) => {
         const [, , mode, status] = payload
         store.dispatch(WSActions.recvClientStatusUpdate({ status, mode }))
 
-        if (status === WS_CONNECTION.CLOSED) {
-          store.dispatch(UIActions.setUIValue(UI_KEYS.isBadInternetConnection, true))
-        }
-
-        if (status === WS_CONNECTION.OPENED) {
-          store.dispatch(UIActions.setUIValue(UI_KEYS.isBadInternetConnection, false))
-        }
-
         break
       }
 

diff --git a/src/redux/reducers/ws/api_client.js b/src/redux/reducers/ws/api_client.js
@@ -12,7 +12,7 @@ export default function (state = getInitialState(), action = {}) {
   const { type, payload = {} } = action
 
   switch (type) {
-    case t.DATA_CLIENT_STATUS_UPDATE: {
+    case t.DATA_SET_API_CLIENT_STATUS: {
       const { status, mode } = payload
 
       return {

diff --git a/src/redux/sagas/ws/index.js b/src/redux/sagas/ws/index.js
@@ -15,6 +15,7 @@ import onResetData from './on_reset_data'
 import onExportStrategiesBeforeReset from './on_export_strategies_before_reset_data.js'
 import onAlgoOrderStopped from './on_ao_stopped'
 import cancelAlgoOrder from './cancel_algo_order'
+import onClientStatusUpdate from './on_client_status_update'
 
 export default function* () {
   yield takeEvery(t.BUFF_SEND, messageQueueWorker)
@@ -29,6 +30,7 @@ export default function* () {
   yield takeEvery(t.DATA_ALGO_ORDER_STOPPED, onAlgoOrderStopped)
   yield takeLatest(t.EXPORT_STRATEGIES_ON_RESET, onExportStrategiesBeforeReset)
   yield takeEvery(t.CANCEL_ALGO_ORDER, cancelAlgoOrder)
+  yield takeEvery(t.DATA_CLIENT_STATUS_UPDATE, onClientStatusUpdate)
 
   yield fork(connectionWorker)
   yield fork(pingRebootAppWorker)