Merge branch 'master' into blocxkex

components/Alert.ts

@@ -1,6 +1,5 @@
 import { Alert as RNAlert, Platform, ToastAndroid } from 'react-native';
 import triggerHapticFeedback, { HapticFeedbackTypes } from '../blue_modules/hapticFeedback';
-import loc from '../loc';
 
 export enum AlertType {
   Alert,
@@ -29,7 +28,7 @@ const presentAlert = ({
       ToastAndroid.show(message, ToastAndroid.LONG);
       break;
     default:
-      RNAlert.alert(title ?? loc.alert.default, message);
+      RNAlert.alert(title ?? message, title && message ? message : undefined);
       break;
   }
 };

loc/de_de.json

@@ -27,9 +27,6 @@
     "qr_custom_input_button": "10x antippen für individuelle Eingabe",
     "unlock": "Entsperren"
   },
-  "alert": {
-    "default": "Warnung"
-  },
   "azteco": {
     "codeIs": "Dein Gutscheincode lautet",
     "errorBeforeRefeem": "Vor dem Einlösen zuerst eine Bitcoin Wallet hinzufügen.",

loc/en.json

@@ -29,9 +29,6 @@
     "qr_custom_input_button": "Tap 10 times to enter custom input",
     "unlock": "Unlock"
   },
-  "alert": {
-    "default": "Alert"
-  },
   "azteco": {
     "codeIs": "Your voucher code is",
     "errorBeforeRefeem": "Before redeeming, you must first add a Bitcoin wallet.",

loc/es_419.json

@@ -27,9 +27,6 @@
     "qr_custom_input_button": "Pulsa 10 veces para ingresar una entrada personalizada",
     "unlock": "Desbloquear"
   },
-  "alert": {
-    "default": "Alerta"
-  },
   "azteco": {
     "codeIs": "Tu código de cupón es",
     "errorBeforeRefeem": "Antes de canjear, primero debes agregar una billetera Bitcoin.",

loc/pl.json

@@ -27,9 +27,6 @@
     "qr_custom_input_button": "Tapnij 10 razy aby wprowadzić własne dane",
     "unlock": "Odblokuj"
   },
-  "alert": {
-    "default": "Powiadomienie"
-  },
   "azteco": {
     "codeIs": "Kod twojego vouchera to",
     "errorBeforeRefeem": "Zanim wykorzystasz kod rabatowy, musisz dodać najpierw portfel Bitcoinowy",