Merge pull request #665 from juanky201271/stable

Stable
zingolabs · Jul 16, 2024 · 650e844 · 650e844
2 parents 306a299 + 7df7216
commit 650e844
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 12 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -101,7 +101,7 @@ android {
         applicationId 'org.ZingoLabs.Zingo' // Real
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 185 // Real
+        versionCode 186 // Real
         versionName "zingo-1.4.2" // Real
         missingDimensionStrategy 'react-native-camera', 'general'
         testBuildType System.getProperty('testBuildType', 'debug')

diff --git a/app/LoadedApp/LoadedApp.tsx b/app/LoadedApp/LoadedApp.tsx
@@ -353,7 +353,10 @@ export class LoadedAppClass extends Component<LoadedAppClassProps, LoadedAppClas
       syncingStatus: {} as SyncingStatusClass,
       sendProgress: {} as SendProgressClass,
       info: {} as InfoType,
-      zecPrice: {} as ZecPriceType,
+      zecPrice: {
+        zecPrice: 0,
+        date: 0,
+      } as ZecPriceType,
       uaAddress: '',
       sendPageState: new SendPageStateClass(new ToAddrClass(Utils.getNextToAddrID())),
       receivePageState: {} as ReceivePageStateClass,

diff --git a/app/translations/en.json b/app/translations/en.json
@@ -1,6 +1,6 @@
 {
   "zingo": "Zingo",
-  "version": "zingo-1.4.2 (185)",
+  "version": "zingo-1.4.2 (186)",
   "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.4.2 (185)",
+  "version": "zingo-1.4.2 (186)",
   "loading": "cargando...",
   "connectingserver": "Conectando con el servidor...",
   "wait": "Por favor espere...",

diff --git a/app/translations/pt.json b/app/translations/pt.json
@@ -1,6 +1,6 @@
 {
   "zingo": "Zingo",
-  "version": "zingo-1.4.2 (185)",
+  "version": "zingo-1.4.2 (186)",
   "loading": "carregando...",
   "connectingserver": "Conectando-se ao servidor...",
   "wait": "Aguarde um momento...",

diff --git a/app/translations/ru.json b/app/translations/ru.json
@@ -1,6 +1,6 @@
 {
   "zingo": "Zingo",
-  "version": "zingo-1.4.2 (185)",
+  "version": "zingo-1.4.2 (186)",
   "loading": "загрузка...",
   "connectingserver": "Подключение к серверу...",
   "wait": "Пожалуйста, подождите...",

diff --git a/components/Send/Send.tsx b/components/Send/Send.tsx
@@ -1317,7 +1317,7 @@ const Send: React.FunctionComponent<SendProps> = ({
                     </View>
                   </View>
 
-                  {zecPrice.zecPrice <= 0 && (
+                  {(!zecPrice.zecPrice || zecPrice.zecPrice <= 0) && (
                     <View
                       style={{
                         width: '35%',
@@ -1327,7 +1327,7 @@ const Send: React.FunctionComponent<SendProps> = ({
                     </View>
                   )}
 
-                  {zecPrice.zecPrice > 0 && (
+                  {!!zecPrice.zecPrice && zecPrice.zecPrice > 0 && (
                     <View
                       style={{
                         display: 'flex',

diff --git a/ios/ZingoMobile.xcodeproj/project.pbxproj b/ios/ZingoMobile.xcodeproj/project.pbxproj
@@ -546,7 +546,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = ZingoMobile/ZingoMobile.entitlements;
-				CURRENT_PROJECT_VERSION = 185;
+				CURRENT_PROJECT_VERSION = 186;
 				DEVELOPMENT_TEAM = 788KRST4S8;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = "";
@@ -587,7 +587,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = ZingoMobile/ZingoMobile.entitlements;
-				CURRENT_PROJECT_VERSION = 185;
+				CURRENT_PROJECT_VERSION = 186;
 				DEVELOPMENT_TEAM = 788KRST4S8;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = "";

diff --git a/package.json b/package.json
@@ -12,8 +12,10 @@
     "postinstall": "patch-package",
     "build:bundle": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res && rimraf --glob android/app/src/main/res/drawable* && cd android && ./gradlew assembleRelease -PsplitApk=true && cd ..",
     "bundle": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res && rimraf --glob android/app/src/main/res/drawable*",
-    "build:release": "cd android && ./gradlew assembleRelease -PsplitApk=true && cd ..",
-    "build:debug": "cd android && ./gradlew assembleDebug -PsplitApk=true && cd ..",
+    "build:release": "cd android && ./gradlew assembleRelease && cd ..",
+    "build:release:split": "cd android && ./gradlew assembleRelease -PsplitApk=true && cd ..",
+    "build:debug": "cd android && ./gradlew assembleDebug && cd ..",
+    "build:debug:split": "cd android && ./gradlew assembleDebug -PsplitApk=true && cd ..",
     "cargo:update": "cd rust && cargo update -p zingolib -p zingoconfig --aggressive"
   },
   "dependencies": {