Merge pull request zingolabs#604 from juanky201271/dev_ios_sync_backg…

…round_fix IOS background sync - fix
juanky201271 · Feb 22, 2024 · f58ee7e · f58ee7e
2 parents 7f655c1 + a6d1710
commit f58ee7e
Show file tree

Hide file tree

Showing 19 changed files with 188 additions and 337 deletions.
diff --git a/__tests__/LoadedApp.snapshot.tsx b/__tests__/LoadedApp.snapshot.tsx
@@ -123,6 +123,7 @@ describe('Component LoadedApp - test', () => {
     const mode = 'basic';
     const background = {
       batches: 0,
+      message: '',
       date: 0,
     };
     const readOnly = false;

diff --git a/__tests__/LoadingApp.snapshot.tsx b/__tests__/LoadingApp.snapshot.tsx
@@ -123,6 +123,7 @@ describe('Component LoadingApp - test', () => {
     const mode = 'basic';
     const background = {
       batches: 0,
+      message: '',
       date: 0,
     };
     const firstLaunchingMessage = false;

diff --git a/__tests__/__snapshots__/About.snapshot.tsx.snap b/__tests__/__snapshots__/About.snapshot.tsx.snap
@@ -169,13 +169,6 @@ exports[`Component About - test About - snapshot 1`] = `
         >
           text translated
         </Text>
-        <View
-          style={
-            {
-              "width": 10,
-            }
-          }
-        />
       </View>
       <View
         style={

diff --git a/__tests__/__snapshots__/DetailLine.snapshot.tsx.snap b/__tests__/__snapshots__/DetailLine.snapshot.tsx.snap
@@ -19,13 +19,6 @@ exports[`Component DetailLine - test DetailLine children - snapshot 1`] = `
   >
     label
   </Text>
-  <View
-    style={
-      {
-        "width": 10,
-      }
-    }
-  />
   <View />
 </View>
 `;
@@ -49,13 +42,6 @@ exports[`Component DetailLine - test DetailLine value - snapshot 1`] = `
   >
     label
   </Text>
-  <View
-    style={
-      {
-        "width": 10,
-      }
-    }
-  />
   <View
     accessible={true}
     collapsable={false}

diff --git a/__tests__/__snapshots__/Info.snapshot.tsx.snap b/__tests__/__snapshots__/Info.snapshot.tsx.snap
@@ -169,13 +169,6 @@ exports[`Component Info - test Info - snapshot 1`] = `
           >
             translated text
           </Text>
-          <View
-            style={
-              {
-                "width": 10,
-              }
-            }
-          />
           <View
             accessible={true}
             collapsable={false}
@@ -225,13 +218,6 @@ exports[`Component Info - test Info - snapshot 1`] = `
           >
             translated text
           </Text>
-          <View
-            style={
-              {
-                "width": 10,
-              }
-            }
-          />
           <View
             accessible={true}
             collapsable={false}
@@ -281,13 +267,6 @@ exports[`Component Info - test Info - snapshot 1`] = `
           >
             translated text
           </Text>
-          <View
-            style={
-              {
-                "width": 10,
-              }
-            }
-          />
           <View
             accessible={true}
             collapsable={false}
@@ -337,13 +316,6 @@ exports[`Component Info - test Info - snapshot 1`] = `
           >
             translated text
           </Text>
-          <View
-            style={
-              {
-                "width": 10,
-              }
-            }
-          />
           <View
             accessible={true}
             collapsable={false}
@@ -393,13 +365,6 @@ exports[`Component Info - test Info - snapshot 1`] = `
           >
             translated text
           </Text>
-          <View
-            style={
-              {
-                "width": 10,
-              }
-            }
-          />
           <View
             accessible={true}
             collapsable={false}

diff --git a/__tests__/__snapshots__/Pools.snapshot.tsx.snap b/__tests__/__snapshots__/Pools.snapshot.tsx.snap
@@ -189,13 +189,6 @@ exports[`Component Pools - test Pools - snapshot 1`] = `
             >
               translated text
             </Text>
-            <View
-              style={
-                {
-                  "width": 10,
-                }
-              }
-            />
             <View
               style={
                 {
@@ -346,13 +339,6 @@ exports[`Component Pools - test Pools - snapshot 1`] = `
             >
               translated text
             </Text>
-            <View
-              style={
-                {
-                  "width": 10,
-                }
-              }
-            />
             <View
               style={
                 {
@@ -540,13 +526,6 @@ exports[`Component Pools - test Pools - snapshot 1`] = `
             >
               translated text
             </Text>
-            <View
-              style={
-                {
-                  "width": 10,
-                }
-              }
-            />
             <View
               style={
                 {
@@ -697,13 +676,6 @@ exports[`Component Pools - test Pools - snapshot 1`] = `
             >
               translated text
             </Text>
-            <View
-              style={
-                {
-                  "width": 10,
-                }
-              }
-            />
             <View
               style={
                 {
@@ -891,13 +863,6 @@ exports[`Component Pools - test Pools - snapshot 1`] = `
             >
               translated text
             </Text>
-            <View
-              style={
-                {
-                  "width": 10,
-                }
-              }
-            />
             <View
               style={
                 {

diff --git a/__tests__/__snapshots__/SyncReport.snapshot.tsx.snap b/__tests__/__snapshots__/SyncReport.snapshot.tsx.snap
@@ -169,13 +169,6 @@ exports[`Component SyncReport - test SyncReport - snapshot 1`] = `
           >
             Sync ID
           </Text>
-          <View
-            style={
-              {
-                "width": 10,
-              }
-            }
-          />
           <View
             accessible={true}
             collapsable={false}
@@ -753,13 +746,6 @@ exports[`Component SyncReport - test SyncReport - snapshot 1`] = `
           >
             translated text
           </Text>
-          <View
-            style={
-              {
-                "width": 10,
-              }
-            }
-          />
           <View
             accessible={true}
             collapsable={false}
@@ -810,13 +796,6 @@ exports[`Component SyncReport - test SyncReport - snapshot 1`] = `
           >
             translated text
           </Text>
-          <View
-            style={
-              {
-                "width": 10,
-              }
-            }
-          />
           <View
             accessible={true}
             collapsable={false}
@@ -875,13 +854,6 @@ exports[`Component SyncReport - test SyncReport - snapshot 1`] = `
             >
               translated text
             </Text>
-            <View
-              style={
-                {
-                  "width": 10,
-                }
-              }
-            />
             <View
               accessible={true}
               collapsable={false}
@@ -946,13 +918,6 @@ exports[`Component SyncReport - test SyncReport - snapshot 1`] = `
           >
             translated text
           </Text>
-          <View
-            style={
-              {
-                "width": 10,
-              }
-            }
-          />
           <View
             accessible={true}
             collapsable={false}

diff --git a/app/AppState/types/BackgroundType.ts b/app/AppState/types/BackgroundType.ts
@@ -1,5 +1,6 @@
 export default interface BackgroundType {
   batches: number;
+  message: string;
   date: number;
   // eslint-disable-next-line semi
 }
diff --git a/app/LoadedApp/LoadedApp.tsx b/app/LoadedApp/LoadedApp.tsx
@@ -98,7 +98,7 @@ export default function LoadedApp(props: LoadedAppProps) {
   const [sendAll, setSendAll] = useState<boolean>(false);
   const [privacy, setPrivacy] = useState<boolean>(false);
   const [mode, setMode] = useState<'basic' | 'advanced'>('basic');
-  const [background, setBackground] = useState<BackgroundType>({ batches: 0, date: 0 });
+  const [background, setBackground] = useState<BackgroundType>({ batches: 0, message: '', date: 0 });
   const [loading, setLoading] = useState<boolean>(true);
   const file = useMemo(
     () => ({

diff --git a/app/LoadingApp/LoadingApp.tsx b/app/LoadingApp/LoadingApp.tsx
@@ -71,7 +71,7 @@ export default function LoadingApp(props: LoadingAppProps) {
   const [sendAll, setSendAll] = useState<boolean>(false);
   const [privacy, setPrivacy] = useState<boolean>(false);
   const [mode, setMode] = useState<'basic' | 'advanced'>('advanced'); // by default advanced
-  const [background, setBackground] = useState<BackgroundType>({ batches: 0, date: 0 });
+  const [background, setBackground] = useState<BackgroundType>({ batches: 0, message: '', date: 0 });
   const [firstLaunchingMessage, setFirstLaunchingMessage] = useState<boolean>(false);
   const [loading, setLoading] = useState<boolean>(true);
   const file = useMemo(

diff --git a/app/translations/en.json b/app/translations/en.json
@@ -1,6 +1,6 @@
 {
   "zingo": "Zingo!",
-  "version": "zingo-1.3.3 (131)",
+  "version": "zingo-1.3.4 (137)",
   "loading": "loading...",
   "connectingserver": "Connecting to the server...",
   "wait": "Please wait...",

diff --git a/app/translations/es.json b/app/translations/es.json
@@ -1,6 +1,6 @@
 {
   "zingo": "Zingo!",
-  "version": "zingo-1.3.3 (131)",
+  "version": "zingo-1.3.4 (137)",
   "loading": "cargando...",
   "connectingserver": "Conectando con el servidor...",
   "wait": "Por favor espere...",

diff --git a/components/Background/BackgroundFileImpl.ts b/components/Background/BackgroundFileImpl.ts
@@ -10,7 +10,7 @@ export default class BackgroundFileImpl {
   // Write the server background
   static async reset() {
     const fileName = await this.getFileName();
-    const newBackground: BackgroundType = { batches: 0, date: 0 };
+    const newBackground: BackgroundType = { batches: 0, message: '', date: 0 };
 
     RNFS.writeFile(fileName, JSON.stringify(newBackground), 'utf8')
       .then(() => {
@@ -28,10 +28,12 @@ export default class BackgroundFileImpl {
     const fileName = await this.getFileName();
 
     try {
-      return JSON.parse((await RNFS.readFile(fileName, 'utf8')).toString()) as BackgroundType;
+      const r = JSON.parse((await RNFS.readFile(fileName, 'utf8')).toString()) as BackgroundType;
+      console.log('background json', r);
+      return r;
     } catch (err) {
       // File probably doesn't exist, so return nothing
-      //console.log(err);
+      console.log('background json Error', err);
       return { batches: 0, date: 0 } as BackgroundType;
     }
   }

diff --git a/components/Components/DetailLine.tsx b/components/Components/DetailLine.tsx
@@ -23,7 +23,6 @@ const DetailLine: React.FunctionComponent<DetailLineProps> = ({ label, value, ch
   return (
     <View style={{ display: 'flex', marginTop: 20 }}>
       <FadeText>{label}</FadeText>
-      <View style={{ width: 10 }} />
       {!!value && (
         <TouchableOpacity
           onPress={() => {

diff --git a/components/SyncReport/SyncReport.tsx b/components/SyncReport/SyncReport.tsx
@@ -219,12 +219,12 @@ const SyncReport: React.FunctionComponent<SyncReportProps> = ({ closeModal }) =>
             />
           </View>
         )}
-        {background.date > 0 && showBackgroundLegend && (
+        {Number(background.date) > 0 && showBackgroundLegend && (
           <View
             style={{
               display: 'flex',
-              flexDirection: 'row',
-              alignItems: 'flex-end',
+              flexDirection: 'column',
+              alignItems: 'flex-start',
               marginHorizontal: 20,
             }}>
             <DetailLine
@@ -235,6 +235,7 @@ const SyncReport: React.FunctionComponent<SyncReportProps> = ({ closeModal }) =>
                 moment(Number(Number(background.date).toFixed(0)) * 1000).format('YYYY MMM D h:mm a')
               }
             />
+            {!!background.message && <RegText color={colors.text}>{background.message}</RegText>}
           </View>
         )}
         {maxBlocks && netInfo.isConnected ? (

diff --git a/ios/Podfile b/ios/Podfile
@@ -26,7 +26,7 @@ target 'ZingoMobile' do
   #
   # Note that if you have use_frameworks! enabled, Flipper will not work and
   # you should disable the next line.
-  use_flipper!()
+  # use_flipper!()
 
   post_install do |installer|
     react_native_post_install(installer)
-Original file line number
+Diff line change
@@ Expand Up / @@ -169,13 +169,6 @@ exports[`Component About - test About - snapshot 1`] = ` @@
             >
               text translated
             </Text>
-            <View
-              style={
-                {
-                  "width": 10,
-                }
-              }
-            />
           </View>
           <View
             style={
@@ Expand Down @@