Merge pull request zingolabs#879 from juanky201271/dev_release_candidate_zingo2

juanky201271 · web-flow · commit 790417682b23 · 2025-07-11T10:22:23.000+02:00
New test version 2.0.0 (256) - RC-10 - zingolib rc3
diff --git a/__tests__/__snapshots__/AddressBook.AbDetail.snapshot.tsx.snap b/__tests__/__snapshots__/AddressBook.AbDetail.snapshot.tsx.snap
@@ -54,6 +54,7 @@ exports[`Component Address Book Details - test Address Book Datails - Add - snap
     >
       <TextInput
         editable={true}
+        maxLength={50}
         onChangeText={[Function]}
         placeholder="text translated"
         placeholderTextColor="#888888"
@@ -452,6 +453,7 @@ exports[`Component Address Book Details - test Address Book Datails - Delete - s
     >
       <TextInput
         editable={false}
+        maxLength={50}
         onChangeText={[Function]}
         placeholder="text translated"
         placeholderTextColor="#888888"
@@ -852,6 +854,7 @@ exports[`Component Address Book Details - test Address Book Datails - Modify - s
     >
       <TextInput
         editable={true}
+        maxLength={50}
         onChangeText={[Function]}
         placeholder="text translated"
         placeholderTextColor="#888888"
diff --git a/__tests__/__snapshots__/Header.snapshot.tsx.snap b/__tests__/__snapshots__/Header.snapshot.tsx.snap
@@ -341,7 +341,21 @@ exports[`Component Header - test Header Complex - snapshot 1`] = `
                 }
                 testID="undefined.big-part"
               >
-                 0.5000
+                 0.6234
+              </Text>
+              <Text
+                style={
+                  {
+                    "color": "#c3c3c3",
+                    "fontSize": 25.2,
+                    "margin": 0,
+                    "marginBottom": 2.4,
+                    "padding": 0,
+                  }
+                }
+                testID="undefined.small-part"
+              >
+                5678
               </Text>
             </View>
           </View>
diff --git a/__tests__/__snapshots__/History.snapshot.tsx.snap b/__tests__/__snapshots__/History.snapshot.tsx.snap
@@ -1212,7 +1212,21 @@ exports[`Component History - test History no currency, privacy normal & mode bas
                   }
                   testID="undefined.big-part"
                 >
-                   0.5000
+                   0.6234
+                </Text>
+                <Text
+                  style={
+                    {
+                      "color": "#c3c3c3",
+                      "fontSize": 25.2,
+                      "margin": 0,
+                      "marginBottom": 2.4,
+                      "padding": 0,
+                    }
+                  }
+                  testID="undefined.small-part"
+                >
+                  5678
                 </Text>
               </View>
             </View>
diff --git a/__tests__/__snapshots__/Send.snapshot.tsx.snap b/__tests__/__snapshots__/Send.snapshot.tsx.snap
@@ -2179,7 +2179,21 @@ exports[`Component Send - test Send no currency, privacy normal & mode basic - s
                     }
                     testID="undefined.big-part"
                   >
-                     0.5000
+                     0.6234
+                  </Text>
+                  <Text
+                    style={
+                      {
+                        "color": "#c3c3c3",
+                        "fontSize": 25.2,
+                        "margin": 0,
+                        "marginBottom": 2.4,
+                        "padding": 0,
+                      }
+                    }
+                    testID="undefined.small-part"
+                  >
+                    5678
                   </Text>
                 </View>
               </View>
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -115,7 +115,7 @@ android {
         applicationId 'org.ZingoLabs.Zingo' // Real
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 254 // Real
+        versionCode 256 // Real
         versionName "zingo-2.0.0" // Real
         testBuildType System.getProperty('testBuildType', 'debug')
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
diff --git a/app/AppState/enums/CommandEnum.ts b/app/AppState/enums/CommandEnum.ts
@@ -1,7 +1,7 @@
 export enum CommandEnum {
   // new commands to create a proposal
   send = 'send',
-  sendall = 'sendall',
+  sendall = 'send_all',
   shield = 'shield',
   // this works for all: send, sendall & shield
   confirm = 'confirm',
diff --git a/app/LoadedApp/LoadedApp.tsx b/app/LoadedApp/LoadedApp.tsx
@@ -938,16 +938,16 @@ export class LoadedAppClass extends Component<LoadedAppClassProps, LoadedAppClas
         this.state.valueTransfersTotal !== null &&
         this.state.valueTransfersTotal > 0 &&
         this.state.valueTransfers
-          .filter((vtOld: ValueTransferType) => vtOld.confirmations < GlobalConst.minConfirmations)
+          .filter((vtOld: ValueTransferType) => vtOld.confirmations === 0) // not confirmed
           .forEach((vtOld: ValueTransferType) => {
             const vtNew = valueTransfers.filter(
               (vt: ValueTransferType) =>
                 vt.txid === vtOld.txid && vt.address === vtOld.address && vt.poolType === vtOld.poolType,
             );
             //console.log('old', vtOld);
             //console.log('new', vtNew);
-            // the ValueTransfer is confirmed
-            if (vtNew.length > 0 && vtNew[0].confirmations >= GlobalConst.minConfirmations) {
+            // the ValueTransfer is confirmed when the confirmations are > 0
+            if (vtNew.length > 0 && vtNew[0].confirmations > 0) {
               let message: string = '';
               let title: string = '';
               if (vtNew[0].kind === ValueTransferKindEnum.Received && vtNew[0].amount > 0) {
@@ -1026,17 +1026,18 @@ export class LoadedAppClass extends Component<LoadedAppClassProps, LoadedAppClas
               }
             }
             // the ValueTransfer is gone -> Likely Reverted by the server
-            if (vtNew.length === 0) {
-              createAlert(
-                this.setBackgroundError,
-                this.addLastSnackbar,
-                [this.screenName],
-                this.state.translate('loadedapp.send-menu') as string,
-                this.state.translate('loadedapp.valuetransfer-reverted') as string,
-                true,
-                this.state.translate,
-              );
-            }
+            // this is really confusing...
+            //if (vtNew.length === 0) {
+            //  createAlert(
+            //    this.setBackgroundError,
+            //    this.addLastSnackbar,
+            //    [this.screenName],
+            //    this.state.translate('loadedapp.send-menu') as string,
+            //    this.state.translate('loadedapp.valuetransfer-reverted') as string,
+            //    true,
+            //    this.state.translate,
+            //  );
+            //}
           });
       // if some tx is confirmed the UI needs some time to
       // acomodate the bottom tabs.
@@ -1931,7 +1932,8 @@ export class LoadedAppClass extends Component<LoadedAppClassProps, LoadedAppClas
           !!totalBalance &&
           (
             (totalBalance.totalOrchardBalance > 0 && totalBalance.confirmedOrchardBalance === 0) ||
-            (totalBalance.totalSaplingBalance > 0 && totalBalance.confirmedSaplingBalance === 0)
+            (totalBalance.totalSaplingBalance > 0 && totalBalance.confirmedSaplingBalance === 0) ||
+            (totalBalance.totalTransparentBalance > 0 && totalBalance.confirmedTransparentBalance === 0)
           ) &&
           somePending
         ) {
diff --git a/app/translations/en.json b/app/translations/en.json
@@ -1,6 +1,6 @@
 {
   "zingo": "Zingo",
-  "version": "zingo-2.0.0 (254)",
+  "version": "zingo-2.0.0 (256)",
   "loading": "loading...",
   "connectingserver": "Connecting to the server...",
   "wait": "Please wait...",
@@ -643,7 +643,8 @@
     "resend-alert": "Confirm to Resend this transaction again.",
     "remove-alert": "Confirm to remove failed transaction from device and restore balance",
     "remove-legend": "Remove transaction to restore balance",
-    "expired": "Expired - Remove to restore balance"
+    "expired": "Expired - Remove to restore balance",
+    "waiting": "Funds waiting for the minimum confirmations"
   },
   "report": {
     "title": "Sync / Rescan Report",
diff --git a/app/translations/es.json b/app/translations/es.json
@@ -1,6 +1,6 @@
 {
   "zingo": "Zingo",
-  "version": "zingo-2.0.0 (254)",
+  "version": "zingo-2.0.0 (256)",
   "loading": "cargando...",
   "connectingserver": "Conectando con el servidor...",
   "wait": "Por favor espere...",
@@ -643,7 +643,8 @@
     "resend-alert": "Confirmar para reenviar esta transacción de nuevo.",
     "remove-alert": "Confirmar para eliminar la transacción fallida del dispositivo y restaurar el saldo",
     "remove-legend": "Eliminar transacción para restablecer el saldo",
-    "expired": "Expirada - Eliminar para restablecer el saldo"
+    "expired": "Expirada - Eliminar para restablecer el saldo",
+    "waiting": "Fondos en espera de las confirmaciones mínimas"
   },
   "report": {
     "title": "Informe de Sincronización",
diff --git a/app/translations/pt.json b/app/translations/pt.json
@@ -1,6 +1,6 @@
 {
   "zingo": "Zingo",
-  "version": "zingo-2.0.0 (254)",
+  "version": "zingo-2.0.0 (256)",
   "loading": "carregando...",
   "connectingserver": "Conectando-se ao servidor...",
   "wait": "Aguarde um momento...",
@@ -643,7 +643,8 @@
     "resend-alert": "Confirme para reenviar esta transação novamente.",
     "remove-alert": "Confirme para remover a transação com falha do dispositivo e restaurar o saldo",
     "remove-legend": "Remover transação para restaurar o saldo",
-    "expired": "Expirada - Remover para restaurar o saldo"
+    "expired": "Expirada - Remover para restaurar o saldo",
+    "waiting": "Fundos aguardando as confirmações mínimas"
   },
   "report": {
     "title": "Relatório de Sincronização / Rescan",
diff --git a/app/translations/ru.json b/app/translations/ru.json
@@ -1,6 +1,6 @@
 {
   "zingo": "Zingo",
-  "version": "zingo-2.0.0 (254)",
+  "version": "zingo-2.0.0 (256)",
   "loading": "загрузка...",
   "connectingserver": "Подключение к серверу...",
   "wait": "Пожалуйста, подождите...",
@@ -643,7 +643,8 @@
     "resend-alert": "Подтвердите повторную отправку этой транзакции.",
     "remove-alert": "Подтвердите удаление неудачной транзакции с устройства и восстановление баланса",
     "remove-legend": "Удалить транзакцию для восстановления баланса",
-    "expired": "Истек срок действия - Удалите для восстановления баланса"
+    "expired": "Истек срок действия - Удалите для восстановления баланса",
+    "waiting": "Средства ожидают минимального количества подтверждений"
   },
   "report": {
     "title": "Отчёт о синхронизации",
diff --git a/app/translations/tr.json b/app/translations/tr.json
@@ -1,6 +1,6 @@
 {
   "zingo": "Zingo",
-  "version": "zingo-2.0.0 (254)",
+  "version": "zingo-2.0.0 (256)",
   "loading": "Yükleniyor...",
   "connectingserver": "Sunucuya bağlanılıyor...",
   "wait": "Lütfen bekleyin...",
@@ -643,7 +643,8 @@
     "resend-alert": "Bu işlemi yeniden göndermeyi onaylayın",
     "remove-alert": "Başarısız işlemi cihazdan kaldırmak ve bakiyeyi geri yüklemek için onaylayın",
     "remove-legend": "Bakiyeyi geri yüklemek için işlemi kaldırın",
-    "expired": "Süresi doldu - Bakiyeyi geri yüklemek için kaldırın"
+    "expired": "Süresi doldu - Bakiyeyi geri yüklemek için kaldırın",
+    "waiting": "Fonlar minimum onay bekliyor"
   },
   "report": {
     "title": "Senkronizasyon / Yeniden Tarama Raporu",
diff --git a/components/AddressBook/AddressBook.tsx b/components/AddressBook/AddressBook.tsx
@@ -7,6 +7,7 @@ import {
   NativeSyntheticEvent,
   TouchableOpacity,
   ActivityIndicator,
+  Pressable,
 } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
@@ -486,28 +487,29 @@ const AddressBook: React.FunctionComponent<AddressBookProps> = ({
           )}
         </ScrollView>
         {!isAtTop && (
-          <TouchableOpacity
+          <Pressable
             onPress={handleScrollToTop}
             disabled={isScrollingToTop}
-            style={{
+            style={({ pressed }) => ({
               position: 'absolute',
               bottom: 105,
               right: 10,
               paddingHorizontal: 5,
               paddingVertical: 10,
               backgroundColor: colors.sideMenuBackground,
               borderRadius: 50,
+              transform: [{ scale: pressed ? 0.9 : 1 }],
               borderWidth: 1,
               borderColor: colors.zingo,
               opacity: isScrollingToTop ? 0.5 : 1,
-            }}>
+            })}>
             <FontAwesomeIcon
               style={{ marginLeft: 5, marginRight: 5, marginTop: 0 }}
               size={20}
               icon={faAngleUp}
               color={colors.zingo}
             />
-          </TouchableOpacity>
+          </Pressable>
         )}
         {currentItem === null && (
           <View
diff --git a/components/AddressBook/components/AbDetail.tsx b/components/AddressBook/components/AbDetail.tsx
@@ -179,6 +179,7 @@ const AbDetail: React.FunctionComponent<AbDetailProps> = ({
             value={label}
             onChangeText={(text: string) => setLabel(text)}
             editable={action !== AddressBookActionEnum.Delete}
+            maxLength={50}
           />
         </View>
       </View>
diff --git a/components/AddressList/AddressList.tsx b/components/AddressList/AddressList.tsx
@@ -5,8 +5,8 @@ import {
   ScrollView,
   NativeScrollEvent,
   NativeSyntheticEvent,
-  TouchableOpacity,
   ActivityIndicator,
+  Pressable,
 } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
@@ -250,28 +250,29 @@ const AddressList: React.FunctionComponent<AddressListProps> = ({
           )}
         </ScrollView>
         {!isAtTop && (
-          <TouchableOpacity
+          <Pressable
             onPress={handleScrollToTop}
             disabled={isScrollingToTop}
-            style={{
+            style={({ pressed }) => ({
               position: 'absolute',
               bottom: 105,
               right: 10,
               paddingHorizontal: 5,
               paddingVertical: 10,
               backgroundColor: colors.sideMenuBackground,
               borderRadius: 50,
+              transform: [{ scale: pressed ? 0.9 : 1 }],
               borderWidth: 1,
               borderColor: colors.zingo,
               opacity: isScrollingToTop ? 0.5 : 1,
-            }}>
+            })}>
             <FontAwesomeIcon
               style={{ marginLeft: 5, marginRight: 5, marginTop: 0 }}
               size={20}
               icon={faAngleUp}
               color={colors.zingo}
             />
-          </TouchableOpacity>
+          </Pressable>
         )}
       </View>
     </ToastProvider>
diff --git a/components/Header/Header.tsx b/components/Header/Header.tsx
@@ -740,7 +740,11 @@ const Header: React.FunctionComponent<HeaderProps> = ({
                 currencyName={info.currencyName}
                 color={colors.text}
                 size={36}
-                amtZec={totalBalance ? totalBalance.confirmedOrchardBalance + totalBalance.confirmedSaplingBalance : 0}
+                amtZec={totalBalance
+                  ? totalBalance.confirmedOrchardBalance +
+                    totalBalance.confirmedSaplingBalance +
+                    totalBalance.confirmedTransparentBalance
+                  : 0}
                 privacy={privacy}
                 smallPrefix={true}
               />
@@ -798,7 +802,11 @@ const Header: React.FunctionComponent<HeaderProps> = ({
                 <CurrencyAmount
                   style={{ marginTop: 0, marginBottom: 0 }}
                   price={zecPrice.zecPrice}
-                  amtZec={totalBalance ? totalBalance.confirmedOrchardBalance + totalBalance.confirmedSaplingBalance : 0}
+                  amtZec={totalBalance
+                    ? totalBalance.confirmedOrchardBalance +
+                      totalBalance.confirmedSaplingBalance +
+                      totalBalance.confirmedTransparentBalance
+                    : 0}
                   currency={currency}
                   privacy={privacy}
                 />
diff --git a/components/History/components/ValueTransferDetail.tsx b/components/History/components/ValueTransferDetail.tsx
diff --git a/components/History/components/ValueTransferLine.tsx b/components/History/components/ValueTransferLine.tsx
diff --git a/components/Messages/components/ContactList.tsx b/components/Messages/components/ContactList.tsx
diff --git a/components/Messages/components/MessageList.tsx b/components/Messages/components/MessageList.tsx
diff --git a/components/Receive/components/NewAddress.tsx b/components/Receive/components/NewAddress.tsx
diff --git a/components/Receive/components/NewAddressTag.tsx b/components/Receive/components/NewAddressTag.tsx
diff --git a/components/Send/Send.tsx b/components/Send/Send.tsx
diff --git a/ios/ZingoMobile.xcodeproj/project.pbxproj b/ios/ZingoMobile.xcodeproj/project.pbxproj
