Merge branch 'rates-blankscreen'

Author: Beerosagos

backend/handlers/handlers.go

@@ -222,7 +222,7 @@ func NewHandlers(
 	getAPIRouterNoError(apiRouter)("/set-token-active", handlers.postSetTokenActive).Methods("POST")
 	getAPIRouterNoError(apiRouter)("/rename-account", handlers.postRenameAccount).Methods("POST")
 	getAPIRouterNoError(apiRouter)("/accounts/reinitialize", handlers.postAccountsReinitialize).Methods("POST")
-	getAPIRouter(apiRouter)("/account-summary", handlers.getAccountSummary).Methods("GET")
+	getAPIRouterNoError(apiRouter)("/account-summary", handlers.getAccountSummary).Methods("GET")
 	getAPIRouterNoError(apiRouter)("/supported-coins", handlers.getSupportedCoins).Methods("GET")
 	getAPIRouter(apiRouter)("/test/register", handlers.postRegisterTestKeystore).Methods("POST")
 	getAPIRouterNoError(apiRouter)("/test/deregister", handlers.postDeregisterTestKeystore).Methods("POST")
@@ -1207,8 +1207,19 @@ func (handlers *Handlers) apiMiddleware(devMode bool, h func(*http.Request) (int
 		writeJSON(w, value)
 	})
 }
-func (handlers *Handlers) getAccountSummary(*http.Request) (interface{}, error) {
-	return handlers.backend.ChartData()
+
+func (handlers *Handlers) getAccountSummary(*http.Request) interface{} {
+	type Result struct {
+		Error   string         `json:"error,omitempty"`
+		Data    *backend.Chart `json:"data,omitempty"`
+		Success bool           `json:"success"`
+	}
+
+	data, err := handlers.backend.ChartData()
+	if err != nil {
+		return Result{Success: false, Error: err.Error()}
+	}
+	return Result{Success: true, Data: data}
 }
 
 // getSupportedCoinsHandler returns an array of coin codes for which you can add an account.

frontends/web/src/api/account.ts

@@ -180,7 +180,15 @@ export const init = (code: AccountCode): Promise<null> => {
   return apiPost(`account/${code}/init`);
 };
 
-export interface ISummary {
+export type TSummaryResponse = {
+    success: true;
+    data: TSummary;
+} | {
+  success: false;
+  error: string;
+}
+
+export type TSummary = {
     chartDataMissing: boolean;
     chartDataDaily: ChartData;
     chartDataHourly: ChartData;
@@ -191,13 +199,13 @@ export interface ISummary {
     lastTimestamp: number;
 }
 
-export const getSummary = (): Promise<ISummary> => {
+export const getSummary = (): Promise<TSummaryResponse> => {
   return apiGet('account-summary');
 };
 
 export type Conversions = {
-    [key in Fiat]: string;
-}
+    [key in Fiat]?: string;
+};
 
 export interface IAmount {
     amount: string;

frontends/web/src/components/amount/amount.tsx

@@ -122,4 +122,4 @@ export const Amount = ({
   }
 
   return formatLocalizedAmount(amount, group, decimal);
-};
+};

frontends/web/src/routes/account/send/components/dialogs/confirm-wait-dialog.tsx

@@ -93,7 +93,7 @@ export const ConfirmingWaitDialog = ({
             <small>{(proposedAmount && proposedAmount.unit) || 'N/A'}</small>
           </span>
           {
-            proposedAmount && proposedAmount.conversions && (
+            proposedAmount && proposedAmount.conversions && proposedAmount.conversions[fiatUnit] && (
               <span>
                 <span className="text-gray"> / </span>
                 <Amount alwaysShowAmounts amount={proposedAmount.conversions[fiatUnit]} unit={baseCurrencyUnit}/>
@@ -117,7 +117,7 @@ export const ConfirmingWaitDialog = ({
             {' '}
             <small>{(proposedFee && proposedFee.unit) || 'N/A'}</small>
           </span>
-          {proposedFee && proposedFee.conversions && (
+          {proposedFee && proposedFee.conversions && proposedFee.conversions[fiatUnit] && (
             <span key="conversation">
               <span className="text-gray"> / </span>
               <Amount alwaysShowAmounts amount={proposedFee.conversions[fiatUnit]} unit={baseCurrencyUnit}/>
@@ -155,7 +155,7 @@ export const ConfirmingWaitDialog = ({
             {' '}
             <small>{(proposedTotal && proposedTotal.unit) || 'N/A'}</small>
           </span>
-          {(proposedTotal && proposedTotal.conversions) && (
+          {(proposedTotal && proposedTotal.conversions) && proposedTotal.conversions[fiatUnit] && (
             <span>
               <span className="text-gray"> / </span>
               <strong><Amount alwaysShowAmounts amount={proposedTotal.conversions[fiatUnit]} unit={baseCurrencyUnit}/></strong>

frontends/web/src/routes/account/summary/accountssummary.tsx

@@ -58,7 +58,7 @@ export const AccountsSummary = ({
 
   const accountsByKeystore = getAccountsByKeystore(accounts);
 
-  const [summaryData, setSummaryData] = useState<accountApi.ISummary>();
+  const [summaryData, setSummaryData] = useState<accountApi.TSummary>();
   const [balancePerCoin, setBalancePerCoin] = useState<accountApi.TAccountsBalance>();
   const [accountsTotalBalance, setAccountsTotalBalance] = useState<accountApi.TAccountsTotalBalance>();
   const [coinsTotalBalance, setCoinsTotalBalance] = useState<accountApi.TCoinsTotalBalance>();
@@ -71,14 +71,14 @@ export const AccountsSummary = ({
     if (summaryReqTimerID.current) {
       window.clearTimeout(summaryReqTimerID.current);
     }
-    try {
-      const summaryData = await accountApi.getSummary();
-      if (!mounted.current) {
-        return;
-      }
-      setSummaryData(summaryData);
-    } catch (err) {
-      console.error(err);
+    const summary = await accountApi.getSummary();
+    if (!mounted.current) {
+      return;
+    }
+    if (summary.success) {
+      setSummaryData(summary.data);
+    } else {
+      console.error(summary.error);
     }
   }, [mounted]);
 

frontends/web/src/routes/account/summary/chart.tsx

@@ -16,7 +16,7 @@
 
 import { createChart, IChartApi, LineData, LineStyle, LogicalRange, ISeriesApi, UTCTimestamp, MouseEventParams, ColorType, Time } from 'lightweight-charts';
 import { Component, createRef, ReactChild } from 'react';
-import { ISummary } from '@/api/account';
+import { TSummary } from '@/api/account';
 import { translate, TranslateProps } from '@/decorators/translate';
 import { Skeleton } from '@/components/skeleton/skeleton';
 import { Amount } from '@/components/amount/amount';
@@ -35,7 +35,7 @@ export interface FormattedLineData extends LineData {
 export type ChartData = FormattedLineData[];
 
 type ChartProps = {
-  data: ISummary;
+  data: TSummary;
   noDataPlaceholder?: ReactChild;
   hideAmounts: boolean;
 };

frontends/web/src/routes/account/summary/coinbalance.tsx

@@ -22,7 +22,7 @@ import { Skeleton } from '@/components/skeleton/skeleton';
 import style from './accountssummary.module.css';
 
 type TProps = {
-  summaryData?: accountApi.ISummary,
+  summaryData?: accountApi.TSummary,
   coinsBalances?: accountApi.TCoinsTotalBalance,
 }