Skip to content

Commit a7d9602

Browse files
juanky201271juanky201271
authored
Merge pull request zingolabs#876 from juanky201271/dev_adopting_zingolib_stable
Adopting zingolib stable - 2.0.0 (254) RC-8
2 parents 0db0718 + a8de711 commit a7d9602

File tree

17 files changed

+92
-102
lines changed

17 files changed

+92
-102
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 251 // Real
118+
versionCode 254 // Real
119119
versionName "zingo-2.0.0" // Real
120120
testBuildType System.getProperty('testBuildType', 'debug')
121121
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

‎android/app/src/main/java/org/ZingoLabs/Zingo/BackgroundSyncWorker.kt‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,13 @@ class BackgroundSyncWorker(private val context: Context, workerParams: WorkerPar
8484
if (balance.lowercase().startsWith(ErrorPrefix.value)) {
8585
// this means this task is running with the App closed
8686
loadWalletFile()
87-
} else {
87+
}
88+
//else {
8889
// this means the App is open,
8990
// stop syncing first, just in case.
9091
// with pepper-sync no need to stop sync process here
91-
stopSyncingProcess()
92-
}
92+
// stopSyncingProcess()
93+
//}
9394

9495
// setting performance level & min confirmations
9596
uniffi.zingo.setConfigWalletToProd()
@@ -262,8 +263,8 @@ class BSCompanion {
262263
fun cancelExecutingTask() {
263264
val context = MainApplication.getAppContext() as Context
264265
// run pause sync, just in case.
265-
val stop = uniffi.zingo.stopSync()
266-
Log.i("SCHEDULED_TASK_RUN", "Stopping sync: $stop")
266+
//val stop = uniffi.zingo.stopSync()
267+
//Log.i("SCHEDULED_TASK_RUN", "Stopping sync: $stop")
267268

268269
Log.i("SCHEDULING_TASK", "Cancel background Task")
269270
WorkManager.getInstance(context)

‎app/rpc/RPC.ts‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -453,17 +453,6 @@ export default class RPC {
453453

454454
//sleep = (ms: number) => new Promise(r => setTimeout(r, ms));
455455

456-
// this is not used for now...
457-
async stopSyncProcess(): Promise<void> {
458-
let returnStop: string = await RPCModule.stopSyncProcess();
459-
if (!returnStop || returnStop.toLowerCase().startsWith(GlobalConst.error)) {
460-
console.log('SYNC STOP ERROR', returnStop);
461-
return;
462-
} else {
463-
console.log('stop sync process. STOPPED', returnStop);
464-
}
465-
}
466-
467456
async pauseSyncProcess(): Promise<void> {
468457
let returnPause: string = await RPCModule.pauseSyncProcess();
469458
if (!returnPause || returnPause.toLowerCase().startsWith(GlobalConst.error)) {

‎app/translations/en.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"zingo": "Zingo",
3-
"version": "zingo-2.0.0 (251)",
3+
"version": "zingo-2.0.0 (254)",
44
"loading": "loading...",
55
"connectingserver": "Connecting to the server...",
66
"wait": "Please wait...",

‎app/translations/es.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"zingo": "Zingo",
3-
"version": "zingo-2.0.0 (251)",
3+
"version": "zingo-2.0.0 (254)",
44
"loading": "cargando...",
55
"connectingserver": "Conectando con el servidor...",
66
"wait": "Por favor espere...",

‎app/translations/pt.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"zingo": "Zingo",
3-
"version": "zingo-2.0.0 (251)",
3+
"version": "zingo-2.0.0 (254)",
44
"loading": "carregando...",
55
"connectingserver": "Conectando-se ao servidor...",
66
"wait": "Aguarde um momento...",

‎app/translations/ru.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"zingo": "Zingo",
3-
"version": "zingo-2.0.0 (251)",
3+
"version": "zingo-2.0.0 (254)",
44
"loading": "загрузка...",
55
"connectingserver": "Подключение к серверу...",
66
"wait": "Пожалуйста, подождите...",

‎app/translations/tr.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"zingo": "Zingo",
3-
"version": "zingo-2.0.0 (251)",
3+
"version": "zingo-2.0.0 (254)",
44
"loading": "Yükleniyor...",
55
"connectingserver": "Sunucuya bağlanılıyor...",
66
"wait": "Lütfen bekleyin...",

‎components/AddressBook/AddressBook.tsx‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import { ContextAppLoaded } from '../../app/context';
2626
import Header from '../Header';
2727
import AddressBookFileImpl from './AddressBookFileImpl';
2828
import { FontAwesomeIcon } from '@fortawesome/react-native-fontawesome';
29-
import { faAnglesUp } from '@fortawesome/free-solid-svg-icons';
29+
import { faAngleUp } from '@fortawesome/free-solid-svg-icons';
3030
import Utils from '../../app/utils';
3131
import { useMagicModal } from 'react-native-magic-modal';
3232
import Snackbars from '../Components/Snackbars';
@@ -180,18 +180,18 @@ const AddressBook: React.FunctionComponent<AddressBookProps> = ({
180180
const handleScrollToTop = useCallback(() => {
181181
if (scrollViewRef.current && !isScrollingToTop) {
182182
setIsScrollingToTop(true);
183-
183+
184184
// Clear any existing timeout
185185
if (scrollTimeoutRef.current) {
186186
clearTimeout(scrollTimeoutRef.current);
187187
}
188-
188+
189189
// Force set to top immediately for UI feedback
190190
setIsAtTop(true);
191-
191+
192192
// Scroll to top
193193
scrollViewRef.current.scrollTo({ y: 0, animated: true });
194-
194+
195195
// Set timeout to reset scrolling state
196196
scrollTimeoutRef.current = setTimeout(() => {
197197
setIsScrollingToTop(false);
@@ -206,7 +206,7 @@ const AddressBook: React.FunctionComponent<AddressBookProps> = ({
206206
const handleScroll = useCallback((event: NativeSyntheticEvent<NativeScrollEvent>) => {
207207
const { contentOffset } = event.nativeEvent;
208208
const isTop = contentOffset.y <= 100;
209-
209+
210210
// If we're scrolling to top and we've reached the top, stop the scrolling state
211211
if (isScrollingToTop && isTop) {
212212
setIsScrollingToTop(false);
@@ -215,7 +215,7 @@ const AddressBook: React.FunctionComponent<AddressBookProps> = ({
215215
scrollTimeoutRef.current = null;
216216
}
217217
}
218-
218+
219219
// Always update isAtTop for manual scrolling
220220
setIsAtTop(isTop);
221221
}, [isScrollingToTop]);
@@ -486,25 +486,25 @@ const AddressBook: React.FunctionComponent<AddressBookProps> = ({
486486
)}
487487
</ScrollView>
488488
{!isAtTop && (
489-
<TouchableOpacity
490-
onPress={handleScrollToTop}
489+
<TouchableOpacity
490+
onPress={handleScrollToTop}
491491
disabled={isScrollingToTop}
492-
style={{
493-
position: 'absolute',
494-
bottom: 105,
492+
style={{
493+
position: 'absolute',
494+
bottom: 105,
495495
right: 10,
496496
paddingHorizontal: 5,
497497
paddingVertical: 10,
498-
backgroundColor: isScrollingToTop ? colors.primaryDisabled : colors.sideMenuBackground,
498+
backgroundColor: colors.sideMenuBackground,
499499
borderRadius: 50,
500500
borderWidth: 1,
501-
borderColor: isScrollingToTop ? colors.primaryDisabled : colors.zingo,
501+
borderColor: colors.zingo,
502502
opacity: isScrollingToTop ? 0.5 : 1,
503503
}}>
504504
<FontAwesomeIcon
505505
style={{ marginLeft: 5, marginRight: 5, marginTop: 0 }}
506506
size={20}
507-
icon={faAnglesUp}
507+
icon={faAngleUp}
508508
color={colors.zingo}
509509
/>
510510
</TouchableOpacity>

‎components/AddressList/AddressList.tsx‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import AlSummaryLine from './components/AlSummaryLine';
2424
import { ContextAppLoaded } from '../../app/context';
2525
import Header from '../Header';
2626
import { FontAwesomeIcon } from '@fortawesome/react-native-fontawesome';
27-
import { faAnglesUp } from '@fortawesome/free-solid-svg-icons';
27+
import { faAngleUp } from '@fortawesome/free-solid-svg-icons';
2828
import { useMagicModal } from 'react-native-magic-modal';
2929
import Snackbars from '../Components/Snackbars';
3030
import { ToastProvider, useToast } from 'react-native-toastier';
@@ -94,18 +94,18 @@ const AddressList: React.FunctionComponent<AddressListProps> = ({
9494
const handleScrollToTop = useCallback(() => {
9595
if (scrollViewRef.current && !isScrollingToTop) {
9696
setIsScrollingToTop(true);
97-
97+
9898
// Clear any existing timeout
9999
if (scrollTimeoutRef.current) {
100100
clearTimeout(scrollTimeoutRef.current);
101101
}
102-
102+
103103
// Force set to top immediately for UI feedback
104104
setIsAtTop(true);
105-
105+
106106
// Scroll to top
107107
scrollViewRef.current.scrollTo({ y: 0, animated: true });
108-
108+
109109
// Set timeout to reset scrolling state
110110
scrollTimeoutRef.current = setTimeout(() => {
111111
setIsScrollingToTop(false);
@@ -120,7 +120,7 @@ const AddressList: React.FunctionComponent<AddressListProps> = ({
120120
const handleScroll = useCallback((event: NativeSyntheticEvent<NativeScrollEvent>) => {
121121
const { contentOffset } = event.nativeEvent;
122122
const isTop = contentOffset.y <= 100;
123-
123+
124124
// If we're scrolling to top and we've reached the top, stop the scrolling state
125125
if (isScrollingToTop && isTop) {
126126
setIsScrollingToTop(false);
@@ -129,7 +129,7 @@ const AddressList: React.FunctionComponent<AddressListProps> = ({
129129
scrollTimeoutRef.current = null;
130130
}
131131
}
132-
132+
133133
// Always update isAtTop for manual scrolling
134134
setIsAtTop(isTop);
135135
}, [isScrollingToTop]);
@@ -250,25 +250,25 @@ const AddressList: React.FunctionComponent<AddressListProps> = ({
250250
)}
251251
</ScrollView>
252252
{!isAtTop && (
253-
<TouchableOpacity
254-
onPress={handleScrollToTop}
253+
<TouchableOpacity
254+
onPress={handleScrollToTop}
255255
disabled={isScrollingToTop}
256-
style={{
257-
position: 'absolute',
258-
bottom: 105,
256+
style={{
257+
position: 'absolute',
258+
bottom: 105,
259259
right: 10,
260260
paddingHorizontal: 5,
261261
paddingVertical: 10,
262-
backgroundColor: isScrollingToTop ? colors.primaryDisabled : colors.sideMenuBackground,
262+
backgroundColor: colors.sideMenuBackground,
263263
borderRadius: 50,
264264
borderWidth: 1,
265-
borderColor: isScrollingToTop ? colors.primaryDisabled : colors.zingo,
265+
borderColor: colors.zingo,
266266
opacity: isScrollingToTop ? 0.5 : 1,
267267
}}>
268268
<FontAwesomeIcon
269269
style={{ marginLeft: 5, marginRight: 5, marginTop: 0 }}
270270
size={20}
271-
icon={faAnglesUp}
271+
icon={faAngleUp}
272272
color={colors.zingo}
273273
/>
274274
</TouchableOpacity>

0 commit comments

Comments
 (0)