Fixing the rendering of the banner

fixing rendering in language selection page
Emurgo · Jun 26, 2019 · 4fb17a0 · 4fb17a0
1 parent 70aa4ba
commit 4fb17a0
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 15 deletions.
diff --git a/app/api/ada/lib/state-fetch/batchedFetcher.js b/app/api/ada/lib/state-fetch/batchedFetcher.js
@@ -14,7 +14,6 @@ import type {
   HistoryFunc,
   TxBodiesFunc,
   UtxoSumFunc,
-  ServerStatusFunc,
 } from './types';
 
 import type {

diff --git a/app/api/ada/lib/state-fetch/types.js b/app/api/ada/lib/state-fetch/types.js
@@ -62,6 +62,6 @@ export type FilterFunc = (body: FilterUsedRequest) => Promise<FilterUsedResponse
 // checkServer
 
 export type ServerStatusResponse = {
-  status: boolean
+  apiStatus: boolean
 };
 export type ServerStatusFunc = () => Promise<ServerStatusResponse>;
diff --git a/app/api/ada/lib/test-config.js b/app/api/ada/lib/test-config.js
@@ -10,6 +10,7 @@ const CONFIG: ConfigType = {
   },
   app: {
     walletRefreshInterval: 10,
+    serverStatusRefreshInterval: 10,
     logsBufferSize: 10,
     logsFileSuffix: 'log',
     addressScanSize: 20,

diff --git a/app/containers/MainLayout.js b/app/containers/MainLayout.js
@@ -23,14 +23,15 @@ export default class MainLayout extends Component<MainLayoutProps> {
     connectionErrorType: null,
   };
 
-  displayedBanner = this.props.connectionErrorType === null ?
-    <TestnetWarningBanner /> :
-    <ServerErrorBanner errorType={this.props.connectionErrorType} />;
 
   render() {
+    const displayedBanner = this.props.connectionErrorType === null ?
+      <TestnetWarningBanner /> :
+      <ServerErrorBanner errorType={this.props.connectionErrorType} />;
+
     return (
       <TopBarLayout
-        banner={this.displayedBanner}
+        banner={displayedBanner}
         topbar={this.props.topbar}
         notification={<div />}
         footer={this.props.footer}

diff --git a/app/containers/profile/LanguageSelectionPage.js b/app/containers/profile/LanguageSelectionPage.js
@@ -34,11 +34,6 @@ export default class LanguageSelectionPage extends Component<InjectedProps> {
     this.props.actions.profile.redirectToTermsOfUse.trigger(values);
   };
 
-  displayedBanner = (connectionErrorType: ?ServerStatusErrorType) => {
-    connectionErrorType === null ?
-      <TestnetWarningBanner /> :
-      <ServerErrorBanner errorType={connectionErrorType} />;
-  };
 
   render() {
     const { setProfileLocaleRequest, currentLocale, LANGUAGE_OPTIONS } = this.props.stores.profile;
@@ -54,12 +49,17 @@ export default class LanguageSelectionPage extends Component<InjectedProps> {
         title={topBartitle}
         activeTopbarCategory={topbar.activeTopbarCategory}
       />) : undefined;
+    const displayedBanner = (connectionErrorType: ?ServerStatusErrorType) => {
+      connectionErrorType === null ?
+        <TestnetWarningBanner /> :
+        <ServerErrorBanner errorType={connectionErrorType} />;
+    };
     return (
       <TopBarLayout
         topbar={topBar}
         classicTheme={profile.isClassicTheme}
         languageSelectionBackground
-        banner={this.displayedBanner(checkAdaServerStatus)}
+        banner={displayedBanner(checkAdaServerStatus)}
       >
         <LanguageSelectionForm
           onSelectLanguage={this.onSelectLanguage}

diff --git a/app/environment.js b/app/environment.js
@@ -25,6 +25,7 @@ export const environment = (Object.assign({
   isMainnet: () => environment.NETWORK === NetworkType.MAINNET,
   isAdaApi: () => environment.API === 'ada',
   walletRefreshInterval: CONFIG.app.walletRefreshInterval,
+  serverStatusRefreshInterval: CONFIG.app.serverStatusRefreshInterval,
   userAgentInfo,
 }, process.env): {
   NETWORK: Network,
@@ -39,6 +40,7 @@ export const environment = (Object.assign({
   isMainnet: void => boolean,
   isAdaApi: void => boolean,
   walletRefreshInterval: number,
+  serverStatusRefreshInterval: number,
   userAgentInfo: UserAgentInfo
 });
 

diff --git a/app/stores/ada/ServerConnectionStore.js b/app/stores/ada/ServerConnectionStore.js
@@ -7,8 +7,8 @@ import environment from '../../environment';
 import type { ServerStatusResponse } from '../../api/ada/lib/state-fetch/types';
 
 export default class ServerConnectionStore extends Store {
-  SERVER_STATUS_REFRESH_INTERVAL = 20000;
-  // TODO: set using environment.serverStatusRefreshInterval;
+  SERVER_STATUS_REFRESH_INTERVAL = environment.serverStatusRefreshInterval;
+
   @observable serverStatus: ?ServerStatusErrorType = null;
 
   setup() {
@@ -25,7 +25,7 @@ export default class ServerConnectionStore extends Store {
     try {
       const response: ServerStatusResponse = await checkServerStatusFunc();
       runInAction('refresh server status', () => {
-        this.serverStatus = response.status === true ? null : 'server';
+        this.serverStatus = response.apiStatus === true ? null : 'server';
       });
     } catch (err) {
       runInAction('refresh server status', () => {

diff --git a/config/config-types.js b/config/config-types.js
@@ -7,6 +7,7 @@ export type ConfigType = {
 
 export type AppConfigType = {
   walletRefreshInterval: number,
+  serverStatusRefreshInterval: number,
   logsBufferSize: number,
   logsFileSuffix: string,
   /** Defined by bip44

diff --git a/config/development.json b/config/development.json
@@ -7,6 +7,7 @@
   },
   "app": {
     "walletRefreshInterval": 20000,
+    "serverStatusRefreshInterval": 20000,
     "logsBufferSize": 500,
     "logsFileSuffix": "-yoroi.log",
     "addressScanSize": 20,

diff --git a/config/mainnet.json b/config/mainnet.json
@@ -7,6 +7,7 @@
   },
   "app": {
     "walletRefreshInterval": 20000,
+    "serverStatusRefreshInterval": 20000,
     "logsBufferSize": 500,
     "logsFileSuffix": "-yoroi.log",
     "addressScanSize": 20,

diff --git a/config/staging.json b/config/staging.json
@@ -7,6 +7,7 @@
   },
   "app": {
     "walletRefreshInterval": 20000,
+    "serverStatusRefreshInterval": 20000,
     "logsBufferSize": 500,
     "logsFileSuffix": "-yoroi.log",
     "addressScanSize": 20,

diff --git a/config/test.json b/config/test.json
@@ -7,6 +7,7 @@
   },
   "app": {
     "walletRefreshInterval": 2000,
+    "serverStatusRefreshInterval": 20000,
     "logsBufferSize": 500,
     "logsFileSuffix": "-yoroi.log",
     "addressScanSize": 20,

diff --git a/config/testnet.json b/config/testnet.json
@@ -7,6 +7,7 @@
   },
   "app": {
     "walletRefreshInterval": 20000,
+    "serverStatusRefreshInterval": 20000,
     "logsBufferSize": 500,
     "logsFileSuffix": "-yoroi.log",
     "addressScanSize": 20,