Skip to content

Commit cd433f8

Browse files
juanky201271juanky201271
committed
fix: new test version 2.0.0 (256) - RC-10 - zingolib rc3
1 parent 26cdf76 commit cd433f8

File tree

10 files changed

+72
-52
lines changed

10 files changed

+72
-52
lines changed

‎android/app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ android {
115115
applicationId 'org.ZingoLabs.Zingo' // Real
116116
minSdkVersion rootProject.ext.minSdkVersion
117117
targetSdkVersion rootProject.ext.targetSdkVersion
118-
versionCode 255 // Real
118+
versionCode 256 // Real
119119
versionName "zingo-2.0.0" // Real
120120
testBuildType System.getProperty('testBuildType', 'debug')
121121
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

‎app/LoadedApp/LoadedApp.tsx‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -938,16 +938,16 @@ export class LoadedAppClass extends Component<LoadedAppClassProps, LoadedAppClas
938938
this.state.valueTransfersTotal !== null &&
939939
this.state.valueTransfersTotal > 0 &&
940940
this.state.valueTransfers
941-
.filter((vtOld: ValueTransferType) => vtOld.confirmations < GlobalConst.minConfirmations)
941+
.filter((vtOld: ValueTransferType) => vtOld.confirmations === 0) // not confirmed
942942
.forEach((vtOld: ValueTransferType) => {
943943
const vtNew = valueTransfers.filter(
944944
(vt: ValueTransferType) =>
945945
vt.txid === vtOld.txid && vt.address === vtOld.address && vt.poolType === vtOld.poolType,
946946
);
947947
//console.log('old', vtOld);
948948
//console.log('new', vtNew);
949-
// the ValueTransfer is confirmed
950-
if (vtNew.length > 0 && vtNew[0].confirmations >= GlobalConst.minConfirmations) {
949+
// the ValueTransfer is confirmed when the confirmations are > 0
950+
if (vtNew.length > 0 && vtNew[0].confirmations > 0) {
951951
let message: string = '';
952952
let title: string = '';
953953
if (vtNew[0].kind === ValueTransferKindEnum.Received && vtNew[0].amount > 0) {
@@ -1026,17 +1026,18 @@ export class LoadedAppClass extends Component<LoadedAppClassProps, LoadedAppClas
10261026
}
10271027
}
10281028
// the ValueTransfer is gone -> Likely Reverted by the server
1029-
if (vtNew.length === 0) {
1030-
createAlert(
1031-
this.setBackgroundError,
1032-
this.addLastSnackbar,
1033-
[this.screenName],
1034-
this.state.translate('loadedapp.send-menu') as string,
1035-
this.state.translate('loadedapp.valuetransfer-reverted') as string,
1036-
true,
1037-
this.state.translate,
1038-
);
1039-
}
1029+
// this is really confusing...
1030+
//if (vtNew.length === 0) {
1031+
// createAlert(
1032+
// this.setBackgroundError,
1033+
// this.addLastSnackbar,
1034+
// [this.screenName],
1035+
// this.state.translate('loadedapp.send-menu') as string,
1036+
// this.state.translate('loadedapp.valuetransfer-reverted') as string,
1037+
// true,
1038+
// this.state.translate,
1039+
// );
1040+
//}
10401041
});
10411042
// if some tx is confirmed the UI needs some time to
10421043
// acomodate the bottom tabs.

‎app/translations/en.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"zingo": "Zingo",
3-
"version": "zingo-2.0.0 (254)",
3+
"version": "zingo-2.0.0 (256)",
44
"loading": "loading...",
55
"connectingserver": "Connecting to the server...",
66
"wait": "Please wait...",
@@ -643,7 +643,8 @@
643643
"resend-alert": "Confirm to Resend this transaction again.",
644644
"remove-alert": "Confirm to remove failed transaction from device and restore balance",
645645
"remove-legend": "Remove transaction to restore balance",
646-
"expired": "Expired - Remove to restore balance"
646+
"expired": "Expired - Remove to restore balance",
647+
"waiting": "Funds waiting for the minimum confirmations"
647648
},
648649
"report": {
649650
"title": "Sync / Rescan Report",

‎app/translations/es.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"zingo": "Zingo",
3-
"version": "zingo-2.0.0 (255)",
3+
"version": "zingo-2.0.0 (256)",
44
"loading": "cargando...",
55
"connectingserver": "Conectando con el servidor...",
66
"wait": "Por favor espere...",
@@ -643,7 +643,8 @@
643643
"resend-alert": "Confirmar para reenviar esta transacción de nuevo.",
644644
"remove-alert": "Confirmar para eliminar la transacción fallida del dispositivo y restaurar el saldo",
645645
"remove-legend": "Eliminar transacción para restablecer el saldo",
646-
"expired": "Expirada - Eliminar para restablecer el saldo"
646+
"expired": "Expirada - Eliminar para restablecer el saldo",
647+
"waiting": "Fondos en espera de las confirmaciones mínimas"
647648
},
648649
"report": {
649650
"title": "Informe de Sincronización",

‎app/translations/pt.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"zingo": "Zingo",
3-
"version": "zingo-2.0.0 (255)",
3+
"version": "zingo-2.0.0 (256)",
44
"loading": "carregando...",
55
"connectingserver": "Conectando-se ao servidor...",
66
"wait": "Aguarde um momento...",
@@ -643,7 +643,8 @@
643643
"resend-alert": "Confirme para reenviar esta transação novamente.",
644644
"remove-alert": "Confirme para remover a transação com falha do dispositivo e restaurar o saldo",
645645
"remove-legend": "Remover transação para restaurar o saldo",
646-
"expired": "Expirada - Remover para restaurar o saldo"
646+
"expired": "Expirada - Remover para restaurar o saldo",
647+
"waiting": "Fundos aguardando as confirmações mínimas"
647648
},
648649
"report": {
649650
"title": "Relatório de Sincronização / Rescan",

‎app/translations/ru.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"zingo": "Zingo",
3-
"version": "zingo-2.0.0 (255)",
3+
"version": "zingo-2.0.0 (256)",
44
"loading": "загрузка...",
55
"connectingserver": "Подключение к серверу...",
66
"wait": "Пожалуйста, подождите...",
@@ -643,7 +643,8 @@
643643
"resend-alert": "Подтвердите повторную отправку этой транзакции.",
644644
"remove-alert": "Подтвердите удаление неудачной транзакции с устройства и восстановление баланса",
645645
"remove-legend": "Удалить транзакцию для восстановления баланса",
646-
"expired": "Истек срок действия - Удалите для восстановления баланса"
646+
"expired": "Истек срок действия - Удалите для восстановления баланса",
647+
"waiting": "Средства ожидают минимального количества подтверждений"
647648
},
648649
"report": {
649650
"title": "Отчёт о синхронизации",

‎app/translations/tr.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"zingo": "Zingo",
3-
"version": "zingo-2.0.0 (255)",
3+
"version": "zingo-2.0.0 (256)",
44
"loading": "Yükleniyor...",
55
"connectingserver": "Sunucuya bağlanılıyor...",
66
"wait": "Lütfen bekleyin...",
@@ -643,7 +643,8 @@
643643
"resend-alert": "Bu işlemi yeniden göndermeyi onaylayın",
644644
"remove-alert": "Başarısız işlemi cihazdan kaldırmak ve bakiyeyi geri yüklemek için onaylayın",
645645
"remove-legend": "Bakiyeyi geri yüklemek için işlemi kaldırın",
646-
"expired": "Süresi doldu - Bakiyeyi geri yüklemek için kaldırın"
646+
"expired": "Süresi doldu - Bakiyeyi geri yüklemek için kaldırın",
647+
"waiting": "Fonlar minimum onay bekliyor"
647648
},
648649
"report": {
649650
"title": "Senkronizasyon / Yeniden Tarama Raporu",

‎components/History/components/ValueTransferDetail.tsx‎

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -368,29 +368,29 @@ const ValueTransferDetail: React.FunctionComponent<ValueTransferDetailProps> = (
368368
borderColor: colors.border,
369369
}}>
370370
<BoldText style={{ textAlign: 'center', textTransform: 'capitalize', color: spendColor }}>
371-
{valueTransfer.kind === ValueTransferKindEnum.Sent && valueTransfer.confirmations < GlobalConst.minConfirmations
371+
{valueTransfer.kind === ValueTransferKindEnum.Sent && valueTransfer.confirmations === 0
372372
? (translate('history.sending') as string)
373-
: valueTransfer.kind === ValueTransferKindEnum.Sent && valueTransfer.confirmations >= GlobalConst.minConfirmations
373+
: valueTransfer.kind === ValueTransferKindEnum.Sent && valueTransfer.confirmations > 0
374374
? (translate('history.sent') as string)
375-
: valueTransfer.kind === ValueTransferKindEnum.Received && valueTransfer.confirmations < GlobalConst.minConfirmations
375+
: valueTransfer.kind === ValueTransferKindEnum.Received && valueTransfer.confirmations === 0
376376
? (translate('history.receiving') as string)
377-
: valueTransfer.kind === ValueTransferKindEnum.Received && valueTransfer.confirmations >= GlobalConst.minConfirmations
377+
: valueTransfer.kind === ValueTransferKindEnum.Received && valueTransfer.confirmations > 0
378378
? (translate('history.received') as string)
379-
: valueTransfer.kind === ValueTransferKindEnum.MemoToSelf && valueTransfer.confirmations < GlobalConst.minConfirmations
379+
: valueTransfer.kind === ValueTransferKindEnum.MemoToSelf && valueTransfer.confirmations === 0
380380
? (translate('history.sendingtoself') as string)
381-
: valueTransfer.kind === ValueTransferKindEnum.MemoToSelf && valueTransfer.confirmations >= GlobalConst.minConfirmations
381+
: valueTransfer.kind === ValueTransferKindEnum.MemoToSelf && valueTransfer.confirmations > 0
382382
? (translate('history.memotoself') as string)
383-
: valueTransfer.kind === ValueTransferKindEnum.SendToSelf && valueTransfer.confirmations < GlobalConst.minConfirmations
383+
: valueTransfer.kind === ValueTransferKindEnum.SendToSelf && valueTransfer.confirmations === 0
384384
? (translate('history.sendingtoself') as string)
385-
: valueTransfer.kind === ValueTransferKindEnum.SendToSelf && valueTransfer.confirmations >= GlobalConst.minConfirmations
385+
: valueTransfer.kind === ValueTransferKindEnum.SendToSelf && valueTransfer.confirmations > 0
386386
? (translate('history.sendtoself') as string)
387-
: valueTransfer.kind === ValueTransferKindEnum.Shield && valueTransfer.confirmations < GlobalConst.minConfirmations
387+
: valueTransfer.kind === ValueTransferKindEnum.Shield && valueTransfer.confirmations === 0
388388
? (translate('history.shielding') as string)
389-
: valueTransfer.kind === ValueTransferKindEnum.Shield && valueTransfer.confirmations >= GlobalConst.minConfirmations
389+
: valueTransfer.kind === ValueTransferKindEnum.Shield && valueTransfer.confirmations > 0
390390
? (translate('history.shield') as string)
391-
: valueTransfer.kind === ValueTransferKindEnum.Rejection && valueTransfer.confirmations < GlobalConst.minConfirmations
391+
: valueTransfer.kind === ValueTransferKindEnum.Rejection && valueTransfer.confirmations === 0
392392
? (translate('history.sending') as string)
393-
: valueTransfer.kind === ValueTransferKindEnum.Rejection && valueTransfer.confirmations >= GlobalConst.minConfirmations
393+
: valueTransfer.kind === ValueTransferKindEnum.Rejection && valueTransfer.confirmations > 0
394394
? (translate('history.rejection') as string)
395395
: ''}
396396
</BoldText>
@@ -499,6 +499,20 @@ const ValueTransferDetail: React.FunctionComponent<ValueTransferDetailProps> = (
499499
{(translate(`history.${valueTransfer.status}`) as string) + ' - ' + (translate('history.not-confirmed') as string)}
500500
</FadeText>
501501
)}
502+
{valueTransfer.status === RPCValueTransfersStatusEnum.confirmed &&
503+
valueTransfer.confirmations < GlobalConst.minConfirmations && (
504+
<FadeText
505+
style={{
506+
color: colors.primaryDisabled,
507+
fontSize: 12,
508+
opacity: 1,
509+
fontWeight: '700',
510+
textAlign: 'left',
511+
textDecorationLine: 'none',
512+
}}>
513+
{(translate(`history.${valueTransfer.status}`) as string) + ' - ' + (translate('history.waiting') as string)}
514+
</FadeText>
515+
)}
502516
</View>
503517
)}
504518

