update

cashubtc · Sep 16, 2023 · 6f1dc87 · 6f1dc87
1 parent 20dbf1b
commit 6f1dc87
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 12 deletions.
diff --git a/assets/translations/de.json b/assets/translations/de.json
@@ -220,7 +220,6 @@
 		"supportDev": "Zap die Entwicklung",
 		"supportHint": "Jeder Beitrag, ganz gleich in welcher Höhe, hat eine bedeutende Auswirkung. Die Bestätigungsseite befindet sich in der Entwicklung.",
 		"newToken": "Neuer Cashu Token",
-		"EcashRdy": "Du bist nun bereit, die Magie von privatem Ecash auf Bitcoin zu erleben!",
 		"disclaimerHint": "Dieser Haftungsausschluss sollte ernst genommen und nicht ignoriert oder unterschätzt werden. Wir schätzen Ihr Interesse an diesem Projekt und werden weiterhin daran arbeiten, es zu verbessern."
 	},
 	"error": {

diff --git a/assets/translations/en.json b/assets/translations/en.json
@@ -220,7 +220,6 @@
 		"supportDev": "Zap the devs",
 		"supportHint": "Every contribution, no matter the size, makes a significant impact. Confirmation screen is under development.",
 		"newToken": "New Cashu token",
-		"EcashRdy": "You are now ready to experience the magic of private Ecash on Bitcoin!",
 		"disclaimerHint": "This disclaimer should be taken seriously and should not be ignored or underestimated. We appreciate your interest in this project and will continue to work on improving it."
 	},
 	"error": {

diff --git a/assets/translations/fr.json b/assets/translations/fr.json
@@ -217,7 +217,6 @@
 		"supportDev": "Zap le développement",
 		"supportHint": "Chaque contribution, quelle que soit sa taille, a un impact significatif. L'écran de confirmation est en cours de développement.",
 		"newToken": "Nouveau Cashu Token",
-		"EcashRdy": "Vous êtes maintenant prêt à découvrir la magie de l'Ecash privé sur Bitcoin!",
 		"disclaimerHint": "Cette clause de non-responsabilité doit être prise au sérieux et ne doit pas être ignorée ni sous-estimée. Nous apprécions votre intérêt pour ce projet et continuerons à travailler à son amélioration."
 	},
 	"error": {

diff --git a/src/components/App.tsx b/src/components/App.tsx
@@ -154,7 +154,7 @@ function _App() {
 		// handle app was longer than 5 mins in the background
 		const bgTimestamp = await store.get(STORE_KEYS.bgCounter)
 		if (isStr(bgTimestamp) && bgTimestamp.length > 0) {
-			if (now - +bgTimestamp > 5) {
+			if (now - +bgTimestamp > FiveMins) {
 				setBgAuth(true)
 			}
 		}

diff --git a/src/screens/Payment/Receive/Invoice.tsx b/src/screens/Payment/Receive/Invoice.tsx
@@ -32,8 +32,6 @@ export default function InvoiceScreen({ navigation, route }: TMintInvoicePagePro
 	const { copied, copy } = useCopy()
 
 	const handlePayment = async (isCancelling?: boolean) => {
-		// only check the payment if paid === ''
-		if (paid === 'unpaid' || paid === 'paid') { return }
 		const previousBalance = await getBalance()
 		try {
 			const { success } = await requestToken(mintUrl, amount, hash)
@@ -59,8 +57,6 @@ export default function InvoiceScreen({ navigation, route }: TMintInvoicePagePro
 				return
 			}
 			setPaid('unpaid')
-			// reset state
-			setTimeout(() => setPaid(''), 3000)
 			if (isCancelling) {
 				navigation.navigate('dashboard')
 			}
@@ -132,7 +128,7 @@ export default function InvoiceScreen({ navigation, route }: TMintInvoicePagePro
 				</Text>
 				{expire > 0 &&
 					<View style={styles.awaitingWrap}>
-						<Txt txt='Awaiting payment...' styles={[{ fontWeight: '500', marginRight: 10 }]} />
+						<Txt txt={t('paymentPending') + '...'} styles={[{ fontWeight: '500', marginRight: 10 }]} />
 						<Loading />
 					</View>
 				}

diff --git a/src/screens/Payment/Success.tsx b/src/screens/Payment/Success.tsx
@@ -67,9 +67,6 @@ export default function SuccessPage({ navigation, route }: TSuccessPageProps) {
 						style={{ width: 130 }}
 					/>
 				</View>
-				{mint && mint.length > 0 &&
-					<Txt txt={t('EcashRdy')} styles={[styles.rdy]} />
-				}
 				{isMelt && amount &&
 					<View style={styles.meltWrap}>
 						<View style={styles.meltOverview}>