From 4940291ce6975a5a0ebc2e7d2ca6965d65563ed4 Mon Sep 17 00:00:00 2001
From: SergeyEzhin <ezhin@mail.ru>
Date: Thu, 1 Jul 2021 22:11:42 +0300
Subject: [PATCH] [SSE mobile] Fix Bug 43270

---
 apps/spreadsheeteditor/mobile/locale/en.json  |  1 +
 .../mobile/src/controller/edit/EditCell.jsx   | 27 ++++++++++--
 .../mobile/src/view/edit/EditCell.jsx         | 42 ++++++++++---------
 3 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json
index 02681d4f8..730a81fc1 100644
--- a/apps/spreadsheeteditor/mobile/locale/en.json
+++ b/apps/spreadsheeteditor/mobile/locale/en.json
@@ -318,6 +318,7 @@
             "textThin": "Thin",
             "textMedium": "Medium",
             "textThick": "Thick",
+            "textFraction": "Fraction",
             "textGeneral": "General",
             "textNumber": "Number",
             "textInteger": "Integer",
diff --git a/apps/spreadsheeteditor/mobile/src/controller/edit/EditCell.jsx b/apps/spreadsheeteditor/mobile/src/controller/edit/EditCell.jsx
index b0d7bd9b7..a54d9ec07 100644
--- a/apps/spreadsheeteditor/mobile/src/controller/edit/EditCell.jsx
+++ b/apps/spreadsheeteditor/mobile/src/controller/edit/EditCell.jsx
@@ -116,10 +116,29 @@ class EditCellController extends Component {
         api.asc_setCellAngle(angle);
     }
 
