Merge pull request #799 from bitfinexcom/staging

Release version to master

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bfx-report-ui",
-  "version": "2.39.0",
+  "version": "2.40.0",
   "description": "Report page to overview the user actions in Bitfinex and download related csv files",
   "repository": {
     "type": "git",

public/locales/en/translations.json

@@ -292,6 +292,8 @@
     "success": "Success",
     "fail": "Fail",
     "targets": "Data to Export",
+    "exportFormat": "Export Format",
+    "exportAsCsv": "Export as CSV",
     "exportAsPdf": "Export as PDF"
   },
   "fcredit": {

src/components/AccountSummary/AccountSummary.js

@@ -112,7 +112,6 @@ class AccountSummary extends PureComponent {
               />
             </>
           )}
-          <br />
           <PaidFees
             t={t}
             isNoData={isNoData}

src/components/AccountSummary/AccountSummary.leo.js

@@ -70,12 +70,19 @@ const AccountSummaryLeo = ({
 
 AccountSummaryLeo.propTypes = {
   data: PropTypes.shape({
-    leoLev: PropTypes.number.isRequired,
-    leoAmountAvg: PropTypes.number.isRequired,
-  }).isRequired,
+    leoLev: PropTypes.number,
+    leoAmountAvg: PropTypes.number,
+  }),
   t: PropTypes.func.isRequired,
   isNoData: PropTypes.bool.isRequired,
   isLoading: PropTypes.bool.isRequired,
 }
 
+AccountSummaryLeo.defaultProps = {
+  data: PropTypes.shape({
+    leoLev: 0,
+    leoAmountAvg: 0,
+  }),
+}
+
 export default memo(AccountSummaryLeo)

src/components/AccountSummary/_AccountSummary.scss

@@ -1,14 +1,15 @@
 .section-account-summary {
   &-data {
+    width: 100%;
     display: flex;
     flex-wrap: wrap;
+    flex-direction: row;
     align-items: flex-end;
-    justify-content: flex-start;
+    justify-content: space-between;
 
     &-item {
-      width: fit-content;
-      max-width: calc(100vw - 20px);
-      margin-right: 20px;
+      width: 49%;
+      min-width: 400px;
       margin-bottom: 35px;
 
       .collapsed-table {
@@ -49,6 +50,16 @@
   }
 }
 
+@media screen and (max-width: 1210px) {
+  .section-account-summary {
+    &-data {
+      &-item {
+        width: 100%;
+      }
+    }
+  }
+}
+
 @media screen and (max-width: 768px) {
   .section-account-summary {
     &-data {
@@ -63,8 +74,8 @@
       &-item {
         width: 100%;
         margin-right: 0;
+        min-width: inherit;
       }
     }
   }
 }
-

src/components/AppSummary/AppSummary.value.js

@@ -86,7 +86,7 @@ const AccountSummaryValue = () => {
           </div>
         )}
         <Chart
-          aspect={1.5}
+          height={375}
           data={chartData}
           showLegend={false}
           dataKeys={presentCurrencies}