Merge pull request zingolabs#774 from juanky201271/dev_ui_adjustments

UI adjustments
juanky201271 · Feb 12, 2025 · c976af9 · c976af9
2 parents 4a4afcc + c8347e1
commit c976af9
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 21 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -107,7 +107,7 @@ android {
         applicationId 'org.ZingoLabs.Zingo' // Real
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 218 // Real
+        versionCode 219 // Real
         versionName "zingo-1.11.0" // Real
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

diff --git a/app/translations/en.json b/app/translations/en.json
@@ -1,6 +1,6 @@
 {
   "zingo": "Zingo",
-  "version": "zingo-1.11.0 (218)",
+  "version": "zingo-1.11.0 (219)",
   "loading": "loading...",
   "connectingserver": "Connecting to the server...",
   "wait": "Please wait...",
@@ -496,9 +496,9 @@
     "donation-minimum-message": "The minimum amount for donations is a Zenny (0.01 ZEC), Try again and Thanks."
   },
   "receive": {
-    "u-title": "Shielded Unified",
+    "u-title": "Shielded",
     "z-title": "Z-Sapling",
-    "t-title": "Exposed Transparent",
+    "t-title": "Exposed transparent",
     "noaddress": "No Address",
     "unoprivkey": "No Unified address to import the Spending Key",
     "unoviewkey": "No Unified address to import the Full Viewing Key",

diff --git a/app/translations/es.json b/app/translations/es.json
@@ -1,6 +1,6 @@
 {
   "zingo": "Zingo",
-  "version": "zingo-1.11.0 (218)",
+  "version": "zingo-1.11.0 (219)",
   "loading": "cargando...",
   "connectingserver": "Conectando con el servidor...",
   "wait": "Por favor espere...",
@@ -496,9 +496,9 @@
     "donation-minimum-message": "La cantidad mínima para donaciones es un Zenny (0,01 ZEC), inténtalo de nuevo y gracias."
   },
   "receive": {
-    "u-title": "Unificada Blindada",
+    "u-title": "Blindadas",
     "z-title": "Z-Sapling",
-    "t-title": "Expuesta Transparente",
+    "t-title": "Transparente expuesta",
     "noaddress": "Sin Direcciones",
     "unoprivkey": "No hay ninguna dirección Unificada para exportar su Clave Privada",
     "unoviewkey": "No hay ninguna dirección Unificada para exportar su Clave de Visualización",

diff --git a/app/translations/pt.json b/app/translations/pt.json
@@ -1,6 +1,6 @@
 {
   "zingo": "Zingo",
-  "version": "zingo-1.11.0 (218)",
+  "version": "zingo-1.11.0 (219)",
   "loading": "carregando...",
   "connectingserver": "Conectando-se ao servidor...",
   "wait": "Aguarde um momento...",
@@ -496,7 +496,7 @@
     "donation-minimum-message": "O valor mínimo para doações é um Zenny (0,01 ZEC), tente novamente e obrigado."
   },
   "receive": {
-    "u-title": "Unificada Blindada",
+    "u-title": "Blindadas",
     "z-title": "Z-Sapling",
     "t-title": "Transparente exposto",
     "noaddress": "Sem Endereço",

diff --git a/app/translations/ru.json b/app/translations/ru.json
@@ -1,6 +1,6 @@
 {
   "zingo": "Zingo",
-  "version": "zingo-1.11.0 (218)",
+  "version": "zingo-1.11.0 (219)",
   "loading": "загрузка...",
   "connectingserver": "Подключение к серверу...",
   "wait": "Пожалуйста, подождите...",
@@ -496,8 +496,8 @@
     "donation-minimum-message": "Минимальная сумма пожертвований — зенни (0,01 ZEC). Попробуйте еще раз и спасибо."
   },
   "receive": {
-    "u-title": "Экранированный унифицированный",
-    "z-title": "Z-адрес пула Sapling",
+    "u-title": "Бронированный",
+    "z-title": "Z-Sapling",
     "t-title": "Открытый Прозрачный",
     "noaddress": "Адрес не указан",
     "unoprivkey": "Нет Унифицированного адреса для импорта Ключа расходования",

diff --git a/components/Receive/Receive.tsx b/components/Receive/Receive.tsx
@@ -234,15 +234,18 @@ const Receive: React.FunctionComponent<ReceiveProps> = ({
                     }}>
                     <View
                       style={{
+                        backgroundColor:
+                          shielded === ShieldedEnum.sapling ? colors.primaryDisabled : colors.sideMenuBackground,
+                        borderRadius: 15,
+                        borderColor: shielded === ShieldedEnum.sapling ? colors.primaryDisabled : colors.zingo,
+                        borderWidth: 1,
                         paddingHorizontal: 10,
                         paddingVertical: 5,
-                        marginHorizontal: 15,
+                        marginHorizontal: 10,
                       }}>
                       <FadeText
                         style={{
-                          color: shielded === ShieldedEnum.sapling ? colors.primary : colors.zingo,
-                          opacity: shielded === ShieldedEnum.sapling ? 1 : undefined,
-                          textDecorationLine: 'underline',
+                          color: shielded === ShieldedEnum.sapling ? colors.sideMenuBackground : colors.zingo,
                           fontWeight: 'bold',
                         }}>
                         {translate('receive.shielded-sapling') as string}

diff --git a/e2e/shielding.test.js b/e2e/shielding.test.js
@@ -19,7 +19,7 @@ describe('Renders wallet data correctly.', () => {
     // Wait for confirmation
     await waitFor(element(by.text(/Transmitted|In Mempool/gi)))
       .toExist()
-      .withTimeout(50000);
+      .withTimeout(120000);
 
     // Close and reopen to check that the transaction does not disappear
     await device.launchApp({
@@ -29,9 +29,9 @@ describe('Renders wallet data correctly.', () => {
     // Transaction transmitted
     await waitFor(element(by.text(/In Mempool/gi)))
       .toExist()
-      .withTimeout(50000);
+      .withTimeout(120000);
 
-    const tx = await element(by.text(/In Mempool/gi));
+    const tx = element(by.text(/In Mempool/gi));
 
     console.log('tx', await tx.getAttributes());
   });

diff --git a/ios/ZingoMobile.xcodeproj/project.pbxproj b/ios/ZingoMobile.xcodeproj/project.pbxproj
@@ -550,7 +550,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = ZingoMobile/ZingoMobile.entitlements;
-				CURRENT_PROJECT_VERSION = 218;
+				CURRENT_PROJECT_VERSION = 219;
 				DEVELOPMENT_TEAM = 788KRST4S8;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = "";
@@ -591,7 +591,7 @@
 				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = ZingoMobile/ZingoMobile.entitlements;
-				CURRENT_PROJECT_VERSION = 218;
+				CURRENT_PROJECT_VERSION = 219;
 				DEVELOPMENT_TEAM = 788KRST4S8;
 				ENABLE_BITCODE = NO;
 				EXCLUDED_ARCHS = "";