Merge pull request #5390 from ashkanx/translations

Translations

Author: ashkanx

package-lock.json

@@ -70,7 +70,7 @@
     "grunt-contrib-clean": "1.1.0",
     "grunt-contrib-connect": "1.0.2",
     "grunt-contrib-copy": "1.0.0",
-    "grunt-contrib-cssmin": "2.2.1",
+    "grunt-contrib-cssmin": "^3.0.0",
     "grunt-contrib-watch": "1.1.0",
     "grunt-embed-fonts": "0.5.1",
     "grunt-eslint": "21.0.0",
@@ -137,7 +137,7 @@
     "react-transition-group": "2.4.0",
     "scriptjs": "2.5.8",
     "sinon": "7.2.2",
-    "smartcharts-beta": "0.4.18",
+    "smartcharts-beta": "0.4.21",
     "tt-react-custom-scrollbars": "4.2.1-tt2",
     "url-polyfill": "1.0.9",
     "web-push-notifications": "3.2.15"

package.json

@@ -44,8 +44,8 @@ class PositionsDrawer extends React.Component {
         } else if (is_empty) {
             body_content = <EmptyPortfolioMessage />;
         } else {
-            // Show only 4 most recent open contracts
-            body_content = all_positions.slice(0, 4).map((portfolio_position) => (
+            // Show only 5 most recent open contracts
+            body_content = all_positions.slice(0, 5).map((portfolio_position) => (
                 <CSSTransition
                     key={portfolio_position.id}
                     in={!!(portfolio_position.contract_info.underlying)}

src/images/app_2/common/logo.svg

@@ -12,7 +12,10 @@ class HighlightWrapper extends React.PureComponent {
     componentDidMount() {
         const active_button_el = [...this.node.getElementsByClassName('button-menu__button--active')][0];
         if (!this.node) return;
-        this.updateHighlightPosition(active_button_el);
+        // Timeout needed here for bug where the el is returning wrong width and offset after mount
+        setTimeout(() => {
+            this.updateHighlightPosition(active_button_el);
+        }, 250);
     }
 
     componentDidUpdate() {

src/javascript/_autogenerated/ru.js

@@ -5,6 +5,7 @@ const Highlight = ({ left, width }) => {
     const border_radius_size = '4px';
     const highlight_style = {
         width,
+        left                     : 0,
         transform                : `translate3d(${left}px, 0, 0)`,
         'borderTopLeftRadius'    : (left === 0) ? border_radius_size : 0,
         'borderTopRightRadius'   : (left === 0) ? 0 : border_radius_size ,

src/javascript/_autogenerated/zh_cn.js

@@ -5,15 +5,19 @@ import { withRouter } from 'react-router';
 import { Scrollbars } from 'tt-react-custom-scrollbars';
 import { connect }    from 'Stores/connect';
 import InstallPWA     from './install-pwa.jsx';
+import Loading        from '../../../../../templates/app_2/components/loading.jsx';
 
 const AppContents = ({
     addNotificationBar,
     children,
     is_app_blurred,
     is_contract_mode,
+    is_dark_mode,
     is_fully_blurred,
+    is_loading,
     is_logged_in,
     is_positions_drawer_on,
+    loading_status,
     setPWAPromptEvent,
 }) => {
     if (is_logged_in) {
@@ -32,43 +36,54 @@ const AppContents = ({
     }
 
     return (
-        <div
-            id='app_contents'
-            className={classNames('app-contents', {
-                'app-contents--show-positions-drawer': is_positions_drawer_on,
-                'app-contents--contract-mode'        : is_contract_mode,
-                'app-contents--is-blurred'           : (is_fully_blurred || is_app_blurred),
-            })}
-        >
-            {/* Calculate height of user screen and offset height of header and footer */}
-            <Scrollbars
-                autoHide
-                style={{ height: 'calc(100vh - 83px)' }}
+        <React.Fragment>
+            { is_loading && <Loading status={loading_status} theme={is_dark_mode ? 'dark' : 'light'} /> }
+            <div
+                id='app_contents'
+                className={classNames('app-contents', {
+                    'app-contents--show-positions-drawer': is_positions_drawer_on,
+                    'app-contents--contract-mode'        : is_contract_mode,
+                    'app-contents--is-blurred'           : (is_fully_blurred || is_app_blurred),
+                })}
             >
-                {children}
-            </Scrollbars>
-        </div>
+                {/* Calculate height of user screen and offset height of header and footer */}
+                <Scrollbars
+                    autoHide
+                    style={{ height: 'calc(100vh - 83px)' }}
+                >
+                    {children}
+                </Scrollbars>
+            </div>
+        </React.Fragment>
     );
 };
 
 AppContents.propTypes = {
     addNotificationBar    : PropTypes.func,
     children              : PropTypes.any,
-    is_blurred            : PropTypes.bool,
+    is_app_blurred        : PropTypes.bool,
     is_contract_mode      : PropTypes.bool,
+    is_dark_mode          : PropTypes.bool,
+    is_fully_blurred      : PropTypes.bool,
+    is_loading            : PropTypes.bool,
     is_logged_in          : PropTypes.bool,
     is_positions_drawer_on: PropTypes.bool,
+    loading_status        : PropTypes.string,
+    pwa_prompt_event      : PropTypes.object,
     setPWAPromptEvent     : PropTypes.func,
 };
 
 export default withRouter(connect(
     ({ client, modules, ui }) => ({
-        is_logged_in          : client.is_logged_in,
-        is_contract_mode      : modules.smart_chart.is_contract_mode,
+        addNotificationBar    : ui.addNotificationBar,
         is_app_blurred        : ui.is_app_blurred,
+        is_contract_mode      : modules.smart_chart.is_contract_mode,
+        is_dark_mode          : ui.is_dark_mode_on,
         is_fully_blurred      : ui.is_fully_blurred,
+        is_loading            : ui.is_loading,
+        is_logged_in          : client.is_logged_in,
         is_positions_drawer_on: ui.is_positions_drawer_on,
-        addNotificationBar    : ui.addNotificationBar,
+        loading_status        : modules.trade.loading_status,
         pwa_prompt_event      : ui.pwa_prompt_event,
         setPWAPromptEvent     : ui.setPWAPromptEvent,
     })