-    onCellFormat(value) {
+    onCellFormat(format) {
         const api = Common.EditorApi.get();
-        let type = decodeURIComponent(atob(value));
-        api.asc_setCellFormat(type);
+        // let type = decodeURIComponent(atob(value));
+        api.asc_setCellFormat(format);
+    }
+
+    onCurrencyCellFormat(format) {
+        const api = Common.EditorApi.get();
+        api.asc_setCellFormat(format);
+    }
+
+    onAccountingCellFormat(value) {
+        const api = Common.EditorApi.get();
+        let info = new Asc.asc_CFormatCellsInfo();
+
+        info.asc_setType(Asc.c_oAscNumFormatType.Accounting);
+        info.asc_setSeparator(false);
+        info.asc_setSymbol(value);
+
+        let format = api.asc_getFormatCells(info);
+
+        if (format && format.length > 0)
+            api.asc_setCellFormat(format[0]);
     }
 
     onBorderStyle(type, borderInfo) {
@@ -168,6 +187,8 @@ class EditCellController extends Component {
                 onCellFormat={this.onCellFormat}
                 onTextOrientationChange={this.onTextOrientationChange}
                 onBorderStyle={this.onBorderStyle}
+                onCurrencyCellFormat={this.onCurrencyCellFormat}
+                onAccountingCellFormat={this.onAccountingCellFormat}
             />
         )
     }
diff --git a/apps/spreadsheeteditor/mobile/src/view/edit/EditCell.jsx b/apps/spreadsheeteditor/mobile/src/view/edit/EditCell.jsx
index e66e49045..3a48110e8 100644
--- a/apps/spreadsheeteditor/mobile/src/view/edit/EditCell.jsx
+++ b/apps/spreadsheeteditor/mobile/src/view/edit/EditCell.jsx
@@ -88,7 +88,9 @@ const EditCell = props => {
             </List>
             <List>
                 <ListItem title={_t.textFormat} link="/edit-format-cell/" routeProps={{
-                    onCellFormat: props.onCellFormat
+                    onCellFormat: props.onCellFormat,
+                    onCurrencyCellFormat: props.onCurrencyCellFormat,
+                    onAccountingCellFormat: props.onAccountingCellFormat
                 }}>
                     {!isAndroid ?
                         <Icon slot="media" icon="icon-format-general"></Icon> : null
@@ -757,25 +759,25 @@ const PageFormatCell = props => {
                 }
             </Navbar>
             <List>
-                <ListItem link='#' className='no-indicator' title={_t.textGeneral} onClick={() => props.onCellFormat('R2VuZXJhbA==')}>
+                <ListItem link='#' className='no-indicator' title={_t.textGeneral} onClick={() => props.onCellFormat('General')}>
                     <Icon slot="media" icon="icon-format-general"></Icon>
                 </ListItem>
-                <ListItem link='#' className='no-indicator' title={_t.textNumber} onClick={() => props.onCellFormat('MC4wMA==')}>
+                <ListItem link='#' className='no-indicator' title={_t.textNumber} onClick={() => props.onCellFormat('0.00')}>
                     <Icon slot="media" icon="icon-format-number"></Icon>
                 </ListItem>
-                <ListItem link='#' className='no-indicator' title={_t.textInteger} onClick={() => props.onCellFormat('JTIzMA==')}>
+                <ListItem link='#' className='no-indicator' title={_t.textFraction} onClick={() => props.onCellFormat('# ?/?')}>
                     <Icon slot="media" icon="icon-format-integer"></Icon>
                 </ListItem>
-                <ListItem link='#' className='no-indicator' title={_t.textScientific} onClick={() => props.onCellFormat('MC4wMEUlMkIwMA==')}>
+                <ListItem link='#' className='no-indicator' title={_t.textScientific} onClick={() => props.onCellFormat('0.00E+00')}>
                     <Icon slot="media" icon="icon-format-scientific"></Icon>
                 </ListItem>
                 <ListItem title={_t.textAccounting} link="/edit-accounting-format-cell/" routeProps={{
-                    onCellFormat: props.onCellFormat
+                    onAccountingCellFormat: props.onAccountingCellFormat
                 }}>
                     <Icon slot="media" icon="icon-format-accounting"></Icon>
                 </ListItem>
                 <ListItem title={_t.textCurrency} link="/edit-currency-format-cell/" routeProps={{
-                    onCellFormat: props.onCellFormat
+                    onCurrencyCellFormat: props.onCurrencyCellFormat
                 }}>
                     <Icon slot="media" icon="icon-format-currency"></Icon>
                 </ListItem>
@@ -789,10 +791,10 @@ const PageFormatCell = props => {
                 }}>
                     <Icon slot="media" icon="icon-format-time"></Icon>
                 </ListItem>
-                <ListItem link='#' className='no-indicator' title={_t.textPercentage} onClick={() => props.onCellFormat('MC4wMCUyNQ==')}>
+                <ListItem link='#' className='no-indicator' title={_t.textPercentage} onClick={() => props.onCellFormat('0.00%')}>
                     <Icon slot="media" icon="icon-format-percentage"></Icon>
                 </ListItem>
-                <ListItem link='#' className='no-indicator' title={_t.textText} onClick={() => props.onCellFormat('JTQw')}>
+                <ListItem link='#' className='no-indicator' title={_t.textText} onClick={() => props.onCellFormat('@')}>
                     <Icon slot="media" icon="icon-format-text"></Icon>
                 </ListItem>
             </List>
@@ -815,19 +817,19 @@ const PageAccountingFormatCell = props => {
             </Navbar>
             <List>
                 <ListItem link='#' className='no-indicator' title={_t.textDollar} after='$'
-                    onClick={() => props.onCellFormat('XyglMjQqJTIwJTIzJTJDJTIzJTIzMC4wMF8pJTNCXyglMjQqJTIwKCUyMyUyQyUyMyUyMzAuMDApJTNCXyglMjQqJTIwJTIyLSUyMiUzRiUzRl8pJTNCXyglNDBfKQ==')}>
+                    onClick={() => props.onAccountingCellFormat(1033)}>
                 </ListItem>
                 <ListItem link='#' className='no-indicator' title={_t.textEuro} after='€'
-                    onClick={() => props.onCellFormat('XyglRTIlODIlQUMqJTIwJTIzJTJDJTIzJTIzMC4wMF8pJTNCXyglRTIlODIlQUMqJTIwKCUyMyUyQyUyMyUyMzAuMDApJTNCXyglRTIlODIlQUMqJTIwJTIyLSUyMiUzRiUzRl8pJTNCXyglNDBfKQ==')}>
+                    onClick={() => props.onAccountingCellFormat(1031)}>
                 </ListItem>
                 <ListItem link='#' className='no-indicator' title={_t.textPound} after='£'
-                    onClick={() => props.onCellFormat('XyglQzIlQTMqJTIwJTIzJTJDJTIzJTIzMC4wMF8pJTNCXyglQzIlQTMqJTIwKCUyMyUyQyUyMyUyMzAuMDApJTNCXyglQzIlQTMqJTIwJTIyLSUyMiUzRiUzRl8pJTNCXyglNDBfKQ==')}> 
+                    onClick={() => props.onAccountingCellFormat(2057)}> 
                 </ListItem>
                 <ListItem link='#' className='no-indicator' title={_t.textRouble} after='₽'
-                    onClick={() => props.onCellFormat('Xy0qJTIwJTIzJTJDJTIzJTIzMC4wMCU1QiUyNCVEMSU4MC4tNDE5JTVEXy0lM0ItKiUyMCUyMyUyQyUyMyUyMzAuMDAlNUIlMjQlRDElODAuLTQxOSU1RF8tJTNCXy0qJTIwJTIyLSUyMiUzRiUzRiU1QiUyNCVEMSU4MC4tNDE5JTVEXy0lM0JfLSU0MF8t')}>
+                    onClick={() => props.onAccountingCellFormat(1049)}>
                 </ListItem>
                 <ListItem link='#' className='no-indicator' title={_t.textYen} after='¥'
-                    onClick={() => props.onCellFormat('XyglQzIlQTUqJTIwJTIzJTJDJTIzJTIzMC4wMF8pJTNCXyglQzIlQTUqJTIwKCUyMyUyQyUyMyUyMzAuMDApJTNCXyglQzIlQTUqJTIwJTIyLSUyMiUzRiUzRl8pJTNCXyglNDBfKQ==')}>
+                    onClick={() => props.onAccountingCellFormat(1041)}>
                 </ListItem>
             </List>
         </Page>
@@ -840,7 +842,7 @@ const PageCurrencyFormatCell = props => {
 
     return (
         <Page>
-            <Navbar title={_t.textAccounting} backLink={_t.textBack}>
+            <Navbar title={_t.textCurrency} backLink={_t.textBack}>
                 {Device.phone &&
                     <NavRight>
                         <Link icon='icon-expand-down' sheetClose></Link>
@@ -849,19 +851,19 @@ const PageCurrencyFormatCell = props => {
             </Navbar>
             <List>
                 <ListItem link='#' className='no-indicator' title={_t.textDollar} after='$'
-                    onClick={() => props.onCellFormat('JTI0JTIzJTJDJTIzJTIzMC4wMA==')}>
+                    onClick={() => props.onCurrencyCellFormat('[$$-409]#,##0.00')}>
                 </ListItem>
                 <ListItem link='#' className='no-indicator' title={_t.textEuro} after='€'
-                    onClick={() => props.onCellFormat('JUUyJTgyJUFDJTIzJTJDJTIzJTIzMC4wMA==')}>
+                    onClick={() => props.onCurrencyCellFormat('#,##0.00\ [$€-407]')}>
                 </ListItem>
                 <ListItem link='#' className='no-indicator' title={_t.textPound} after='£'
-                    onClick={() => props.onCellFormat('JUMyJUEzJTIzJTJDJTIzJTIzMC4wMA==')}>
+                    onClick={() => props.onCurrencyCellFormat('[$£-809]#,##0.00')}>
                 </ListItem>
                 <ListItem link='#' className='no-indicator' title={_t.textRouble} after='₽'
-                    onClick={() => props.onCellFormat('JTIzJTJDJTIzJTIzMC4wMCUyMiVEMSU4MC4lMjI=')}>
+                    onClick={() => props.onCurrencyCellFormat('#,##0.00\ [$₽-419]')}>
                 </ListItem>
                 <ListItem link='#' className='no-indicator' title={_t.textYen} after='¥'
-                    onClick={() => props.onCellFormat('JUMyJUE1JTIzJTJDJTIzJTIzMC4wMA==')}>
+                    onClick={() => props.onCurrencyCellFormat('[$¥-411]#,##0.00')}>
                 </ListItem>
             </List>
         </Page>