‎components/History/components/ValueTransferLine.tsx‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -327,29 +327,29 @@ const ValueTransferLine: React.FunctionComponent<ValueTransferLineProps> = ({
327327
color: amountColor,
328328
fontSize: vt.confirmations < GlobalConst.minConfirmations ? 14 : 18,
329329
}}>
330-
{vt.kind === ValueTransferKindEnum.Sent && vt.confirmations < GlobalConst.minConfirmations
330+
{vt.kind === ValueTransferKindEnum.Sent && vt.confirmations === 0
331331
? (translate('history.sending') as string)
332-
: vt.kind === ValueTransferKindEnum.Sent && vt.confirmations >= GlobalConst.minConfirmations
332+
: vt.kind === ValueTransferKindEnum.Sent && vt.confirmations > 0
333333
? (translate('history.sent') as string)
334-
: vt.kind === ValueTransferKindEnum.Received && vt.confirmations < GlobalConst.minConfirmations
334+
: vt.kind === ValueTransferKindEnum.Received && vt.confirmations === 0
335335
? (translate('history.receiving') as string)
336-
: vt.kind === ValueTransferKindEnum.Received && vt.confirmations >= GlobalConst.minConfirmations
336+
: vt.kind === ValueTransferKindEnum.Received && vt.confirmations > 0
337337
? (translate('history.received') as string)
338-
: vt.kind === ValueTransferKindEnum.MemoToSelf && vt.confirmations < GlobalConst.minConfirmations
338+
: vt.kind === ValueTransferKindEnum.MemoToSelf && vt.confirmations === 0
339339
? (translate('history.sendingtoself') as string)
340-
: vt.kind === ValueTransferKindEnum.MemoToSelf && vt.confirmations >= GlobalConst.minConfirmations
340+
: vt.kind === ValueTransferKindEnum.MemoToSelf && vt.confirmations > 0
341341
? (translate('history.memotoself') as string)
342-
: vt.kind === ValueTransferKindEnum.SendToSelf && vt.confirmations < GlobalConst.minConfirmations
342+
: vt.kind === ValueTransferKindEnum.SendToSelf && vt.confirmations === 0
343343
? (translate('history.sendingtoself') as string)
344-
: vt.kind === ValueTransferKindEnum.SendToSelf && vt.confirmations >= GlobalConst.minConfirmations
344+
: vt.kind === ValueTransferKindEnum.SendToSelf && vt.confirmations > 0
345345
? (translate('history.sendtoself') as string)
346-
: vt.kind === ValueTransferKindEnum.Shield && vt.confirmations < GlobalConst.minConfirmations
346+
: vt.kind === ValueTransferKindEnum.Shield && vt.confirmations === 0
347347
? (translate('history.shielding') as string)
348-
: vt.kind === ValueTransferKindEnum.Shield && vt.confirmations >= GlobalConst.minConfirmations
348+
: vt.kind === ValueTransferKindEnum.Shield && vt.confirmations > 0
349349
? (translate('history.shield') as string)
350-
: vt.kind === ValueTransferKindEnum.Rejection && vt.confirmations < GlobalConst.minConfirmations
350+
: vt.kind === ValueTransferKindEnum.Rejection && vt.confirmations === 0
351351
? (translate('history.sending') as string)
352-
: vt.kind === ValueTransferKindEnum.Rejection && vt.confirmations >= GlobalConst.minConfirmations
352+
: vt.kind === ValueTransferKindEnum.Rejection && vt.confirmations > 0
353353
? (translate('history.rejection') as string)
354354
: ''}
355355
</FadeText>
@@ -375,7 +375,7 @@ const ValueTransferLine: React.FunctionComponent<ValueTransferLineProps> = ({
375375
privacy={privacy}
376376
/>
377377
</View>
378-
{vt.confirmations < GlobalConst.minConfirmations && (
378+
{vt.confirmations === 0 && (
379379
<View style={{ display: 'flex', flexDirection: 'row', alignItems: 'center', justifyContent: 'center' }}>
380380
{(vt.status === RPCValueTransfersStatusEnum.transmitted ||
381381
vt.status === RPCValueTransfersStatusEnum.calculated) && (

‎ios/ZingoMobile.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@
550550
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
551551
CLANG_ENABLE_MODULES = YES;
552552
CODE_SIGN_ENTITLEMENTS = ZingoMobile/ZingoMobile.entitlements;
553-
CURRENT_PROJECT_VERSION = 255;
553+
CURRENT_PROJECT_VERSION = 256;
554554
DEVELOPMENT_TEAM = 788KRST4S8;
555555
ENABLE_BITCODE = NO;
556556
EXCLUDED_ARCHS = "";
@@ -591,7 +591,7 @@
591591
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
592592
CLANG_ENABLE_MODULES = YES;
593593
CODE_SIGN_ENTITLEMENTS = ZingoMobile/ZingoMobile.entitlements;
594-
CURRENT_PROJECT_VERSION = 255;
594+
CURRENT_PROJECT_VERSION = 256;
595595
DEVELOPMENT_TEAM = 788KRST4S8;
596596
ENABLE_BITCODE = NO;
597597
EXCLUDED_ARCHS = "";

0 commit comments

Comments
 (0)