diff --git a/assets/flutter_i18n/de.json b/assets/flutter_i18n/de.json
index a03b4a0c..c01a8577 100644
--- a/assets/flutter_i18n/de.json
+++ b/assets/flutter_i18n/de.json
@@ -417,5 +417,41 @@
"save_locally": "Lokal speichern",
"save_locally_description": "Stellen Sie sicher, dass Sie Ihre Schlüssel lokal speichern und dann können Sie loslegen.",
"axs_storage_permission_use_case": "Die AXS Wallet benötigt Zugriff auf Ihren Speicher für Funktionen wie RWA. Ihre Speicherdaten werden nicht gespeichert oder mit Dritten geteilt.",
- "local_backup": "Lokale Sicherung"
+ "local_backup": "Lokale Sicherung",
+ "no_description": "Keine Beschreibung",
+ "bluetooth_not_supported": "Bluetooth wird auf diesem Gerät nicht unterstützt.",
+ "blueberry_ring_hooks": "Blaubeere Ring Haken",
+ "nearby_blueberry_rings": "In der Nähe von Blaubeer-Ringen",
+ "unable_to_continue_bluetooth_is_turned_off": "Kann nicht fortsetzen, Bluetooth ist ausgeschaltet!",
+ "scanning": "Scannen ...",
+ "blueberry_ring_inactive_alert_title": "Zeit für einen Spaziergang!",
+ "blueberry_ring_inactive_alert_text": "Sie waren eine Weile inaktiv. Ein kurzer Spaziergang könnte wirklich belebend sein!",
+ "blueberry_ring_sleep_alert_title": "Sie haben in letzter Zeit weniger Tiefschlaf bekommen als üblich. Versuchen Sie, sich heute Abend 30 Minuten früher zu entspannen, um besser auszuruhen.",
+ "blueberry_ring_sleep_alert_text": "Sie haben in letzter Zeit weniger Tiefschlaf bekommen als üblich. Versuchen Sie, sich heute Abend 30 Minuten früher zu entspannen, um besser auszuruhen.",
+ "blueberry_ring_heart_rate_alert_title": "Ihre Herzfrequenz war heute ungewöhnlich hoch. Wenn Sie sich unwohl fühlen, könnte es gut sein, einen Arzt aufzusuchen.",
+ "blueberry_ring_heart_rate_alert_text": "Ihre Herzfrequenz war heute ungewöhnlich hoch. Wenn Sie sich unwohl fühlen, könnte es gut sein, einen Arzt aufzusuchen.",
+ "blueberry_ring_battery_alert_title": "Der Akku ist fast leer!",
+ "blueberry_ring_battery_alert_text": "Der Akku Ihres Blueberry Rings ist fast leer. Bitte laden Sie ihn bald auf, um Datenlücken zu vermeiden.",
+ "activity_reminder": "Aktivitätserinnerung",
+ "sleep_insight": "Schlaf Einblick",
+ "heart_alert": "Herzalarm",
+ "low_battery": "Niedriger Akkustand",
+ "blueberry_background_notifications_requirements_title": "Dieser Service erfordert:",
+ "blueberry_background_notifications_requirements_text_1": "1. Bluetooth soll EINGESCHALTET sein",
+ "blueberry_background_notifications_requirements_text_2": "2. Blueberry soll erreichbar sein",
+ "auto_sync_started": "Blueberry Ring Autosynchronisation gestartet 🏁",
+ "no_rings_selected_notification_title": "Sieht so aus, als hätten Sie keine Blueberry Rings ausgewählt. ℹ️",
+ "no_rings_selected_notification_text": "Bitte gehen Sie zur Blueberry Ring DApp, um Ringe auszuwählen.",
+ "auto_sync_successful_notification_title": "Erfolgreiche Auto-Claim von Blueberry Ring ✅",
+ "auto_sync_successful_notification_text": "Ihre Ringdaten wurden erfolgreich mit der AXS-Wallet synchronisiert.",
+ "already_synced_notification_title": "Hoppla, bereits synchronisiert ℹ️",
+ "already_synced_notification_text": "Die AXS-Wallet hat versucht, Ihre Ringdaten zu synchronisieren, aber es sieht so aus, als hätten Sie die Ringdaten heute bereits synchronisiert.",
+ "auto_sync_failed": "Blueberry Ring Auto-Sync fehlgeschlagen ❌",
+ "no_rings_owned_notification": "Sieht so aus, als ob diese Wallet keine Blueberry Rings besitzt. ℹ️",
+ "syncing_data_from_ring": "Synchronisieren von Daten aus dem Blueberry Ring #{0}. ⛏️",
+ "already_synced_ring": "Blaubeere Ring #{0}: Bereits synchronisiert. ℹ️",
+ "data_synced_successfully_ring": "Blaubeere Ring #{0}: Daten erfolgreich synchronisiert. ✅",
+ "data_syncing_failed": "Blaubeere Ring #{0}: Daten-Synchronisationsprozess fehlgeschlagen. ❌",
+ "blueberry_hooks": "Blaubeerhaken",
+ "message": "Nachricht"
}
\ No newline at end of file
diff --git a/assets/flutter_i18n/en.json b/assets/flutter_i18n/en.json
index 27e7fd11..4a862b33 100644
--- a/assets/flutter_i18n/en.json
+++ b/assets/flutter_i18n/en.json
@@ -433,6 +433,20 @@
"low_battery": "Low battery",
"blueberry_background_notifications_requirements_title": "This service requires: ",
"blueberry_background_notifications_requirements_text_1": "1. Bluetooth to be ON",
- "blueberry_background_notifications_requirements_text_2": "2. Blueberry to be reachable"
-
+ "blueberry_background_notifications_requirements_text_2": "2. Blueberry to be reachable",
+ "auto_sync_started": "Blueberry Ring auto sync started 🏁",
+ "no_rings_selected_notification_title": "Looks like you haven't selected any Blueberry Rings. ℹ️",
+ "no_rings_selected_notification_text": "Please head over to Blueberry Ring DApp for selecting rings.",
+ "auto_sync_successful_notification_title": "Blueberry Ring aut-claim successful ✅",
+ "auto_sync_successful_notification_text": "AXS wallet has been successfully synced your ring data",
+ "already_synced_notification_title": "Oops, Already synced ℹ️",
+ "already_synced_notification_text": "AXS wallet tried to sync your ring data, But looks like you have synced the ring data today.",
+ "auto_sync_failed": "Blueberry Ring aut-sync failed ❌",
+ "no_rings_owned_notification": "Looks like this wallet doesn't own any Blueberry Rings. ℹ️",
+ "syncing_data_from_ring": "Syncing data from Blueberry Ring #{0}. ⛏️",
+ "already_synced_ring": "Blueberry Ring #{0}: Already synced. ℹ️",
+ "data_synced_successfully_ring": "Blueberry Ring #{0}: Data synced successfully. ✅",
+ "data_syncing_failed": "Blueberry Ring #{0}: Data syncing process failed. ❌",
+ "blueberry_hooks": "Blueberry hooks",
+ "message": "Message"
}
\ No newline at end of file
diff --git a/assets/flutter_i18n/es.json b/assets/flutter_i18n/es.json
index 64d48fff..215ffc05 100644
--- a/assets/flutter_i18n/es.json
+++ b/assets/flutter_i18n/es.json
@@ -417,5 +417,41 @@
"save_locally": "Guardar localmente",
"save_locally_description": "Asegúrate de guardar tus claves localmente y luego estás listo para continuar.",
"axs_storage_permission_use_case": "La billetera AXS necesita acceso a tu almacenamiento para funciones como RWA. Tus datos de almacenamiento no se guardan ni se comparten con terceros.",
- "local_backup": "Copia de seguridad local"
+ "local_backup": "Copia de seguridad local",
+ "no_description": "Sin descripción",
+ "bluetooth_not_supported": "Bluetooth no es compatible con este dispositivo.",
+ "blueberry_ring_hooks": "Blueberry Ring se engancha",
+ "nearby_blueberry_rings": "Anillos de Arándano Cercanos",
+ "unable_to_continue_bluetooth_is_turned_off": "No se puede continuar, ¡el Bluetooth está apagado!",
+ "scanning": "Escaneando ...",
+ "blueberry_ring_inactive_alert_title": "¡Hora de ir a dar un paseo!",
+ "blueberry_ring_inactive_alert_text": "Has estado inactivo durante un tiempo. ¡Un corto paseo podría ser realmente vigorizante!",
+ "blueberry_ring_sleep_alert_title": "Has estado obteniendo menos sueño profundo de lo habitual. Intenta relajarte 30 minutos antes esta noche para un mejor descanso.",
+ "blueberry_ring_sleep_alert_text": "Has estado obteniendo menos sueño profundo de lo habitual. Intenta relajarte 30 minutos antes esta noche para descansar mejor.",
+ "blueberry_ring_heart_rate_alert_title": "Tu ritmo cardíaco ha estado inusualmente alto hoy. Si te sientes mal, podría ser bueno consultar con un médico.",
+ "blueberry_ring_heart_rate_alert_text": "Tu ritmo cardíaco ha estado inusualmente alto hoy. Si te sientes mal, podría ser bueno consultar con un médico.",
+ "blueberry_ring_battery_alert_title": "¡La batería está baja!",
+ "blueberry_ring_battery_alert_text": "La batería de tu Anillo Blueberry está baja. Por favor, cárgala pronto para evitar interrupciones en los datos.",
+ "activity_reminder": "Recordatorio de actividad",
+ "sleep_insight": "Perspectiva del sueño",
+ "heart_alert": "Alerta de corazón",
+ "low_battery": "Batería baja",
+ "blueberry_background_notifications_requirements_title": "Este servicio requiere:",
+ "blueberry_background_notifications_requirements_text_1": "1. Bluetooth debe estar ENCENDIDO",
+ "blueberry_background_notifications_requirements_text_2": "2. Blueberry para ser accesible",
+ "auto_sync_started": "El auto sincronización de Blueberry Ring ha comenzado 🏁",
+ "no_rings_selected_notification_title": "Parece que no has seleccionado ningún Anillo de Arándano. ℹ️",
+ "no_rings_selected_notification_text": "Por favor, dirígete a la DApp de Blueberry Ring para seleccionar anillos.",
+ "auto_sync_successful_notification_title": "El auto-reclamo de Blueberry Ring ha sido exitoso ✅",
+ "auto_sync_successful_notification_text": "La cartera AXS ha sincronizado con éxito tus datos de anillo.",
+ "already_synced_notification_title": "Ups, ya sincronizado ℹ️",
+ "already_synced_notification_text": "La cartera AXS intentó sincronizar tus datos de anillo, pero parece que ya has sincronizado los datos del anillo hoy.",
+ "auto_sync_failed": "Falló la sincronización automática de Blueberry Ring ❌",
+ "no_rings_owned_notification": "Parece que esta billetera no posee ningún Blueberry Rings. ℹ️",
+ "syncing_data_from_ring": "Sincronizando datos desde Blueberry Ring #{0}. ⛏️",
+ "already_synced_ring": "Anillo de Arándano #{0}: Ya sincronizado. ℹ️",
+ "data_synced_successfully_ring": "Anillo de Arándano #{0}: Datos sincronizados con éxito. ✅",
+ "data_syncing_failed": "Anillo de Arándano #{0}: El proceso de sincronización de datos ha fallado. ❌",
+ "blueberry_hooks": "Ganchos de Arándano",
+ "message": "Mensaje"
}
\ No newline at end of file
diff --git a/assets/flutter_i18n/fr.json b/assets/flutter_i18n/fr.json
index 6f7a6d6c..4a6f6bd6 100644
--- a/assets/flutter_i18n/fr.json
+++ b/assets/flutter_i18n/fr.json
@@ -417,5 +417,41 @@
"save_locally": "Enregistrez localement",
"save_locally_description": "Assurez-vous de sauvegarder vos clés localement et ensuite vous êtes prêt à partir.",
"axs_storage_permission_use_case": "Le portefeuille AXS a besoin d'accéder à votre stockage pour des fonctionnalités telles que RWA. Vos données de stockage ne sont pas sauvegardées ni partagées avec des tiers.",
- "local_backup": "Sauvegarde locale"
+ "local_backup": "Sauvegarde locale",
+ "no_description": "Aucune description",
+ "bluetooth_not_supported": "Le Bluetooth n'est pas pris en charge sur cet appareil.",
+ "blueberry_ring_hooks": "Les Crochets de l'Anneau de Myrtille",
+ "nearby_blueberry_rings": "Anneaux de myrtille à proximité",
+ "unable_to_continue_bluetooth_is_turned_off": "Impossible de continuer, le Bluetooth est éteint!",
+ "scanning": "Analyse en cours...",
+ "blueberry_ring_inactive_alert_title": "Il est temps d'aller se promener!",
+ "blueberry_ring_inactive_alert_text": "Vous avez été inactif pendant un moment. Une petite promenade pourrait être vraiment revigorante!",
+ "blueberry_ring_sleep_alert_title": "Vous avez eu moins de sommeil profond que d'habitude. Essayez de vous détendre 30 minutes plus tôt ce soir pour un meilleur repos.",
+ "blueberry_ring_sleep_alert_text": "Vous avez eu moins de sommeil profond que d'habitude. Essayez de vous détendre 30 minutes plus tôt ce soir pour un meilleur repos.",
+ "blueberry_ring_heart_rate_alert_title": "Votre rythme cardiaque a été inhabituellement élevé aujourd'hui. Si vous ne vous sentez pas bien, il pourrait être bon de consulter un médecin.",
+ "blueberry_ring_heart_rate_alert_text": "Votre rythme cardiaque a été inhabituellement élevé aujourd'hui. Si vous ne vous sentez pas bien, il pourrait être bon de consulter un médecin.",
+ "blueberry_ring_battery_alert_title": "La batterie est faible!",
+ "blueberry_ring_battery_alert_text": "La batterie de votre Blueberry Ring est faible. Veuillez la charger bientôt pour éviter les lacunes de données.",
+ "activity_reminder": "Rappel d'activité",
+ "sleep_insight": "Aperçu du sommeil",
+ "heart_alert": "Alerte de coeur",
+ "low_battery": "Batterie faible",
+ "blueberry_background_notifications_requirements_title": "Ce service nécessite:",
+ "blueberry_background_notifications_requirements_text_1": "1. Bluetooth doit être activé",
+ "blueberry_background_notifications_requirements_text_2": "2. Blueberry doit être accessible",
+ "auto_sync_started": "Le démarrage automatique de la synchronisation de Blueberry Ring a commencé 🏁",
+ "no_rings_selected_notification_title": "On dirait que vous n'avez sélectionné aucun Anneaux de Myrtille. ℹ️",
+ "no_rings_selected_notification_text": "Veuillez vous rendre sur Blueberry Ring DApp pour sélectionner des anneaux.",
+ "auto_sync_successful_notification_title": "La revendication automatique de Blueberry Ring a réussi ✅",
+ "auto_sync_successful_notification_text": "Le portefeuille AXS a synchronisé avec succès vos données de ring.",
+ "already_synced_notification_title": "Oups, déjà synchronisé ℹ️",
+ "already_synced_notification_text": "Le portefeuille AXS a essayé de synchroniser vos données de ring, mais il semble que vous ayez déjà synchronisé les données de ring aujourd'hui.",
+ "auto_sync_failed": "L'auto-synchronisation de Blueberry Ring a échoué ❌",
+ "no_rings_owned_notification": "On dirait que ce portefeuille ne possède pas de Blueberry Rings. ℹ️",
+ "syncing_data_from_ring": "Synchronisation des données à partir de Blueberry Ring #{0}. ⛏️",
+ "already_synced_ring": "Anneau de Myrtille #{0} : Déjà synchronisé. ℹ️",
+ "data_synced_successfully_ring": "Bague de Myrtille #{0} : Données synchronisées avec succès. ✅",
+ "data_syncing_failed": "Bague de Myrtille #{0} : Le processus de synchronisation des données a échoué. ❌",
+ "blueberry_hooks": "Crochets de Myrtille",
+ "message": "Message"
}
\ No newline at end of file
diff --git a/assets/flutter_i18n/id.json b/assets/flutter_i18n/id.json
index bfcf324c..2d49ae80 100644
--- a/assets/flutter_i18n/id.json
+++ b/assets/flutter_i18n/id.json
@@ -417,5 +417,41 @@
"save_locally": "Simpan secara lokal",
"save_locally_description": "Pastikan untuk menyimpan kunci Anda secara lokal dan kemudian Anda siap untuk melanjutkan.",
"axs_storage_permission_use_case": "Dompet AXS membutuhkan akses ke penyimpanan Anda untuk fitur seperti RWA. Data penyimpanan Anda tidak disimpan atau dibagikan dengan pihak ketiga mana pun.",
- "local_backup": "Cadangan lokal"
+ "local_backup": "Cadangan lokal",
+ "no_description": "Tidak ada deskripsi",
+ "bluetooth_not_supported": "Bluetooth tidak didukung pada perangkat ini.",
+ "blueberry_ring_hooks": "Blueberry Ring mengaitkan",
+ "nearby_blueberry_rings": "Cincin Blueberry terdekat",
+ "unable_to_continue_bluetooth_is_turned_off": "Tidak dapat melanjutkan, Bluetooth dimatikan!",
+ "scanning": "Memindai ...",
+ "blueberry_ring_inactive_alert_title": "Waktunya untuk pergi berjalan-jalan!",
+ "blueberry_ring_inactive_alert_text": "Anda telah tidak aktif untuk beberapa waktu. Sebuah jalan kaki singkat bisa sangat menyegarkan!",
+ "blueberry_ring_sleep_alert_title": "Anda telah mendapatkan tidur nyenyak yang lebih sedikit dari biasanya. Coba santai 30 menit lebih awal malam ini untuk istirahat yang lebih baik.",
+ "blueberry_ring_sleep_alert_text": "Anda telah mendapatkan tidur nyenyak yang lebih sedikit dari biasanya. Coba santai 30 menit lebih awal malam ini untuk istirahat yang lebih baik.",
+ "blueberry_ring_heart_rate_alert_title": "Denyut jantung Anda hari ini tidak biasanya tinggi. Jika Anda merasa tidak sehat, mungkin baik untuk berkonsultasi dengan dokter.",
+ "blueberry_ring_heart_rate_alert_text": "Detak jantung Anda hari ini tidak biasanya tinggi. Jika Anda merasa tidak sehat, mungkin baik untuk berkonsultasi dengan dokter.",
+ "blueberry_ring_battery_alert_title": "Baterai sedang lemah!",
+ "blueberry_ring_battery_alert_text": "Baterai Cincin Blueberry Anda rendah. Silakan isi ulang segera untuk menghindari kekosongan data.",
+ "activity_reminder": "Pengingat aktivitas",
+ "sleep_insight": "Wawasan tidur",
+ "heart_alert": "Peringatan jantung",
+ "low_battery": "Baterai rendah",
+ "blueberry_background_notifications_requirements_title": "Layanan ini memerlukan:",
+ "blueberry_background_notifications_requirements_text_1": "1. Bluetooth harus dalam keadaan ON",
+ "blueberry_background_notifications_requirements_text_2": "2. Blueberry harus dapat dijangkau",
+ "auto_sync_started": "Sinkronisasi otomatis Blueberry Ring telah dimulai 🏁",
+ "no_rings_selected_notification_title": "Sepertinya Anda belum memilih Blueberry Rings apa pun. ℹ️",
+ "no_rings_selected_notification_text": "Silakan menuju ke Blueberry Ring DApp untuk memilih cincin.",
+ "auto_sync_successful_notification_title": "Berhasil klaim otomatis Blueberry Ring ✅",
+ "auto_sync_successful_notification_text": "Dompet AXS telah berhasil menyinkronkan data cincin Anda.",
+ "already_synced_notification_title": "Ups, Sudah disinkronkan ℹ️",
+ "already_synced_notification_text": "Dompet AXS mencoba untuk menyinkronkan data ring Anda, Tetapi tampaknya Anda telah menyinkronkan data ring hari ini.",
+ "auto_sync_failed": "Gagal sinkronisasi otomatis Blueberry Ring ❌",
+ "no_rings_owned_notification": "Sepertinya dompet ini tidak memiliki Blueberry Rings. ℹ️",
+ "syncing_data_from_ring": "Menyinkronkan data dari Blueberry Ring #{0}. ⛏️",
+ "already_synced_ring": "Cincin Blueberry #{0}: Sudah disinkronkan. ℹ️",
+ "data_synced_successfully_ring": "Cincin Blueberry #{0}: Data berhasil disinkronkan. ✅",
+ "data_syncing_failed": "Cincin Blueberry #{0}: Proses sinkronisasi data gagal. ❌",
+ "blueberry_hooks": "Kait Blueberry",
+ "message": "Pesan"
}
\ No newline at end of file
diff --git a/assets/flutter_i18n/it.json b/assets/flutter_i18n/it.json
index 55d88b5a..0c3cfbe8 100644
--- a/assets/flutter_i18n/it.json
+++ b/assets/flutter_i18n/it.json
@@ -417,5 +417,41 @@
"save_locally": "Salva localmente",
"save_locally_description": "Assicurati di salvare le tue chiavi localmente e poi sei pronto per andare.",
"axs_storage_permission_use_case": "Il portafoglio AXS necessita l'accesso al tuo spazio di archiviazione per funzioni come RWA. I tuoi dati di archiviazione non vengono salvati o condivisi con terze parti.",
- "local_backup": "Backup locale"
+ "local_backup": "Backup locale",
+ "no_description": "Nessuna descrizione",
+ "bluetooth_not_supported": "Il Bluetooth non è supportato su questo dispositivo.",
+ "blueberry_ring_hooks": "Ganci dell'Anello di Mirtilli",
+ "nearby_blueberry_rings": "Anelli di mirtilli nelle vicinanze",
+ "unable_to_continue_bluetooth_is_turned_off": "Impossibile continuare, il Bluetooth è spento!",
+ "scanning": "Scansione in corso...",
+ "blueberry_ring_inactive_alert_title": "È ora di fare una passeggiata!",
+ "blueberry_ring_inactive_alert_text": "Sei stato inattivo per un po'. Una breve passeggiata potrebbe essere davvero rinvigorente!",
+ "blueberry_ring_sleep_alert_title": "Hai avuto meno sonno profondo del solito. Prova a rilassarti 30 minuti prima stasera per un riposo migliore.",
+ "blueberry_ring_sleep_alert_text": "Hai avuto meno sonno profondo del solito. Prova a rilassarti 30 minuti prima stasera per un riposo migliore.",
+ "blueberry_ring_heart_rate_alert_title": "La tua frequenza cardiaca è stata insolitamente alta oggi. Se ti senti male, potrebbe essere utile consultare un medico.",
+ "blueberry_ring_heart_rate_alert_text": "La tua frequenza cardiaca è stata insolitamente alta oggi. Se ti senti male, potrebbe essere utile consultare un medico.",
+ "blueberry_ring_battery_alert_title": "La batteria è scarica!",
+ "blueberry_ring_battery_alert_text": "La batteria del tuo Blueberry Ring è scarica. Si prega di ricaricare presto per evitare interruzioni dei dati.",
+ "activity_reminder": "Promemoria di attività",
+ "sleep_insight": "Intuizione del sonno",
+ "heart_alert": "Allerta cuore",
+ "low_battery": "Batteria scarica",
+ "blueberry_background_notifications_requirements_title": "Questo servizio richiede:",
+ "blueberry_background_notifications_requirements_text_1": "1. Bluetooth da attivare",
+ "blueberry_background_notifications_requirements_text_2": "2. Blueberry deve essere raggiungibile",
+ "auto_sync_started": "L'avvio della sincronizzazione automatica di Blueberry Ring è iniziato 🏁",
+ "no_rings_selected_notification_title": "Sembra che non hai selezionato nessun Blueberry Rings. ℹ️",
+ "no_rings_selected_notification_text": "Si prega di recarsi alla DApp Blueberry Ring per selezionare gli anelli.",
+ "auto_sync_successful_notification_title": "Il reclamo automatico di Blueberry Ring è stato eseguito con successo ✅",
+ "auto_sync_successful_notification_text": "Il tuo portafoglio AXS ha sincronizzato con successo i tuoi dati dell'anello.",
+ "already_synced_notification_title": "Ops, già sincronizzato ℹ️",
+ "already_synced_notification_text": "Il portafoglio AXS ha cercato di sincronizzare i tuoi dati del ring, ma sembra che tu abbia già sincronizzato i dati del ring oggi.",
+ "auto_sync_failed": "Blueberry Ring auto-sync non riuscita ❌",
+ "no_rings_owned_notification": "Sembra che questo portafoglio non possieda nessun Blueberry Rings. ℹ️",
+ "syncing_data_from_ring": "Sincronizzazione dei dati da Blueberry Ring #{0}. ⛏️",
+ "already_synced_ring": "Anello di Mirtilli #{0}: Già sincronizzato. ℹ️",
+ "data_synced_successfully_ring": "Anello di Mirtilli #{0}: Dati sincronizzati con successo. ✅",
+ "data_syncing_failed": "Anello di Mirtilli #{0}: Il processo di sincronizzazione dei dati è fallito. ❌",
+ "blueberry_hooks": "Ganci Blueberry",
+ "message": "Messaggio"
}
\ No newline at end of file
diff --git a/assets/flutter_i18n/ja.json b/assets/flutter_i18n/ja.json
index f9694cf6..59f634b0 100644
--- a/assets/flutter_i18n/ja.json
+++ b/assets/flutter_i18n/ja.json
@@ -417,5 +417,41 @@
"save_locally": "ローカルに保存する",
"save_locally_description": "あなたのキーをローカルに保存してから、準備が整ったら始めてください。",
"axs_storage_permission_use_case": "AXSウォレットは、RWAのような機能のためにあなたのストレージへのアクセスが必要です。あなたのストレージデータは保存されず、また第三者と共有されません。",
- "local_backup": "ローカルバックアップ"
+ "local_backup": "ローカルバックアップ",
+ "no_description": "説明なし",
+ "bluetooth_not_supported": "このデバイスではBluetoothはサポートされていません。",
+ "blueberry_ring_hooks": "ブルーベリーリングフック",
+ "nearby_blueberry_rings": "近くのブルーベリーリング",
+ "unable_to_continue_bluetooth_is_turned_off": "Bluetoothがオフになっているため、続行できません！",
+ "scanning": "スキャン中...",
+ "blueberry_ring_inactive_alert_title": "散歩に行く時間です！",
+ "blueberry_ring_inactive_alert_text": "あなたはしばらく活動していませんでした。短い散歩は本当に元気づけることができますよ！",
+ "blueberry_ring_sleep_alert_title": "あなたは通常より深い眠りを得ていないようです。今夜は30分早くリラックスして、より良い休息を取るように試みてください。",
+ "blueberry_ring_sleep_alert_text": "あなたは通常より深い眠りを得ていないようです。今夜は30分早くリラックスして、より良い休息を取るように試みてください。",
+ "blueberry_ring_heart_rate_alert_title": "あなたの心拍数は今日、普段よりも高いです。体調が悪い場合、医者に診てもらうと良いかもしれません。",
+ "blueberry_ring_heart_rate_alert_text": "あなたの心拍数は今日異常に高いです。体調が悪い場合、医者に診てもらうと良いかもしれません。",
+ "blueberry_ring_battery_alert_title": "バッテリーが少ないです！",
+ "blueberry_ring_battery_alert_text": "あなたのブルーベリーリングのバッテリーが低くなっています。データの欠損を避けるために、早めに充電してください。",
+ "activity_reminder": "活動リマインダー",
+ "sleep_insight": "睡眠の洞察",
+ "heart_alert": "ハートアラート",
+ "low_battery": "バッテリー残量が少ない",
+ "blueberry_background_notifications_requirements_title": "このサービスには以下が必要です：",
+ "blueberry_background_notifications_requirements_text_1": "1. ブルートゥースをONにする",
+ "blueberry_background_notifications_requirements_text_2": "2. ブルーベリーが到達可能になること",
+ "auto_sync_started": "ブルーベリーリングの自動同期が開始されました 🏁",
+ "no_rings_selected_notification_title": "あなたはまだブルーベリーリングを選んでいないようです。ℹ️",
+ "no_rings_selected_notification_text": "リングの選択のために、ブルーベリーリングDAppに移動してください。",
+ "auto_sync_successful_notification_title": "ブルーベリーリングの自動請求が成功しました✅",
+ "auto_sync_successful_notification_text": "AXSウォレットはあなたのリングデータを正常に同期しました。",
+ "already_synced_notification_title": "おっと、すでに同期済みℹ️",
+ "already_synced_notification_text": "AXSウォレットはあなたのリングデータを同期しようと試みましたが、今日すでにリングデータを同期しているようです。",
+ "auto_sync_failed": "ブルーベリーリングの自動同期が失敗しました❌",
+ "no_rings_owned_notification": "このウォレットはブルーベリーリングを一つも所有していないようです。ℹ️",
+ "syncing_data_from_ring": "ブルーベリーリング #{0} からのデータ同期中。⛏️",
+ "already_synced_ring": "ブルーベリーリング #{0}: すでに同期済みです。ℹ️",
+ "data_synced_successfully_ring": "ブルーベリーリング #{0}: データは正常に同期されました。✅",
+ "data_syncing_failed": "ブルーベリーリング #{0}: データ同期処理が失敗しました。❌",
+ "blueberry_hooks": "ブルーベリーフック",
+ "message": "メッセージ"
}
\ No newline at end of file
diff --git a/assets/flutter_i18n/ko.json b/assets/flutter_i18n/ko.json
index 08159005..b94e64c0 100644
--- a/assets/flutter_i18n/ko.json
+++ b/assets/flutter_i18n/ko.json
@@ -417,5 +417,41 @@
"save_locally": "로컬에 저장",
"save_locally_description": "당신의 키를 로컬에 저장하십시오, 그런 다음 시작하면 됩니다.",
"axs_storage_permission_use_case": "AXS 지갑은 RWA와 같은 기능을 위해 당신의 저장 공간에 접근할 필요가 있습니다. 당신의 저장 데이터는 어떠한 제3자와도 저장되거나 공유되지 않습니다.",
- "local_backup": "로컬 백업"
+ "local_backup": "로컬 백업",
+ "no_description": "설명 없음",
+ "bluetooth_not_supported": "이 장치는 블루투스를 지원하지 않습니다.",
+ "blueberry_ring_hooks": "블루베리 링 훅",
+ "nearby_blueberry_rings": "근처의 블루베리 반지",
+ "unable_to_continue_bluetooth_is_turned_off": "Bluetooth가 꺼져 있어 계속할 수 없습니다!",
+ "scanning": "스캔 중 ...",
+ "blueberry_ring_inactive_alert_title": "산책하러 가봐야 할 시간이에요!",
+ "blueberry_ring_inactive_alert_text": "당신은 잠시동안 비활동적이었습니다. 짧은 산책은 정말로 활력을 불어넣을 수 있습니다!",
+ "blueberry_ring_sleep_alert_title": "보통보다 깊은 수면을 덜 취하고 있습니다. 오늘 밤에는 30분 일찍 푹 쉬기 위해 풀어보세요.",
+ "blueberry_ring_sleep_alert_text": "보통보다 깊은 수면을 적게 취하고 있습니다. 오늘 밤에는 30분 더 일찍 푹 쉬어 보세요.",
+ "blueberry_ring_heart_rate_alert_title": "오늘 당신의 심박수가 평소보다 높게 측정되었습니다. 몸 상태가 좋지 않다면, 의사에게 상담하는 것이 좋을 수 있습니다.",
+ "blueberry_ring_heart_rate_alert_text": "오늘 당신의 심박수가 평소보다 높게 측정되었습니다. 몸 상태가 좋지 않다면, 의사에게 상담하는 것이 좋을 수 있습니다.",
+ "blueberry_ring_battery_alert_title": "배터리가 부족합니다!",
+ "blueberry_ring_battery_alert_text": "당신의 블루베리 링의 배터리가 부족합니다. 데이터 손실을 피하기 위해 곧 충전해 주세요.",
+ "activity_reminder": "활동 알림",
+ "sleep_insight": "수면 통찰력",
+ "heart_alert": "하트 알림",
+ "low_battery": "낮은 배터리",
+ "blueberry_background_notifications_requirements_title": "이 서비스는 다음을 필요로 합니다:",
+ "blueberry_background_notifications_requirements_text_1": "블루투스를 켜주세요.",
+ "blueberry_background_notifications_requirements_text_2": "2. 블루베리가 접근 가능해야 합니다",
+ "auto_sync_started": "블루베리 링 자동 동기화 시작됨 🏁",
+ "no_rings_selected_notification_title": "보아하니 당신은 어떠한 블루베리 링도 선택하지 않은 것 같습니다. ℹ️",
+ "no_rings_selected_notification_text": "다음의 반지를 선택하기 위해 Blueberry Ring DApp으로 이동해 주세요.",
+ "auto_sync_successful_notification_title": "블루베리 링 자동-클레임 성공 ✅",
+ "auto_sync_successful_notification_text": "다음의 영어 텍스트를 한국어로 번역하면: AXS 지갑이 성공적으로 당신의 링 데이터를 동기화했습니다.",
+ "already_synced_notification_title": "이런, 이미 동기화되었습니다 ℹ️",
+ "already_synced_notification_text": "AXS 지갑이 귀하의 링 데이터를 동기화하려고 시도했지만, 오늘 이미 링 데이터를 동기화한 것 같습니다.",
+ "auto_sync_failed": "블루베리 링 자동 동기화 실패 ❌",
+ "no_rings_owned_notification": "이 지갑은 블루베리 링을 소유하고 있지 않은 것 같습니다. ℹ️",
+ "syncing_data_from_ring": "블루베리 링 #{0}에서 데이터 동기화 중. ⛏️",
+ "already_synced_ring": "블루베리 링 #{0}: 이미 동기화되었습니다. ℹ️",
+ "data_synced_successfully_ring": "블루베리 링 #{0}: 데이터 동기화 성공적으로 완료. ✅",
+ "data_syncing_failed": "블루베리 링 #{0}: 데이터 동기화 과정이 실패했습니다. ❌",
+ "blueberry_hooks": "블루베리 훅스",
+ "message": "메시지"
}
\ No newline at end of file
diff --git a/assets/flutter_i18n/nl.json b/assets/flutter_i18n/nl.json
index 1b92693e..ee0b0e12 100644
--- a/assets/flutter_i18n/nl.json
+++ b/assets/flutter_i18n/nl.json
@@ -417,5 +417,41 @@
"save_locally": "Lokaal opslaan",
"save_locally_description": "Zorg ervoor dat je je sleutels lokaal opslaat en dan ben je klaar om te gaan.",
"axs_storage_permission_use_case": "De AXS Wallet heeft toegang tot uw opslag nodig voor functies zoals RWA. Uw opslaggegevens worden niet opgeslagen of gedeeld met derden.",
- "local_backup": "Lokale back-up"
+ "local_backup": "Lokale back-up",
+ "no_description": "Geen beschrijving",
+ "bluetooth_not_supported": "Bluetooth wordt niet ondersteund op dit apparaat.",
+ "blueberry_ring_hooks": "Blueberry Ring haken",
+ "nearby_blueberry_rings": "In de buurt Blauwe bessenringen",
+ "unable_to_continue_bluetooth_is_turned_off": "Kan niet doorgaan, Bluetooth is uitgeschakeld!",
+ "scanning": "Scannen ...",
+ "blueberry_ring_inactive_alert_title": "Tijd om te gaan wandelen!",
+ "blueberry_ring_inactive_alert_text": "Je bent een tijdje inactief geweest. Een korte wandeling kan echt verkwikkend zijn!",
+ "blueberry_ring_sleep_alert_title": "Je hebt de laatste tijd minder diepe slaap gekregen dan normaal. Probeer vanavond 30 minuten eerder te ontspannen voor een betere rust.",
+ "blueberry_ring_sleep_alert_text": "Je hebt de laatste tijd minder diepe slaap gekregen dan normaal. Probeer vanavond 30 minuten eerder te ontspannen voor een betere rust.",
+ "blueberry_ring_heart_rate_alert_title": "Uw hartslag is vandaag ongewoon hoog geweest. Als u zich niet goed voelt, kan het goed zijn om een arts te raadplegen.",
+ "blueberry_ring_heart_rate_alert_text": "Uw hartslag is vandaag ongewoon hoog geweest. Als u zich niet goed voelt, kan het goed zijn om een arts te raadplegen.",
+ "blueberry_ring_battery_alert_title": "De batterij is bijna leeg!",
+ "blueberry_ring_battery_alert_text": "De batterij van je Blueberry Ring is bijna leeg. Laad deze alstublieft snel op om datagaten te voorkomen.",
+ "activity_reminder": "Activiteit herinnering",
+ "sleep_insight": "Slaapinzicht",
+ "heart_alert": "Hart alarm",
+ "low_battery": "Lage batterij",
+ "blueberry_background_notifications_requirements_title": "Deze service vereist:",
+ "blueberry_background_notifications_requirements_text_1": "1. Bluetooth moet AAN zijn",
+ "blueberry_background_notifications_requirements_text_2": "2. Blueberry moet bereikbaar zijn",
+ "auto_sync_started": "Blueberry Ring auto sync gestart 🏁",
+ "no_rings_selected_notification_title": "Het lijkt erop dat je nog geen Blueberry Rings hebt geselecteerd. ℹ️",
+ "no_rings_selected_notification_text": "Ga alstublieft naar Blueberry Ring DApp om ringen te selecteren.",
+ "auto_sync_successful_notification_title": "Blueberry Ring aut-claim succesvol ✅",
+ "auto_sync_successful_notification_text": "Uw AXS-portemonnee heeft met succes uw ringgegevens gesynchroniseerd.",
+ "already_synced_notification_title": "Oeps, al gesynchroniseerd ℹ️",
+ "already_synced_notification_text": "De AXS-portemonnee probeerde je ringgegevens te synchroniseren, maar het lijkt erop dat je de ringgegevens vandaag al hebt gesynchroniseerd.",
+ "auto_sync_failed": "Blueberry Ring auto-sync mislukt ❌",
+ "no_rings_owned_notification": "Het lijkt erop dat deze portemonnee geen Blueberry Rings bezit. ℹ️",
+ "syncing_data_from_ring": "Gegevens synchroniseren van Blueberry Ring #{0}. ⛏️",
+ "already_synced_ring": "Blueberry Ring #{0}: Al gesynchroniseerd. ℹ️",
+ "data_synced_successfully_ring": "Blueberry Ring #{0}: Gegevens succesvol gesynchroniseerd. ✅",
+ "data_syncing_failed": "Blueberry Ring #{0}: Gegevens synchronisatieproces mislukt. ❌",
+ "blueberry_hooks": "Blueberry haken",
+ "message": "Bericht"
}
\ No newline at end of file
diff --git a/assets/flutter_i18n/pt.json b/assets/flutter_i18n/pt.json
index ecf4d054..d7cebf1b 100644
--- a/assets/flutter_i18n/pt.json
+++ b/assets/flutter_i18n/pt.json
@@ -417,5 +417,41 @@
"save_locally": "Guarde localmente",
"save_locally_description": "Certifique-se de salvar suas chaves localmente e então você estará pronto para prosseguir.",
"axs_storage_permission_use_case": "A carteira AXS precisa de acesso ao seu armazenamento para recursos como RWA. Seus dados de armazenamento não são salvos ou compartilhados com terceiros.",
- "local_backup": "Backup local"
+ "local_backup": "Backup local",
+ "no_description": "Sem descrição",
+ "bluetooth_not_supported": "O Bluetooth não é suportado neste dispositivo.",
+ "blueberry_ring_hooks": "Blueberry Ring se conecta",
+ "nearby_blueberry_rings": "Anéis de Mirtilo Próximos",
+ "unable_to_continue_bluetooth_is_turned_off": "Não é possível continuar, o Bluetooth está desligado!",
+ "scanning": "Analisando ...",
+ "blueberry_ring_inactive_alert_title": "Hora de ir para uma caminhada!",
+ "blueberry_ring_inactive_alert_text": "Você esteve inativo por um tempo. Uma curta caminhada poderia ser realmente revigorante!",
+ "blueberry_ring_sleep_alert_title": "Você tem tido menos sono profundo do que o habitual. Tente relaxar 30 minutos mais cedo esta noite para um descanso melhor.",
+ "blueberry_ring_sleep_alert_text": "Você tem tido menos sono profundo do que o habitual. Tente relaxar 30 minutos mais cedo esta noite para um descanso melhor.",
+ "blueberry_ring_heart_rate_alert_title": "A sua frequência cardíaca tem estado anormalmente alta hoje. Se você se sentir mal, pode ser bom consultar um médico.",
+ "blueberry_ring_heart_rate_alert_text": "A sua frequência cardíaca tem estado anormalmente alta hoje. Se você se sentir mal, pode ser bom consultar um médico.",
+ "blueberry_ring_battery_alert_title": "A bateria está fraca!",
+ "blueberry_ring_battery_alert_text": "A bateria do seu Anel Blueberry está baixa. Por favor, carregue em breve para evitar lacunas de dados.",
+ "activity_reminder": "Lembrete de atividade",
+ "sleep_insight": "Percepção do sono",
+ "heart_alert": "Alerta de coração",
+ "low_battery": "Bateria baixa",
+ "blueberry_background_notifications_requirements_title": "Este serviço requer:",
+ "blueberry_background_notifications_requirements_text_1": "1. Bluetooth para estar LIGADO",
+ "blueberry_background_notifications_requirements_text_2": "2. Blueberry para ser alcançável",
+ "auto_sync_started": "Início automático da sincronização do Blueberry Ring 🏁",
+ "no_rings_selected_notification_title": "Parece que você não selecionou nenhum Anel de Mirtilo. ℹ️",
+ "no_rings_selected_notification_text": "Por favor, vá para o DApp Blueberry Ring para selecionar anéis.",
+ "auto_sync_successful_notification_title": "Sucesso na auto-reivindicação do Blueberry Ring ✅",
+ "auto_sync_successful_notification_text": "A carteira AXS foi sincronizada com sucesso com os seus dados de anel.",
+ "already_synced_notification_title": "Ops, já sincronizado ℹ️",
+ "already_synced_notification_text": "A carteira AXS tentou sincronizar seus dados de anel, mas parece que você já sincronizou os dados do anel hoje.",
+ "auto_sync_failed": "Falha na sincronização automática do Blueberry Ring ❌",
+ "no_rings_owned_notification": "Parece que esta carteira não possui nenhum Blueberry Rings. ℹ️",
+ "syncing_data_from_ring": "Sincronizando dados do Anel de Mirtilo #{0}. ⛏️",
+ "already_synced_ring": "Anel de Mirtilo #{0}: Já sincronizado. ℹ️",
+ "data_synced_successfully_ring": "Anel de Mirtilo #{0}: Dados sincronizados com sucesso. ✅",
+ "data_syncing_failed": "Anel de Mirtilo #{0}: Processo de sincronização de dados falhou. ❌",
+ "blueberry_hooks": "Ganchos de Mirtilo",
+ "message": "Mensagem"
}
\ No newline at end of file
diff --git a/assets/flutter_i18n/ro.json b/assets/flutter_i18n/ro.json
index 677df4c4..4bde8ddb 100644
--- a/assets/flutter_i18n/ro.json
+++ b/assets/flutter_i18n/ro.json
@@ -417,5 +417,41 @@
"save_locally": "Salvează local",
"save_locally_description": "Asigurați-vă că salvați cheile local și apoi sunteți gata de plecare.",
"axs_storage_permission_use_case": "Portofelul AXS are nevoie de acces la spațiul tău de stocare pentru funcții precum RWA. Datele tale de stocare nu sunt salvate sau partajate cu terțe părți.",
- "local_backup": "Copie de rezervă locală"
+ "local_backup": "Copie de rezervă locală",
+ "no_description": "Fără descriere",
+ "bluetooth_not_supported": "Bluetooth nu este suportat pe acest dispozitiv.",
+ "blueberry_ring_hooks": "Cârligele Blueberry Ring",
+ "nearby_blueberry_rings": "Inele de afine din apropiere",
+ "unable_to_continue_bluetooth_is_turned_off": "Imposibil de continuat, Bluetooth este oprit!",
+ "scanning": "Scanare...",
+ "blueberry_ring_inactive_alert_title": "Timpul să mergem la plimbare!",
+ "blueberry_ring_inactive_alert_text": "Ai fost inactiv pentru o perioadă. O scurtă plimbare ar putea fi cu adevărat revigorantă!",
+ "blueberry_ring_sleep_alert_title": "Ai avut un somn mai puțin profund decât de obicei. Încearcă să te relaxezi cu 30 de minute mai devreme în seara asta pentru un odihnă mai bună.",
+ "blueberry_ring_sleep_alert_text": "Ai avut un somn mai puțin profund decât de obicei. Încearcă să te relaxezi cu 30 de minute mai devreme în seara asta pentru un odihnă mai bună.",
+ "blueberry_ring_heart_rate_alert_title": "Ritmul tău cardiac a fost neobișnuit de mare astăzi. Dacă te simți rău, ar fi bine să consulți un medic.",
+ "blueberry_ring_heart_rate_alert_text": "Ritmul cardiac a fost neobișnuit de ridicat astăzi. Dacă te simți rău, ar fi bine să consulți un medic.",
+ "blueberry_ring_battery_alert_title": "Bateria este descărcată!",
+ "blueberry_ring_battery_alert_text": "Bateria inelului tău Blueberry este descărcată. Te rugăm să o încarci în curând pentru a evita lacunele de date.",
+ "activity_reminder": "Reamintire de activitate",
+ "sleep_insight": "Intuiție despre somn",
+ "heart_alert": "Alertă de inimă",
+ "low_battery": "Baterie scăzută",
+ "blueberry_background_notifications_requirements_title": "Acest serviciu necesită:",
+ "blueberry_background_notifications_requirements_text_1": "1. Bluetooth să fie PORNIT",
+ "blueberry_background_notifications_requirements_text_2": "2. Blueberry să fie accesibil",
+ "auto_sync_started": "Sincronizarea automată a Blueberry Ring a început 🏁",
+ "no_rings_selected_notification_title": "Se pare că nu ai selectat niciun Inel de Afine. ℹ️",
+ "no_rings_selected_notification_text": "Vă rugăm să mergeți la Blueberry Ring DApp pentru a selecta inelele.",
+ "auto_sync_successful_notification_title": "Succes la auto-revendicarea Blueberry Ring ✅",
+ "auto_sync_successful_notification_text": "Portofelul AXS a sincronizat cu succes datele inelului tău.",
+ "already_synced_notification_title": "Ups, deja sincronizat ℹ️",
+ "already_synced_notification_text": "Portofelul AXS a încercat să sincronizeze datele tale de inel, dar se pare că ai sincronizat deja datele de inel astăzi.",
+ "auto_sync_failed": "Eșec la sincronizarea automată a Blueberry Ring ❌",
+ "no_rings_owned_notification": "Se pare că acest portofel nu deține niciun Blueberry Rings. ℹ️",
+ "syncing_data_from_ring": "Sincronizare date de la Blueberry Ring #{0}. ⛏️",
+ "already_synced_ring": "Inelul Blueberry #{0}: Deja sincronizat. ℹ️",
+ "data_synced_successfully_ring": "Inelul Blueberry #{0}: Datele au fost sincronizate cu succes. ✅",
+ "data_syncing_failed": "Inelul Blueberry #{0}: Procesul de sincronizare a datelor a eșuat. ❌",
+ "blueberry_hooks": "Cârlige de afine",
+ "message": "Mesaj"
}
\ No newline at end of file
diff --git a/assets/flutter_i18n/ru.json b/assets/flutter_i18n/ru.json
index 63997a0c..60060a13 100644
--- a/assets/flutter_i18n/ru.json
+++ b/assets/flutter_i18n/ru.json
@@ -417,5 +417,41 @@
"save_locally": "Сохранить локально",
"save_locally_description": "Убедитесь, что вы сохранили свои ключи локально, и тогда вы готовы к работе.",
"axs_storage_permission_use_case": "Кошелек AXS требует доступа к вашему хранилищу для функций, таких как RWA. Ваши данные хранения не сохраняются и не передаются третьим сторонам.",
- "local_backup": "Локальное резервное копирование"
+ "local_backup": "Локальное резервное копирование",
+ "no_description": "Нет описания",
+ "bluetooth_not_supported": "Bluetooth не поддерживается на этом устройстве.",
+ "blueberry_ring_hooks": "Крючки Blueberry Ring",
+ "nearby_blueberry_rings": "Ближайшие кольца Блуберри",
+ "unable_to_continue_bluetooth_is_turned_off": "Невозможно продолжить, Bluetooth выключен!",
+ "scanning": "Сканирование...",
+ "blueberry_ring_inactive_alert_title": "Пора идти на прогулку!",
+ "blueberry_ring_inactive_alert_text": "Вы были неактивны некоторое время. Короткая прогулка могла бы быть действительно бодрящей!",
+ "blueberry_ring_sleep_alert_title": "Вы спите меньше глубокого сна, чем обычно. Попробуйте расслабиться на 30 минут раньше сегодня вечером для лучшего отдыха.",
+ "blueberry_ring_sleep_alert_text": "Вы спите меньше глубокого сна, чем обычно. Попробуйте расслабиться на 30 минут раньше сегодня вечером для лучшего отдыха.",
+ "blueberry_ring_heart_rate_alert_title": "Ваш пульс сегодня необычайно высок. Если вы чувствуете себя нездорово, может быть хорошей идеей обратиться к врачу.",
+ "blueberry_ring_heart_rate_alert_text": "Ваш пульс сегодня необычайно высокий. Если вы чувствуете себя плохо, было бы неплохо обратиться к врачу.",
+ "blueberry_ring_battery_alert_title": "Заряд батареи низкий!",
+ "blueberry_ring_battery_alert_text": "Заряд батареи вашего Blueberry Ring низкий. Пожалуйста, зарядите его в ближайшее время, чтобы избежать пропусков в данных.",
+ "activity_reminder": "Напоминание о активности",
+ "sleep_insight": "Инсайт во время сна",
+ "heart_alert": "Оповещение сердца",
+ "low_battery": "Низкий уровень заряда",
+ "blueberry_background_notifications_requirements_title": "Этот сервис требует:",
+ "blueberry_background_notifications_requirements_text_1": "1. Bluetooth должен быть включен",
+ "blueberry_background_notifications_requirements_text_2": "2. Blueberry должен быть доступен",
+ "auto_sync_started": "Автосинхронизация Blueberry Ring началась 🏁",
+ "no_rings_selected_notification_title": "Похоже, вы не выбрали ни одного Blueberry Rings. ℹ️",
+ "no_rings_selected_notification_text": "Пожалуйста, перейдите в Blueberry Ring DApp для выбора колец.",
+ "auto_sync_successful_notification_title": "Успешное авто-выполнение Blueberry Ring ✅",
+ "auto_sync_successful_notification_text": "Кошелек AXS успешно синхронизировал ваши данные кольца.",
+ "already_synced_notification_title": "Упс, уже синхронизировано ℹ️",
+ "already_synced_notification_text": "Кошелек AXS попытался синхронизировать ваши данные кольца, но похоже, что вы уже синхронизировали данные кольца сегодня.",
+ "auto_sync_failed": "Синхронизация Blueberry Ring не удалась ❌",
+ "no_rings_owned_notification": "Похоже, что в этом кошельке нет Blueberry Rings. ℹ️",
+ "syncing_data_from_ring": "Синхронизация данных с Blueberry Ring #{0}. ⛏️",
+ "already_synced_ring": "Черничное кольцо #{0}: Уже синхронизировано. ℹ️",
+ "data_synced_successfully_ring": "Кольцо Blueberry #{0}: Данные успешно синхронизированы. ✅",
+ "data_syncing_failed": "Черничное кольцо #{0}: Процесс синхронизации данных не удался. ❌",
+ "blueberry_hooks": "Крючки для черники",
+ "message": "Сообщение"
}
\ No newline at end of file
diff --git a/assets/flutter_i18n/tr.json b/assets/flutter_i18n/tr.json
index bc965e61..2ac40c4b 100644
--- a/assets/flutter_i18n/tr.json
+++ b/assets/flutter_i18n/tr.json
@@ -417,5 +417,41 @@
"save_locally": "Yerel olarak kaydet",
"save_locally_description": "Anahtarlarınızı yerel olarak kaydettiğinizden emin olun ve sonra işlem yapmaya hazırsınız.",
"axs_storage_permission_use_case": "AXS Cüzdanı, RWA gibi özellikler için depolama alanınıza erişim gerektirir. Depolama verileriniz hiçbir üçüncü taraf ile kaydedilmez veya paylaşılmaz.",
- "local_backup": "Yerel yedekleme"
+ "local_backup": "Yerel yedekleme",
+ "no_description": "Açıklama yok",
+ "bluetooth_not_supported": "Bu cihazda Bluetooth desteklenmiyor.",
+ "blueberry_ring_hooks": "Mavi Yüzük kanca",
+ "nearby_blueberry_rings": "Yakındaki Yaban Mersini halkaları",
+ "unable_to_continue_bluetooth_is_turned_off": "Devam edilemiyor, Bluetooth kapalı!",
+ "scanning": "Tarama ...",
+ "blueberry_ring_inactive_alert_title": "Yürüyüşe çıkma zamanı!",
+ "blueberry_ring_inactive_alert_text": "Bir süre boyunca hareketsiz kaldınız. Kısa bir yürüyüş gerçekten canlandırıcı olabilir!",
+ "blueberry_ring_sleep_alert_title": "Daha önceki dönemlere kıyasla daha az derin uyku uyuyorsunuz. Daha iyi dinlenmek için bu gece 30 dakika daha erken rahatlamayı deneyin.",
+ "blueberry_ring_sleep_alert_text": "Daha önceki dönemlere kıyasla daha az derin uyku uyuyorsunuz. Daha iyi dinlenmek için bu gece 30 dakika daha erken rahatlamayı deneyin.",
+ "blueberry_ring_heart_rate_alert_title": "Bugün kalp atış hızınız olağanın üzerinde yüksek olmuş. Kendinizi iyi hissetmiyorsanız, bir doktora başvurmanız iyi olabilir.",
+ "blueberry_ring_heart_rate_alert_text": "Bugün kalp atış hızınız olağanın üzerinde yüksek olmuş. Kendinizi iyi hissetmiyorsanız, bir doktora başvurmanız iyi olabilir.",
+ "blueberry_ring_battery_alert_title": "Pil düşük!",
+ "blueberry_ring_battery_alert_text": "Mavi Yüzük'ünüzün pil seviyesi düşük. Veri boşluklarını önlemek için lütfen yakında şarj edin.",
+ "activity_reminder": "Aktivite hatırlatıcısı",
+ "sleep_insight": "Uyku içgörüsü",
+ "heart_alert": "Kalp alarmı",
+ "low_battery": "Düşük pil",
+ "blueberry_background_notifications_requirements_title": "Bu hizmet şunları gerektirir:",
+ "blueberry_background_notifications_requirements_text_1": "Bluetooth'un AÇIK olması",
+ "blueberry_background_notifications_requirements_text_2": "2. Blueberry'nin ulaşılabilir olması",
+ "auto_sync_started": "Yabanmersini Halkası otomatik senkronizasyon başladı 🏁",
+ "no_rings_selected_notification_title": "Görünüşe göre herhangi bir Blueberry Rings seçmemişsiniz. ℹ️",
+ "no_rings_selected_notification_text": "Lütfen yüzük seçmek için Blueberry Ring DApp'e gidin.",
+ "auto_sync_successful_notification_title": "Blueberry Ring otomatik talep başarılı ✅",
+ "auto_sync_successful_notification_text": "AXS cüzdanınız başarıyla halka verilerinizi senkronize etti.",
+ "already_synced_notification_title": "Hata, Zaten senkronize edildi ℹ️",
+ "already_synced_notification_text": "AXS cüzdanınız yüzük verilerinizi senkronize etmeye çalıştı, ancak görünüşe göre yüzük verilerinizi bugün senkronize etmişsiniz.",
+ "auto_sync_failed": "Blueberry Ring otomatik senkronizasyon başarısız oldu ❌",
+ "no_rings_owned_notification": "Görünüşe göre bu cüzdanın hiç Mavi Yüzük'ü yok. ℹ️",
+ "syncing_data_from_ring": "Blueberry Ring #{0} 'dan veri senkronizasyonu yapılıyor. ⛏️",
+ "already_synced_ring": "Yaban Mersini Halkası #{0}: Zaten senkronize edildi. ℹ️",
+ "data_synced_successfully_ring": "Yaban Mersini Halkası #{0}: Veri başarıyla senkronize edildi. ✅",
+ "data_syncing_failed": "Yaban Mersini Halkası #{0}: Veri senkronizasyon işlemi başarısız oldu. ❌",
+ "blueberry_hooks": "Yaban Mersini Çengelleri",
+ "message": "Mesaj"
}
\ No newline at end of file
diff --git a/assets/flutter_i18n/vi.json b/assets/flutter_i18n/vi.json
index 7a03cf27..08224dc2 100644
--- a/assets/flutter_i18n/vi.json
+++ b/assets/flutter_i18n/vi.json
@@ -417,5 +417,41 @@
"save_locally": "Lưu trữ cục bộ",
"save_locally_description": "Hãy chắc chắn lưu lại khóa của bạn ở cục bộ và sau đó bạn đã sẵn sàng để tiếp tục.",
"axs_storage_permission_use_case": "Ví AXS cần quyền truy cập vào bộ nhớ của bạn để sử dụng các tính năng như RWA. Dữ liệu lưu trữ của bạn không được lưu lại hoặc chia sẻ với bất kỳ bên thứ ba nào.",
- "local_backup": "Sao lưu cục bộ"
+ "local_backup": "Sao lưu cục bộ",
+ "no_description": "Không mô tả",
+ "bluetooth_not_supported": "Bluetooth không được hỗ trợ trên thiết bị này.",
+ "blueberry_ring_hooks": "Móc Blueberry Ring",
+ "nearby_blueberry_rings": "Vòng Blueberry gần đây",
+ "unable_to_continue_bluetooth_is_turned_off": "Không thể tiếp tục vì Bluetooth đã bị tắt!",
+ "scanning": "Đang quét...",
+ "blueberry_ring_inactive_alert_title": "Đã đến lúc đi dạo!",
+ "blueberry_ring_inactive_alert_text": "Bạn đã không hoạt động trong một thời gian. Một cuộc dạo chơi ngắn có thể thực sự làm tăng sức sống!",
+ "blueberry_ring_sleep_alert_title": "Bạn đã có ít giấc ngủ sâu hơn so với bình thường. Hãy thử thư giãn 30 phút sớm hơn tối nay để có giấc ngủ tốt hơn.",
+ "blueberry_ring_sleep_alert_text": "Bạn đã ngủ không sâu như thường lệ. Hãy thử thư giãn 30 phút sớm hơn tối nay để có giấc ngủ tốt hơn.",
+ "blueberry_ring_heart_rate_alert_title": "Tốc độ nhịp tim của bạn hôm nay bất thường cao. Nếu bạn cảm thấy không khỏe, có thể nên đi kiểm tra với bác sĩ.",
+ "blueberry_ring_heart_rate_alert_text": "Tốc độ nhịp tim của bạn hôm nay bất thường cao. Nếu bạn cảm thấy không khỏe, có thể nên đi kiểm tra với bác sĩ.",
+ "blueberry_ring_battery_alert_title": "Pin đang yếu!",
+ "blueberry_ring_battery_alert_text": "Pin của Chiếc Nhẫn Blueberry của bạn đang yếu. Vui lòng sạc sớm để tránh mất dữ liệu.",
+ "activity_reminder": "Nhắc nhở hoạt động",
+ "sleep_insight": "Sự hiểu biết về giấc ngủ",
+ "heart_alert": "Cảnh báo tim",
+ "low_battery": "Pin yếu",
+ "blueberry_background_notifications_requirements_title": "Dịch vụ này yêu cầu:",
+ "blueberry_background_notifications_requirements_text_1": "1. Bluetooth cần được BẬT",
+ "blueberry_background_notifications_requirements_text_2": "2. Blueberry cần có thể tiếp cận được",
+ "auto_sync_started": "Bắt đầu tự động đồng bộ Blueberry Ring 🏁",
+ "no_rings_selected_notification_title": "Có vẻ như bạn chưa chọn bất kỳ Nhẫn Blueberry nào. ℹ️",
+ "no_rings_selected_notification_text": "Vui lòng đến ứng dụng phi tập trung Blueberry Ring để chọn nhẫn.",
+ "auto_sync_successful_notification_title": "Thành công trong việc tự động yêu cầu Blueberry Ring ✅",
+ "auto_sync_successful_notification_text": "Ví AXS đã đồng bộ thành công dữ liệu vòng của bạn",
+ "already_synced_notification_title": "Ồ, đã được đồng bộ hóa ℹ️",
+ "already_synced_notification_text": "Ví AXS đã cố gắng đồng bộ dữ liệu vòng của bạn, Nhưng có vẻ như bạn đã đồng bộ dữ liệu vòng hôm nay.",
+ "auto_sync_failed": "Vòng Blueberry tự đồng bộ thất bại ❌",
+ "no_rings_owned_notification": "Dường như ví này không sở hữu bất kỳ Blueberry Rings nào. ℹ️",
+ "syncing_data_from_ring": "Đồng bộ hóa dữ liệu từ Blueberry Ring #{0}. ⛏️",
+ "already_synced_ring": "Vòng Blueberry #{0}: Đã được đồng bộ. ℹ️",
+ "data_synced_successfully_ring": "Vòng Blueberry #{0}: Dữ liệu đã được đồng bộ thành công. ✅",
+ "data_syncing_failed": "Vòng Blueberry #{0}: Quá trình đồng bộ hóa dữ liệu thất bại. ❌",
+ "blueberry_hooks": "Móc Blueberry",
+ "message": "Tin nhắn"
}
\ No newline at end of file
diff --git a/assets/flutter_i18n/zh_CN.json b/assets/flutter_i18n/zh_CN.json
index 9c00f609..76df5729 100644
--- a/assets/flutter_i18n/zh_CN.json
+++ b/assets/flutter_i18n/zh_CN.json
@@ -417,5 +417,41 @@
"save_locally": "在本地保存",
"save_locally_description": "确保将您的密钥本地保存，然后就可以开始了。",
"axs_storage_permission_use_case": "AXS钱包需要访问您的存储空间以使用如RWA等功能。您的存储数据不会被保存或与任何第三方共享。",
- "local_backup": "本地备份"
+ "local_backup": "本地备份",
+ "no_description": "无描述",
+ "bluetooth_not_supported": "这个设备不支持蓝牙。",
+ "blueberry_ring_hooks": "蓝莓环钩",
+ "nearby_blueberry_rings": "附近的蓝莓环",
+ "unable_to_continue_bluetooth_is_turned_off": "无法继续，蓝牙已关闭！",
+ "scanning": "正在扫描...",
+ "blueberry_ring_inactive_alert_title": "是时候去散步了！",
+ "blueberry_ring_inactive_alert_text": "您已经有一段时间没有活动了。短暂的散步可能会让你精神焕发！",
+ "blueberry_ring_sleep_alert_title": "你最近的深度睡眠时间比平时少。尝试在今晚提前30分钟放松，以获得更好的休息。",
+ "blueberry_ring_sleep_alert_text": "你最近的深度睡眠时间比平时少。尝试在今晚提前30分钟放松，以获得更好的休息。",
+ "blueberry_ring_heart_rate_alert_title": "你今天的心率异常升高。如果你感觉不适，可能需要去看医生。",
+ "blueberry_ring_heart_rate_alert_text": "你今天的心率异常升高。如果你感到不适，最好去看医生。",
+ "blueberry_ring_battery_alert_title": "电池电量低！",
+ "blueberry_ring_battery_alert_text": "您的Blueberry Ring电池电量低。请尽快充电以避免数据断裂。",
+ "activity_reminder": "活动提醒",
+ "sleep_insight": "睡眠洞察",
+ "heart_alert": "心脏警报",
+ "low_battery": "电池电量低",
+ "blueberry_background_notifications_requirements_title": "此服务需要：",
+ "blueberry_background_notifications_requirements_text_1": "1. 需要打开蓝牙",
+ "blueberry_background_notifications_requirements_text_2": "2. 蓝莓需要能够被联系到",
+ "auto_sync_started": "蓝莓环自动同步开始🏁",
+ "no_rings_selected_notification_title": "看起来你还没有选择任何蓝莓环。ℹ️",
+ "no_rings_selected_notification_text": "请前往Blueberry Ring DApp选择戒指。",
+ "auto_sync_successful_notification_title": "蓝莓环自动领取成功 ✅",
+ "auto_sync_successful_notification_text": "AXS钱包已成功同步您的环数据。",
+ "already_synced_notification_title": "哎呀，已经同步ℹ️",
+ "already_synced_notification_text": "AXS钱包试图同步您的环数据，但看起来您今天已经同步了环数据。",
+ "auto_sync_failed": "蓝莓环自动同步失败 ❌",
+ "no_rings_owned_notification": "看起来这个钱包并未拥有任何蓝莓环币。ℹ️",
+ "syncing_data_from_ring": "从Blueberry Ring #{0}同步数据。⛏️",
+ "already_synced_ring": "蓝莓环 # {0}：已经同步。ℹ️",
+ "data_synced_successfully_ring": "蓝莓环 # {0}：数据同步成功。✅",
+ "data_syncing_failed": "蓝莓环＃{0}：数据同步过程失败。❌",
+ "blueberry_hooks": "蓝莓钩子",
+ "message": "消息"
}
\ No newline at end of file
diff --git a/assets/flutter_i18n/zh_TW.json b/assets/flutter_i18n/zh_TW.json
index b78e8c40..295eb9bd 100644
--- a/assets/flutter_i18n/zh_TW.json
+++ b/assets/flutter_i18n/zh_TW.json
@@ -417,5 +417,41 @@
"save_locally": "在本地保存",
"save_locally_description": "確保將您的密鑰本地保存，然後就可以開始了。",
"axs_storage_permission_use_case": "AXS錢包需要訪問您的存储空間以使用如RWA等功能。您的存儲數據不會被保存或與任何第三方共享。",
- "local_backup": "本地備份"
+ "local_backup": "本地備份",
+ "no_description": "無描述",
+ "bluetooth_not_supported": "此設備不支援藍牙。",
+ "blueberry_ring_hooks": "藍莓環鉤",
+ "nearby_blueberry_rings": "附近的藍莓環",
+ "unable_to_continue_bluetooth_is_turned_off": "無法繼續，藍牙已關閉！",
+ "scanning": "正在掃描...",
+ "blueberry_ring_inactive_alert_title": "該去散步了！",
+ "blueberry_ring_inactive_alert_text": "您已經有一段時間沒有活動了。短暫的散步可能真的很振奮人心！",
+ "blueberry_ring_sleep_alert_title": "您最近的深度睡眠時間比平常少。試著今晚提早30分鐘放鬆心情，以獲得更好的休息。",
+ "blueberry_ring_sleep_alert_text": "您最近的深度睡眠時間比平常少。試著今晚提早30分鐘放鬆心情，以獲得更好的休息。",
+ "blueberry_ring_heart_rate_alert_title": "你今天的心率異常地高。如果你感到不適，可能需要去看醫生。",
+ "blueberry_ring_heart_rate_alert_text": "你今天的心率異常地高。如果你感到不適，可能需要去看醫生。",
+ "blueberry_ring_battery_alert_title": "電池電量低！",
+ "blueberry_ring_battery_alert_text": "您的Blueberry Ring電池電量低。請儘快充電以避免數據出現間隙。",
+ "activity_reminder": "活動提醒",
+ "sleep_insight": "睡眠洞察",
+ "heart_alert": "心臟警報",
+ "low_battery": "低電量",
+ "blueberry_background_notifications_requirements_title": "此服務需要：",
+ "blueberry_background_notifications_requirements_text_1": "1. 開啟藍牙",
+ "blueberry_background_notifications_requirements_text_2": "2. 藍莓需能被聯繫到",
+ "auto_sync_started": "藍莓環自動同步已開始 🏁",
+ "no_rings_selected_notification_title": "看起來您還沒有選擇任何藍莓環。ℹ️",
+ "no_rings_selected_notification_text": "請前往Blueberry Ring DApp選擇戒指。",
+ "auto_sync_successful_notification_title": "藍莓環自動索取成功 ✅",
+ "auto_sync_successful_notification_text": "AXS 錢包已成功同步您的環數據",
+ "already_synced_notification_title": "哎呀，已經同步了ℹ️",
+ "already_synced_notification_text": "AXS錢包嘗試同步您的環形數據，但看起來您今天已經同步了環形數據。",
+ "auto_sync_failed": "藍莓環自動同步失敗❌",
+ "no_rings_owned_notification": "看起來這個錢包並未擁有任何藍莓環。ℹ️",
+ "syncing_data_from_ring": "從Blueberry Ring #{0}同步數據。⛏️",
+ "already_synced_ring": "藍莓環＃{0}：已經同步。ℹ️",
+ "data_synced_successfully_ring": "藍莓環＃{0}：數據同步成功。✅",
+ "data_syncing_failed": "藍莓環＃{0}：數據同步過程失敗。❌",
+ "blueberry_hooks": "藍莓鉤子",
+ "message": "訊息"
}
\ No newline at end of file
diff --git a/assets/js/bluetooth/bluetooth.js b/assets/js/bluetooth/bluetooth.js
index 5a1201d7..6af8e4f5 100644
--- a/assets/js/bluetooth/bluetooth.js
+++ b/assets/js/bluetooth/bluetooth.js
@@ -33,7 +33,7 @@ class BluetoothDevice extends EventTarget {
async watchAdvertisements() {
console.log("BluetoothRemoteGATTServer:watchAdvertisements ");
- const response = await window.axs.callHandler(
+ const response = await window.axs?.callHandlerWrapper(
"BluetoothDevice.watchAdvertisements"
);
console.log(
@@ -45,7 +45,7 @@ class BluetoothDevice extends EventTarget {
async forget() {
console.log("BluetoothRemoteGATTServer:forget ");
- const response = await window.axs.callHandler("BluetoothDevice.forget");
+ const response = await window.axs?.callHandlerWrapper("BluetoothDevice.forget");
console.log(
"BluetoothRemoteGATTServer:forget ",
JSON.stringify(response, null, 2)
@@ -63,7 +63,7 @@ class BluetoothRemoteGATTServer extends EventTarget {
async connect() {
console.log("BluetoothRemoteGATTServer:connect ");
- const response = await window.axs?.callHandler(
+ const response = await window.axs?.callHandlerWrapper(
"BluetoothRemoteGATTServer.connect",
{}
);
@@ -78,13 +78,13 @@ class BluetoothRemoteGATTServer extends EventTarget {
async disconnect() {
console.log("BluetoothRemoteGATTServer:disconnect ");
- await window.axs.callHandler("BluetoothRemoteGATTServer.disconnect", {});
+ await window.axs?.callHandlerWrapper("BluetoothRemoteGATTServer.disconnect", {});
}
async getPrimaryService(service) {
console.log("BluetoothRemoteGATTServer:getPrimaryService ", service);
const data = { service: service };
- const response = await window.axs?.callHandler(
+ const response = await window.axs?.callHandlerWrapper(
"BluetoothRemoteGATTServer.getPrimaryService",
data
);
@@ -104,7 +104,7 @@ class BluetoothRemoteGATTServer extends EventTarget {
async getPrimaryServices(service) {
console.log("BluetoothRemoteGATTServer:getPrimaryServices ", service);
const data = { service: service };
- const response = await window.axs.callHandler(
+ const response = await window.axs?.callHandlerWrapper(
"BluetoothRemoteGATTServer.getPrimaryServices",
data
);
@@ -128,7 +128,7 @@ class BluetoothRemoteGATTCharacteristic extends EventTarget {
serviceUUID: this.service.uuid,
descriptor: descriptor,
};
- const response = await window.axs.callHandler(
+ const response = await window.axs?.callHandlerWrapper(
"BluetoothRemoteGATTCharacteristic.getDescriptor",
data
);
@@ -146,7 +146,7 @@ class BluetoothRemoteGATTCharacteristic extends EventTarget {
descriptor: descriptor,
};
- const response = await window.axs.callHandler(
+ const response = await window.axs?.callHandlerWrapper(
"BluetoothRemoteGATTCharacteristic.getDescriptors",
data
);
@@ -156,7 +156,7 @@ class BluetoothRemoteGATTCharacteristic extends EventTarget {
async readValue() {
console.log("BluetoothRemoteGATTCharacteristic:readValue");
const data = { this: this.uuid, serviceUUID: this.service.uuid };
- const response = await window.axs.callHandler(
+ const response = await window.axs?.callHandlerWrapper(
"BluetoothRemoteGATTCharacteristic.readValue",
data
);
@@ -182,7 +182,7 @@ class BluetoothRemoteGATTCharacteristic extends EventTarget {
value: value,
};
- const response = await window.axs.callHandler(
+ const response = await window.axs?.callHandlerWrapper(
"BluetoothRemoteGATTCharacteristic.writeValue",
data
);
@@ -192,9 +192,7 @@ class BluetoothRemoteGATTCharacteristic extends EventTarget {
JSON.stringify(response, null, 2)
);
- if (response.error !== undefined && response.error === true) {
- throw new Error("Error while writing value.");
- }
+ return {};
}
async writeValueWithResponse(value) {
@@ -208,10 +206,12 @@ class BluetoothRemoteGATTCharacteristic extends EventTarget {
value: value,
};
- await window.axs.callHandler(
+ await window.axs?.callHandlerWrapper(
"BluetoothRemoteGATTCharacteristic.writeValueWithResponse",
data
);
+
+ return {};
}
async writeValueWithoutResponse(value) {
@@ -225,17 +225,19 @@ class BluetoothRemoteGATTCharacteristic extends EventTarget {
value: value,
};
- await window.axs.callHandler(
+ await window.axs?.callHandlerWrapper(
"BluetoothRemoteGATTCharacteristic.writeValueWithoutResponse",
data
);
+
+ return {};
}
async startNotifications() {
console.log("BluetoothRemoteGATTCharacteristic:startNotifications");
const data = { this: this.uuid, serviceUUID: this.service.uuid };
- await window.axs.callHandler(
+ await window.axs?.callHandlerWrapper(
"BluetoothRemoteGATTCharacteristic.startNotifications",
data
);
@@ -246,7 +248,7 @@ class BluetoothRemoteGATTCharacteristic extends EventTarget {
console.log("BluetoothRemoteGATTCharacteristic:stopNotifications");
const data = { this: this.uuid, serviceUUID: this.service.uuid };
- await window.axs.callHandler(
+ await window.axs?.callHandlerWrapper(
"BluetoothRemoteGATTCharacteristic.stopNotifications",
data
);
@@ -273,7 +275,7 @@ class BluetoothRemoteGATTService extends EventTarget {
characteristic
);
let data = { this: this.uuid, characteristic: characteristic };
- const response = await window.axs?.callHandler(
+ const response = await window.axs?.callHandlerWrapper(
"BluetoothRemoteGATTService.getCharacteristic",
data
);
@@ -296,7 +298,7 @@ class BluetoothRemoteGATTService extends EventTarget {
"BluetoothRemoteGATTService:getCharacteristics ",
characteristic
);
- const response = await window.axs.callHandler(
+ const response = await window.axs?.callHandlerWrapper(
"BluetoothRemoteGATTService.getCharacteristics",
{ this: "$uuid", characteristic: characteristic }
);
@@ -305,7 +307,7 @@ class BluetoothRemoteGATTService extends EventTarget {
async getIncludedService(service) {
console.log("BluetoothRemoteGATTService:getIncludedService ", service);
- const response = await window.axs.callHandler(
+ const response = await window.axs?.callHandlerWrapper(
"BluetoothRemoteGATTService.getIncludedService",
{ this: "$uuid", service: service }
);
@@ -314,7 +316,7 @@ class BluetoothRemoteGATTService extends EventTarget {
async getIncludedServices(service) {
console.log("BluetoothRemoteGATTService:getIncludedServices ", service);
- const response = await window.axs.callHandler(
+ const response = await window.axs?.callHandlerWrapper(
"BluetoothRemoteGATTService.getIncludedServices",
{ this: "$uuid", service: service }
);
@@ -336,7 +338,7 @@ class AXSBluetooth {
async requestDevice(options) {
console.log("AXSBluetooth:requestDevice ", options);
- const response = await window.axs?.callHandler("requestDevice", options);
+ const response = await window.axs?.callHandlerWrapper("requestDevice", options);
const gatt = new BluetoothRemoteGATTServer(
response.gatt.device,
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 606a22f7..9c2bab40 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -1,156 +1,157 @@
-
- BGTaskSchedulerPermittedIdentifiers
-
- com.transistorsoft.fetch
- com.mxc.axswallet.notificationsTask
- com.mxc.axswallet.wifiHooksTask
- com.mxc.axswallet.minerAutoClaimTask
-
- CADisableMinimumFrameDurationOnPhone
-
- CFBundleDevelopmentRegion
- $(DEVELOPMENT_LANGUAGE)
- CFBundleDisplayName
- AXS
- CFBundleDocumentTypes
-
-
- CFBundleTypeName
- FlSharedLink
- LSHandlerRank
- Default
- LSItemContentTypes
-
- public.file-url
- public.image
- public.text
- public.url
- public.data
-
-
-
- CFBundleExecutable
- $(EXECUTABLE_NAME)
- CFBundleIdentifier
- $(PRODUCT_BUNDLE_IDENTIFIER)
- CFBundleInfoDictionaryVersion
- 6.0
- CFBundleLocalizations
-
- en
- zh_TW
- zh_CN
- zh_HK
- ko
- ja
- vi
- ru
- tr
- de
- es
- pt
- tl
- id
- it
- fr
-
- CFBundleName
- axs
- CFBundlePackageType
- APPL
- CFBundleShortVersionString
- $(FLUTTER_BUILD_NAME)
- CFBundleSignature
- ????
- CFBundleVersion
- $(FLUTTER_BUILD_NUMBER)
- LSApplicationQueriesSchemes
-
- tg
- weixin
- wechat
- googlegmail
- x-dispatch
- readdle-spark
- airmail
- ms-outlook
- ymail
- fastmail
- superhuman
- protonmail
-
- LSRequiresIPhoneOS
-
- LSSupportsOpeningDocumentsInPlace
- No
- NSAppTransportSecurity
+
+ BGTaskSchedulerPermittedIdentifiers
+
+ com.transistorsoft.fetch
+ com.mxc.axswallet.notificationsTask
+ com.mxc.axswallet.wifiHooksTask
+ com.mxc.axswallet.minerAutoClaimTask
+ com.mxc.axswallet.blueberryAutoSyncTask
+
+ CADisableMinimumFrameDurationOnPhone
+
+ CFBundleDevelopmentRegion
+ $(DEVELOPMENT_LANGUAGE)
+ CFBundleDisplayName
+ AXS
+ CFBundleDocumentTypes
+
- NSAllowsArbitraryLoads
-
+ CFBundleTypeName
+ FlSharedLink
+ LSHandlerRank
+ Default
+ LSItemContentTypes
+
+ public.file-url
+ public.image
+ public.text
+ public.url
+ public.data
+
- NSAppleMusicUsageDescription
- Would you allow AXS Wallet to use the Media Library?
- NSBluetoothPeripheralUsageDescription
- Would you allow AXS Wallet to use the Bluetooth?
- NSCalendarsUsageDescription
- Would you allow AXS Wallet to use the Calendar?
- NSCameraUsageDescription
- AXS Wallet needs access to your camera when the app is in use for services such as RWA minting. Image data is not saved or shared with any third parties.
- NSFaceIDUsageDescription
- AXS Wallet needs access to your Biometric data when the app is in use for authentication only. Your Biometric data is not saved or shared with any third parties.
- NSLocationAlwaysAndWhenInUseUsageDescription
- AXS Wallet needs access to your location for features such as Wi-Fi hooks while the app is in use or running in the background. Your location data is not saved or shared with any third parties.
- NSLocationAlwaysUsageDescription
- AXS Wallet requires access to your location at all times for services such as Wi-Fi hooks. Your location data is not saved or shared with any third parties.
- NSLocationUsageDescription
- AXS Wallet needs access to your location to provide services such as Wi-Fi hooks. Your location data is not saved or shared with any third parties.
- NSLocationWhenInUseUsageDescription
- AXS Wallet needs access to your location when the app is in use for services such as Wi-Fi hooks. Your location data is not saved or shared with any third parties.
- NSMotionUsageDescription
- Would you allow AXS Wallet to use the Motion?
- NSPhotoLibraryAddUsageDescription
- AXS Wallet needs access to your photos to save images such as RWA. Your photos are not saved or shared with any third parties.
- NSPhotoLibraryUsageDescription
- AXS Wallet needs access to your photos when the app is in use for services such as RWA minting. Your photos are not saved or shared with any third parties.
- NSSpeechRecognitionUsageDescription
- Would you allow AXS Wallet to use the Speech Recognition?
- PermissionGroupNotification
- Would you allow AXS Wallet to use the Notification?
- NSBluetoothAlwaysUsageDescription
- AXS Wallet needs access to your Bluetooth when the app is in use or running in the background for services such as BluberryRing. Blutooth data is not saved or shared with any third parties.
- UIApplicationSupportsIndirectInputEvents
-
- UIBackgroundModes
-
- fetch
- location
- processing
- remote-notification
- bluetooth-central
-
- UILaunchStoryboardName
- LaunchScreen
- UIMainStoryboardFile
- Main
- UISupportedInterfaceOrientations
-
- UIInterfaceOrientationPortrait
- UIInterfaceOrientationLandscapeLeft
- UIInterfaceOrientationLandscapeRight
-
- UISupportedInterfaceOrientations~ipad
-
- UIInterfaceOrientationPortrait
- UIInterfaceOrientationPortraitUpsideDown
- UIInterfaceOrientationLandscapeLeft
- UIInterfaceOrientationLandscapeRight
-
- UIViewControllerBasedStatusBarAppearance
-
- UISupportsDocumentBrowser
+
+ CFBundleExecutable
+ $(EXECUTABLE_NAME)
+ CFBundleIdentifier
+ $(PRODUCT_BUNDLE_IDENTIFIER)
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundleLocalizations
+
+ en
+ zh_TW
+ zh_CN
+ zh_HK
+ ko
+ ja
+ vi
+ ru
+ tr
+ de
+ es
+ pt
+ tl
+ id
+ it
+ fr
+
+ CFBundleName
+ axs
+ CFBundlePackageType
+ APPL
+ CFBundleShortVersionString
+ $(FLUTTER_BUILD_NAME)
+ CFBundleSignature
+ ????
+ CFBundleVersion
+ $(FLUTTER_BUILD_NUMBER)
+ LSApplicationQueriesSchemes
+
+ tg
+ weixin
+ wechat
+ googlegmail
+ x-dispatch
+ readdle-spark
+ airmail
+ ms-outlook
+ ymail
+ fastmail
+ superhuman
+ protonmail
+
+ LSRequiresIPhoneOS
+
+ LSSupportsOpeningDocumentsInPlace
+ No
+ NSAppTransportSecurity
+
+ NSAllowsArbitraryLoads
+ NSAppleMusicUsageDescription
+ Would you allow AXS Wallet to use the Media Library?
+ NSBluetoothPeripheralUsageDescription
+ Would you allow AXS Wallet to use the Bluetooth?
+ NSCalendarsUsageDescription
+ Would you allow AXS Wallet to use the Calendar?
+ NSCameraUsageDescription
+ AXS Wallet needs access to your camera when the app is in use for services such as RWA minting. Image data is not saved or shared with any third parties.
+ NSFaceIDUsageDescription
+ AXS Wallet needs access to your Biometric data when the app is in use for authentication only. Your Biometric data is not saved or shared with any third parties.
+ NSLocationAlwaysAndWhenInUseUsageDescription
+ AXS Wallet needs access to your location for features such as Wi-Fi hooks while the app is in use or running in the background. Your location data is not saved or shared with any third parties.
+ NSLocationAlwaysUsageDescription
+ AXS Wallet requires access to your location at all times for services such as Wi-Fi hooks. Your location data is not saved or shared with any third parties.
+ NSLocationUsageDescription
+ AXS Wallet needs access to your location to provide services such as Wi-Fi hooks. Your location data is not saved or shared with any third parties.
+ NSLocationWhenInUseUsageDescription
+ AXS Wallet needs access to your location when the app is in use for services such as Wi-Fi hooks. Your location data is not saved or shared with any third parties.
+ NSMotionUsageDescription
+ Would you allow AXS Wallet to use the Motion?
+ NSPhotoLibraryAddUsageDescription
+ AXS Wallet needs access to your photos to save images such as RWA. Your photos are not saved or shared with any third parties.
+ NSPhotoLibraryUsageDescription
+ AXS Wallet needs access to your photos when the app is in use for services such as RWA minting. Your photos are not saved or shared with any third parties.
+ NSSpeechRecognitionUsageDescription
+ Would you allow AXS Wallet to use the Speech Recognition?
+ PermissionGroupNotification
+ Would you allow AXS Wallet to use the Notification?
+ NSBluetoothAlwaysUsageDescription
+ AXS Wallet needs access to your Bluetooth when the app is in use or running in the background for services such as BluberryRing. Blutooth data is not saved or shared with any third parties.
+ UIApplicationSupportsIndirectInputEvents
+
+ UIBackgroundModes
+
+ fetch
+ location
+ processing
+ remote-notification
+ bluetooth-central
+
+ UILaunchStoryboardName
+ LaunchScreen
+ UIMainStoryboardFile
+ Main
+ UISupportedInterfaceOrientations
+
+ UIInterfaceOrientationPortrait
+ UIInterfaceOrientationLandscapeLeft
+ UIInterfaceOrientationLandscapeRight
+
+ UISupportedInterfaceOrientations~ipad
+
+ UIInterfaceOrientationPortrait
+ UIInterfaceOrientationPortraitUpsideDown
+ UIInterfaceOrientationLandscapeLeft
+ UIInterfaceOrientationLandscapeRight
+
+ UIViewControllerBasedStatusBarAppearance
+
+ UISupportsDocumentBrowser
+
+
diff --git a/lib/common/components/list/single_line_info_item.dart b/lib/common/components/list/single_line_info_item.dart
index 9b2b7759..0b9f6b29 100644
--- a/lib/common/components/list/single_line_info_item.dart
+++ b/lib/common/components/list/single_line_info_item.dart
@@ -49,7 +49,7 @@ class SingleLineInfoItem extends HookConsumerWidget {
value,
style: FontTheme.of(context).body1.primary(),
softWrap: true,
- textAlign: TextAlign.end,
+ textAlign: TextAlign.start,
),
),
if (valueActionIcon != null)
diff --git a/lib/core/src/background_process/axs_background_fetch.dart b/lib/core/src/background_process/axs_background_fetch.dart
index b4edb33c..e4dc9428 100644
--- a/lib/core/src/background_process/axs_background_fetch.dart
+++ b/lib/core/src/background_process/axs_background_fetch.dart
@@ -28,6 +28,8 @@ class AXSBackgroundFetch {
DAppHooksService.dappHooksServiceCallBackDispatcherForeground(taskId);
} else if (taskId == BackgroundExecutionConfig.minerAutoClaimTask) {
DAppHooksService.autoClaimServiceCallBackDispatcherForeground(taskId);
+ } else if (taskId == BackgroundExecutionConfig.blueberryAutoSyncTask) {
+ DAppHooksService.blueberryAutoSyncServiceCallBackDispatcherForeground(taskId);
} else {
bgFetch.BackgroundFetch.finish(taskId);
}
@@ -77,7 +79,7 @@ class AXSBackgroundFetch {
requiresCharging: false,
requiresStorageNotLow: false,
requiresDeviceIdle: false,
- requiredNetworkType: bgFetch.NetworkType.ANY),
+ requiredNetworkType: bgFetch.NetworkType.ANY,),
handleCallBackDispatcher);
// Android Only
final backgroundFetchState =
diff --git a/lib/core/src/background_process/dapp_hooks_service.dart b/lib/core/src/background_process/dapp_hooks_service.dart
index 523d7535..c2670c05 100644
--- a/lib/core/src/background_process/dapp_hooks_service.dart
+++ b/lib/core/src/background_process/dapp_hooks_service.dart
@@ -90,4 +90,48 @@ class DAppHooksService {
BackgroundFetch.finish(taskId);
}
}
+
+ static void blueberryAutoSyncServiceCallBackDispatcherForeground(
+ String taskId) async {
+ try {
+ await loadProviders();
+
+ final container = ProviderContainer();
+ final authUseCase = container.read(authUseCaseProvider);
+ final chainConfigurationUseCase =
+ container.read(chainConfigurationUseCaseProvider);
+ final accountUseCase = container.read(accountUseCaseProvider);
+ final dAppHooksUseCase = container.read(dAppHooksUseCaseProvider);
+ final contextLessTranslationUseCase =
+ container.read(contextLessTranslationUseCaseProvider);
+
+ final selectedNetwork =
+ chainConfigurationUseCase.getCurrentNetworkWithoutRefresh();
+ DAppHooksModel dappHooksData = dAppHooksUseCase.dappHooksData.value;
+ final chainId = selectedNetwork.chainId;
+
+ final isLoggedIn = authUseCase.loggedIn;
+ final account = accountUseCase.account.value;
+ // final serviceEnabled = dappHooksData.enabled;
+ final autoSyncEnabled = dappHooksData.blueberryRingHooks.enabled;
+ final ringHooksTime = dappHooksData.blueberryRingHooks.time;
+ final selectedRings = dappHooksData.blueberryRingHooks.selectedRings;
+ // Make sure user is logged in
+ if (isLoggedIn && MXCChains.isMXCChains(chainId) && autoSyncEnabled) {
+ await AXSNotification()
+ .setupFlutterNotifications(shouldInitFirebase: false);
+
+ await dAppHooksUseCase.syncBlueberryRingSync(
+ account: account!,
+ selectedRingsListId: selectedRings,
+ ringAutoSyncTime: ringHooksTime);
+ BackgroundFetch.finish(taskId);
+ } else {
+ // terminate background fetch
+ BackgroundFetch.stop(taskId);
+ }
+ } catch (e) {
+ BackgroundFetch.finish(taskId);
+ }
+ }
}
diff --git a/lib/core/src/providers/providers_use_cases.dart b/lib/core/src/providers/providers_use_cases.dart
index 73539b21..8f1ad66c 100644
--- a/lib/core/src/providers/providers_use_cases.dart
+++ b/lib/core/src/providers/providers_use_cases.dart
@@ -146,6 +146,7 @@ final Provider dAppHooksUseCaseProvider = Provider(
),
ref.watch(errorUseCaseProvider),
ref.watch(contextLessTranslationUseCaseProvider),
+ ref.watch(blueberryRingBackgroundSyncUseCase),
),
);
@@ -286,3 +287,15 @@ final Provider
ref.watch(contextLessTranslationUseCaseProvider),
),
);
+
+final Provider
+ blueberryRingBackgroundSyncUseCase = Provider(
+ (ref) => BlueberryRingBackgroundSyncUseCase(
+ ref.watch(web3RepositoryProvider),
+ ref.watch(chainConfigurationUseCaseProvider),
+ ref.watch(bluetoothUseCaseProvider),
+ ref.watch(blueberryRingUseCaseProvider),
+ ref.watch(accountUseCaseProvider),
+ ref.watch(contextLessTranslationUseCaseProvider),
+ ),
+);
diff --git a/lib/features/common/contract/token_contract_use_case.dart b/lib/features/common/contract/token_contract_use_case.dart
index 1839a9b7..283723ca 100644
--- a/lib/features/common/contract/token_contract_use_case.dart
+++ b/lib/features/common/contract/token_contract_use_case.dart
@@ -269,6 +269,17 @@ class TokenContractUseCase extends ReactiveUseCase {
.getTokenTransferData(tokenHash, toAddress, amount);
}
+ String signPersonalMessage({required String privateKey, required String message}) {
+ return _repository.tokenContract
+ .signPersonalMessage(privateKey: privateKey, message: message);
+ }
+
+
+ String signMessage({required String privateKey, required String message}) {
+ return _repository.tokenContract
+ .signMessage(privateKey: privateKey, message: message);
+ }
+
String signTypedMessage({required String privateKey, required String data}) {
return _repository.tokenContract
.signTypedMessage(privateKey: privateKey, data: data);
diff --git a/lib/features/common/packages/bluetooth/blue_plus/bluetooth_use_case.dart b/lib/features/common/packages/bluetooth/blue_plus/bluetooth_use_case.dart
index 2a9002b4..43d44b2b 100644
--- a/lib/features/common/packages/bluetooth/blue_plus/bluetooth_use_case.dart
+++ b/lib/features/common/packages/bluetooth/blue_plus/bluetooth_use_case.dart
@@ -33,9 +33,9 @@ class BluetoothUseCase extends ReactiveUseCase {
final ChainConfigurationUseCase _chainConfigurationUseCase;
final AuthUseCase _authUseCase;
- late StreamSubscription>? scannerListener;
- late StreamSubscription? stateListener;
- late StreamSubscription? isScanningStateListener;
+ StreamSubscription>? scannerListener;
+ StreamSubscription? stateListener;
+ StreamSubscription? isScanningStateListener;
late final ValueStream isScanning = reactive(false);
late final ValueStream bluetoothStatus =
@@ -49,8 +49,13 @@ class BluetoothUseCase extends ReactiveUseCase {
// usually start scanning, connecting, etc
isScanningListener();
initScannerListener();
- } else {
+ } else if (state == BluetoothAdapterState.unauthorized ||
+ state == BluetoothAdapterState.unavailable ||
+ state == BluetoothAdapterState.off ||
+ state == BluetoothAdapterState.unknown) {
// show an error to the user, etc
+ cancelIsScanningListener();
+ _cancelScannerListen();
}
});
}
@@ -141,6 +146,31 @@ class BluetoothUseCase extends ReactiveUseCase {
}
}
+ Future connectionHandler(BluetoothDevice device) async {
+ int attempts = 0;
+ const maxAttempts = 4;
+ while (attempts < maxAttempts) {
+ try {
+ print('Attempt ${attempts + 1} to connect to device...');
+ await device.connect();
+ print('Connected to device successfully.');
+ break; // Exit the loop if the connection is successful
+ } catch (e) {
+ if (e is FlutterBluePlusException && e.function == 'connect') {
+ attempts++;
+ print('Failed to connect. Attempt $attempts of $maxAttempts.');
+ if (attempts >= maxAttempts) {
+ print('Max attempts reached. Could not connect to device.');
+ break;
+ }
+ } else {
+ print('Unexpected error: $e');
+ break; // Exit on unexpected errors
+ }
+ }
+ }
+ }
+
void startScanning({
List? withServices,
List? withRemoteIds,
diff --git a/lib/features/common/packages/bluetooth/blueberry_ring/domain/blueberry_ring_background_notifications_use_case.dart b/lib/features/common/packages/bluetooth/blueberry_ring/domain/blueberry_ring_background_notifications_use_case.dart
index 683dec96..efd5154a 100644
--- a/lib/features/common/packages/bluetooth/blueberry_ring/domain/blueberry_ring_background_notifications_use_case.dart
+++ b/lib/features/common/packages/bluetooth/blueberry_ring/domain/blueberry_ring_background_notifications_use_case.dart
@@ -27,7 +27,7 @@ class BlueberryRingBackgroundNotificationsUseCase extends ReactiveUseCase {
Future checkActivityReminder() async {
final data = await _blueberryRingUseCase.readSteps();
- collectLog('checkActivityReminder:data ${data.map((e) => e.toJson()).toList()}');
+ print('checkActivityReminder:data ${data.map((e) => e.toJson()).toList()}');
// Get spteps data from cache and compare
// If steps is below a certain number then show a
// Below 5000
@@ -50,7 +50,7 @@ class BlueberryRingBackgroundNotificationsUseCase extends ReactiveUseCase {
Future checkSleepInsight() async {
final data = await _blueberryRingUseCase.readSleep();
- collectLog('checkSleepInsight:data ${data.map((e) => e.toJson()).toList()}');
+ print('checkSleepInsight:data ${data.map((e) => e.toJson()).toList()}');
// If sleeps is below standard level
// loop throug all and get average
final now = DateTime.now();
@@ -65,11 +65,14 @@ class BlueberryRingBackgroundNotificationsUseCase extends ReactiveUseCase {
return isToday;
});
+ print(
+ 'checkSleepInsight:todaysData ${todaysData.map((e) => e.toJson()).toList()}');
if (todaysData.isEmpty) {
return;
}
- final isNormal = BlueberryRingDataAnalyzer.isSleepQualityNormal(todaysData.map((e) => e.value).toList());
+ final isNormal = BlueberryRingDataAnalyzer.isSleepQualityNormal(
+ todaysData.map((e) => e.value).toList());
if (!isNormal) {
AXSNotification().showNotification(
@@ -81,7 +84,7 @@ class BlueberryRingBackgroundNotificationsUseCase extends ReactiveUseCase {
Future checkHeartAlert() async {
final data = await _blueberryRingUseCase.readHeartRate();
- collectLog('checkHeartAlert:data ${data.map((e) => e.toJson()).toList()}');
+ print('checkHeartAlert:data ${data.map((e) => e.toJson()).toList()}');
// If below standard but between person to person different
final latestData = data.first;
final lastDate = DateTime.fromMillisecondsSinceEpoch(
@@ -102,7 +105,7 @@ class BlueberryRingBackgroundNotificationsUseCase extends ReactiveUseCase {
Future checkLowBattery() async {
final data = await _blueberryRingUseCase.readLevel();
- collectLog('checkLowBattery:data $data');
+ print('checkLowBattery:data $data');
// What si the low battery level
// Is 10 OK
if (data < 20) {
diff --git a/lib/features/common/packages/bluetooth/blueberry_ring/domain/blueberry_ring_background_sync_use_case.dart b/lib/features/common/packages/bluetooth/blueberry_ring/domain/blueberry_ring_background_sync_use_case.dart
new file mode 100644
index 00000000..b12c42ce
--- /dev/null
+++ b/lib/features/common/packages/bluetooth/blueberry_ring/domain/blueberry_ring_background_sync_use_case.dart
@@ -0,0 +1,144 @@
+import 'dart:async';
+import 'dart:convert';
+import 'package:datadashwallet/features/common/common.dart';
+import 'package:mxc_logic/mxc_logic.dart';
+
+import 'package:datadashwallet/core/core.dart';
+import 'package:datadashwallet/features/settings/subfeatures/chain_configuration/domain/chain_configuration_use_case.dart';
+
+import '../../../../../../app/logger.dart';
+
+class BlueberryRingBackgroundSyncUseCase extends ReactiveUseCase {
+ BlueberryRingBackgroundSyncUseCase(
+ this._repository,
+ this._chainConfigurationUseCase,
+ this._bluetoothUseCase,
+ this._blueberryRingUseCase,
+ this._accountUserCase,
+ this._contextLessTranslationUseCase);
+
+ final Web3Repository _repository;
+ final ChainConfigurationUseCase _chainConfigurationUseCase;
+ final BluetoothUseCase _bluetoothUseCase;
+ final BlueberryRingUseCase _blueberryRingUseCase;
+ final AccountUseCase _accountUserCase;
+ final ContextLessTranslationUseCase _contextLessTranslationUseCase;
+
+
+ // Context less translation, This should be only used for BG functions
+ String cTranslate(String key) =>
+ _contextLessTranslationUseCase.translate(key);
+
+
+ Future syncRings({
+ required List selectedRingsListId,
+ required Account account,
+ required void Function(String title, String? text) showNotification,
+ required String Function(
+ String key,
+ )
+ translate,
+ }) async {
+ // Get miner from cache
+ // for (String ring in selectedRings) {
+
+ // }
+ // Get rings list
+ // Get the data from contract
+// async function arrayFilterDate(array: T[], date?: number) {
+// if (!date)
+// return array
+// return array.filter((item: any) => item.date > (date || 0)) as T[]
+// }
+// arrayFilterDate(arr, detail.steps.at(-1)?.date)
+// List arrayFilterDate(List array, {int? date}) {
+// if (date == null) return array;
+
+// return array.where((item) {
+// var itemDate = (item as dynamic).date; // Use 'dynamic' to access the 'date' property
+// return itemDate > (date ?? 0);
+// }).toList();
+// }
+
+ // showNotification(
+ // translate('no_token_to_claim_miner')
+ // .replaceFirst('{0}', miner.mep1004TokenId!),
+ // null,
+ // );
+ // no_rings_owned_notification
+ // syncing_data_from_ring
+ // already_synced_ring
+ // data_synced_successfully_ring
+ // data_syncing_failed
+ // final memo = await fetchRingData();
+
+ // final postClaimRequest = PostClaimRequestModel(
+ // sncode: ring.sncode,
+ // sender: account.address,
+ // );
+ // final postClaimResponse = await _repository.blueberryRingRepository.postClaim(
+ // postClaimRequest,
+ // );
+
+ // final txSig = await _repository.blueberryRingRepository.sendSyncTransaction(account.privateKey, ring, postClaimResponse, memo);
+
+ // // showNotification(
+ // // translate('no_token_to_claim_miner')
+ // // .replaceFirst('{0}', miner.mep1004TokenId!),
+ // // null,
+ // // );
+
+ return true;
+ }
+
+ Future syncRing(BlueberryRingMiner ring) async{}
+
+
+ Future fetchRingData() async {
+ collectLog('fetchRingData');
+
+ final sleep = await _blueberryRingUseCase.readSleep();
+ final bloodOxygens = await _blueberryRingUseCase.readBloodOxygens();
+ final steps = await _blueberryRingUseCase.readSteps();
+ final heartRate = await _blueberryRingUseCase.readHeartRate();
+
+ final data = {
+ 'sleep': sleep.map((e) => e.toJson()).toList(),
+ 'steps': steps.map((e) => e.toJson()).toList(),
+ 'heartRate': heartRate.map((e) => e.toJson()).toList(),
+ 'bloodOxygens': bloodOxygens.map((e) => e.toJson()).toList(),
+ };
+
+
+ final content = json.encode(data);
+
+ collectLog('fetchRingData:content : $content');
+
+ final mep3355 = {
+ 'format': 'MEP-3355',
+ 'version': '1.0.0',
+ 'metadata': {
+ 'data_source': 'BlueberryRingV1',
+ 'data_collection_method': 'bluetooth',
+ 'preprocessing': 'weighted average of data',
+ },
+ 'data': [
+ {
+ 'type': 'sensor',
+ // 'content': await compress(content),
+ 'compression': 'brotli',
+ },
+ ],
+ };
+
+ collectLog('fetchRingData:content : $mep3355');
+
+ final returndataMap = {
+ 'json': mep3355,
+ 'data': data,
+ };
+ final returnDataJson = json.encode(returndataMap);
+ return returnDataJson;
+ }
+
+}
diff --git a/lib/features/common/packages/bluetooth/blueberry_ring/domain/blueberry_ring_use_case.dart b/lib/features/common/packages/bluetooth/blueberry_ring/domain/blueberry_ring_use_case.dart
index 721697db..3d1b34f8 100644
--- a/lib/features/common/packages/bluetooth/blueberry_ring/domain/blueberry_ring_use_case.dart
+++ b/lib/features/common/packages/bluetooth/blueberry_ring/domain/blueberry_ring_use_case.dart
@@ -33,16 +33,11 @@ class BlueberryRingUseCase extends ReactiveUseCase {
late final ValueStream blueberryRingCharacteristic =
reactive(null);
late final ValueStream
- blueberryRinCharacteristicNotifications = reactive(null);
+ blueberryRingNotificationsCharacteristic = reactive(null);
late final ValueStream bluetoothStatus =
reactive(BluetoothAdapterState.off);
- // if (state.selectedScanResult != null) {
- // responseDevice = BluetoothDevice.getBluetoothDeviceFromScanResult(
- // state.selectedScanResult!);
- // }
-
void initBlueberryRingSelectedActions() {
selectedBlueberryRing.listen((event) {
if (event != null) {
@@ -52,13 +47,14 @@ class BlueberryRingUseCase extends ReactiveUseCase {
}
Future getBlueberryRingBackground() async {
- // if (bluetoothStatus.value == BluetoothAdapterState.off || bluetoothStatus.value = BluetoothAdapterState.unauthorized)
_bluetoothUseCase.startScanning(
withServices: [bluetoothServiceUUID],
// withNames: ['Mi Smart Band 4'],
+ withNames: ['2301'],
+ withKeywords: ['2301'],
);
- await Future.delayed(const Duration(seconds: 2), () async {
+ await Future.delayed(const Duration(seconds: 4), () async {
final scanResults = _bluetoothUseCase.scanResults.value;
if (scanResults.isNotEmpty) {
// only one scan results
@@ -99,7 +95,8 @@ class BlueberryRingUseCase extends ReactiveUseCase {
}
Future connectToBlueberryRing() async {
- await selectedBlueberryRing.value!.device.connect();
+ await _bluetoothUseCase
+ .connectionHandler(selectedBlueberryRing.value!.device);
}
Future getBlueberryRingBluetoothService() async {
@@ -124,7 +121,8 @@ class BlueberryRingUseCase extends ReactiveUseCase {
'checkEstablishment:isBlueberryRingConnected $isBlueberryRingConnected');
if (!isBlueberryRingConnected) {
- await selectedBlueberryRing.value?.device.connect();
+ await _bluetoothUseCase
+ .connectionHandler(selectedBlueberryRing.value!.device);
isBlueberryRingConnected =
selectedBlueberryRing.value?.device.isConnected ?? false;
if (!isBlueberryRingConnected) {
@@ -140,99 +138,117 @@ class BlueberryRingUseCase extends ReactiveUseCase {
await getBlueberryRingCharacteristic();
}
- return await func();
- }
-
- Future readLevel() async {
- return checkEstablishment(
- () async {
- final command = BlueberryCommands.readLevel();
- collectLog('readLevel:command $command');
- await blueberryRingCharacteristic.value?.write(command);
- final value = await blueberryRingCharacteristic.value?.read();
- collectLog('readLevel:value $value');
- return BlueberryResolves.readLevel(Uint8List.fromList(value!));
- },
- );
- }
-
- Future readVersion() async {
- return checkEstablishment(
- () async {
- final command = BlueberryCommands.readVersion();
- collectLog('readVersion:command $command');
- await blueberryRingCharacteristic.value?.write(command);
- final value = await blueberryRingCharacteristic.value?.read();
- collectLog('readVersion:value $value');
- return BlueberryResolves.readVersion(Uint8List.fromList(value!));
- },
- );
- }
-
- Future readTime() async {
- return checkEstablishment(
- () async {
- final command = BlueberryCommands.readTime();
- collectLog('readTime:command $command');
- await blueberryRingCharacteristic.value?.write(command);
- final value = await blueberryRingCharacteristic.value?.read();
- collectLog('readTime:value $value');
- return BlueberryResolves.readTime(Uint8List.fromList(value!));
- },
- );
- }
+ final isBlueberryRingNotificationsCharacteristicAvailable =
+ blueberryRingNotificationsCharacteristic.hasValue;
+ collectLog(
+ 'checkEstablishment:isBlueberryRingNotificationsCharacteristicAvailable $isBlueberryRingNotificationsCharacteristicAvailable');
+ if (!isBlueberryRingNotificationsCharacteristicAvailable) {
+ await getBlueberryRingNotificationsCharacteristic();
+ }
- Future> readSleep() async {
- return checkEstablishment>(
- () async {
- final command = BlueberryCommands.readSleep();
- collectLog('readSleep:command $command');
- await blueberryRingCharacteristic.value?.write(command);
- final value = await blueberryRingCharacteristic.value?.read();
- collectLog('readSleep:value $value');
- return BlueberryResolves.readSleep(Uint8List.fromList(value!));
- },
- );
- }
+ final isNotifying =
+ blueberryRingNotificationsCharacteristic.value!.isNotifying;
+ collectLog(
+ 'checkEstablishment:isBlueberryRingNotificationsCharacteristicNotifiying $isNotifying');
+ if (!isNotifying) {
+ blueberryRingNotificationsCharacteristic.value!.setNotifyValue(true);
+ }
- Future> readBloodOxygens() async {
- return checkEstablishment>(
- () async {
- final command = BlueberryCommands.readBloodOxygens();
- collectLog('readBloodOxygens:command $command');
- await blueberryRingCharacteristic.value?.write(command);
- final value = await blueberryRingCharacteristic.value?.read();
- collectLog('readBloodOxygens:value $value');
- return BlueberryResolves.readBloodOxygens(Uint8List.fromList(value!));
- },
- );
+ return await func();
}
- Future> readSteps() async {
- return checkEstablishment>(
+ Future readData(Uint8List Function() getCommandFunc, String dataName,
+ T Function(Uint8List) resolveData, bool isFrag) async {
+ return checkEstablishment(
() async {
- final command = BlueberryCommands.readSteps();
- collectLog('readSteps:command $command');
- await blueberryRingCharacteristic.value?.write(command);
- final value = await blueberryRingCharacteristic.value?.read();
- collectLog('readSteps:value $value');
- return BlueberryResolves.readSteps(Uint8List.fromList(value!));
+ final command = getCommandFunc();
+ collectLog('read$dataName:command $command');
+
+ // Prepare to listen for the response before writing
+ final Stream> stream =
+ blueberryRingNotificationsCharacteristic.value!.lastValueStream;
+
+ // Create a completer to handle the response
+ final Completer> completer = Completer>();
+
+ Timer? timer;
+ List data = [];
+
+ // Subscribe to the stream and filter for the specific command
+ final StreamSubscription> subscription =
+ stream.listen((element) {
+ if (element.isNotEmpty && element.first == command.first) {
+ timer?.cancel();
+ collectLog('read$dataName:element $element');
+ data.addAll(element);
+
+ if (!completer.isCompleted && !isFrag) {
+ completer.complete(data);
+ } else if (!completer.isCompleted &&
+ isFrag &&
+ element.last == 255) {
+ completer.complete(data);
+ } else {
+ timer = Timer(
+ const Duration(milliseconds: 5000),
+ () => completer.complete(data),
+ );
+ }
+ }
+ });
+
+ blueberryRingCharacteristic.value?.write(command);
+
+ // Wait for the expected value to be received
+ final List value = await completer.future;
+
+ // Cancel the subscription to avoid memory leaks
+ await subscription.cancel();
+
+ collectLog('read$dataName:value $value');
+ return resolveData(Uint8List.fromList(value));
},
);
}
- Future> readHeartRate() async {
- return checkEstablishment>(
- () async {
- final command = BlueberryCommands.readHeartRates();
- collectLog('readHeartRate:command $command');
- await blueberryRingCharacteristic.value?.write(command);
- final value = await blueberryRingCharacteristic.value?.read();
- collectLog('readHeartRate:value $value');
- return BlueberryResolves.readHeartRates(Uint8List.fromList(value!));
- },
- );
- }
+ Future readLevel() async => readData(BlueberryCommands.readLevel,
+ 'Level', BlueberryResolves.readLevel, BlueberryMethods.readLevel.frag);
+
+ Future readVersion() async => readData(
+ BlueberryCommands.readVersion,
+ 'Version',
+ BlueberryResolves.readVersion,
+ BlueberryMethods.readVersion.frag);
+
+ Future readTime() async => readData(
+ BlueberryCommands.readTime,
+ 'Time',
+ BlueberryResolves.readTime,
+ BlueberryMethods.readTime.frag);
+
+ Future> readSleep() async =>
+ readData>(BlueberryCommands.readSleep, 'Sleep',
+ BlueberryResolves.readSleep, BlueberryMethods.readSleep.frag);
+
+ Future> readBloodOxygens() async =>
+ readData>(
+ BlueberryCommands.readBloodOxygens,
+ 'BloodOxygens',
+ BlueberryResolves.readBloodOxygens,
+ BlueberryMethods.readBloodOxygens.frag);
+
+ Future> readSteps() async => readData>(
+ BlueberryCommands.readSteps,
+ 'Steps',
+ BlueberryResolves.readSteps,
+ BlueberryMethods.readSteps.frag);
+
+ Future> readHeartRate() async =>
+ readData>(
+ BlueberryCommands.readHeartRates,
+ 'HeartRate',
+ BlueberryResolves.readHeartRates,
+ BlueberryMethods.readHeartRates.frag);
Future getBlueberryRingCharacteristic() async {
final service = await getBlueberryRingBluetoothService();
@@ -243,21 +259,21 @@ class BlueberryRingUseCase extends ReactiveUseCase {
}
Future
- getBlueberryRingCharacteristicNotifications() async {
+ getBlueberryRingNotificationsCharacteristic() async {
final service = await getBlueberryRingBluetoothService();
final resp = await _getBlueberryRingCharacteristic(
service, bluetoothCharacteristicNotificationUUID);
- update(blueberryRinCharacteristicNotifications, resp);
+ update(blueberryRingNotificationsCharacteristic, resp);
return resp;
}
- Future startBlueberryRingCharacteristicNotifications() async {
- final characteristicNotifications =
- await getBlueberryRingCharacteristicNotifications();
- await characteristicNotifications.setNotifyValue(true);
- characteristicNotifications.onValueReceived.listen((event) {});
- final value = characteristicNotifications.read();
- }
+ // Future startBlueberryRingCharacteristicNotifications() async {
+ // final characteristicNotifications =
+ // await getBlueberryRingCharacteristicNotifications();
+ // await characteristicNotifications.setNotifyValue(true);
+ // characteristicNotifications.lastValueStream.listen((event) {});
+ // final value = characteristicNotifications.read();
+ // }
Future _getBlueberryRingPrimaryService(
Guid serviceUUID,
diff --git a/lib/features/common/packages/bluetooth/blueberry_ring/domain/domain.dart b/lib/features/common/packages/bluetooth/blueberry_ring/domain/domain.dart
index 0453b11d..01bb0256 100644
--- a/lib/features/common/packages/bluetooth/blueberry_ring/domain/domain.dart
+++ b/lib/features/common/packages/bluetooth/blueberry_ring/domain/domain.dart
@@ -1,3 +1,4 @@
export 'blueberry_repository.dart';
export 'blueberry_ring_use_case.dart';
export 'blueberry_ring_background_notifications_use_case.dart';
+export 'blueberry_ring_background_sync_use_case.dart';
diff --git a/lib/features/common/packages/bluetooth/blueberry_ring/utils/blueberry_commands_utils.dart b/lib/features/common/packages/bluetooth/blueberry_ring/utils/blueberry_commands_utils.dart
index 78d0ef09..79c5a1a2 100644
--- a/lib/features/common/packages/bluetooth/blueberry_ring/utils/blueberry_commands_utils.dart
+++ b/lib/features/common/packages/bluetooth/blueberry_ring/utils/blueberry_commands_utils.dart
@@ -3,8 +3,9 @@ import 'dart:typed_data';
class Method {
final int uid;
final List? arg;
+ final bool frag;
- Method({required this.uid, this.arg});
+ Method({required this.uid, this.arg, this.frag = false});
}
class BlueberryCommandsUtils {
@@ -23,7 +24,8 @@ class BlueberryCommandsUtils {
static List> splitArrayByLength(List arr, int length) {
List> result = [];
for (int i = 0; i < arr.length; i += length) {
- result.add(arr.sublist(i, i + length));
+ int end = (i + length < arr.length) ? i + length : arr.length;
+ result.add(arr.sublist(i, end));
}
return result;
}
diff --git a/lib/features/common/packages/bluetooth/blueberry_ring/utils/blueberry_configs.dart b/lib/features/common/packages/bluetooth/blueberry_ring/utils/blueberry_configs.dart
index e260a5b8..4757063b 100644
--- a/lib/features/common/packages/bluetooth/blueberry_ring/utils/blueberry_configs.dart
+++ b/lib/features/common/packages/bluetooth/blueberry_ring/utils/blueberry_configs.dart
@@ -15,11 +15,11 @@ class GetMappings {
class BlueberryMethods {
static final readLevel = Method(uid: 0x13, arg: [1]);
static final readVersion = Method(uid: 0x27);
- static final readSteps = Method(uid: 0x52, arg: [1]);
static final readTime = Method(uid: 0x41);
- static final readSleep = Method(uid: 0x53, arg: [1, 2, 3]);
- static final readHeartRates = Method(uid: 0x55, arg: [1, 2, 3]);
- static final readBloodOxygens = Method(uid: 0x66, arg: [1, 2, 3]);
+ static final readSteps = Method(uid: 0x52, arg: [1], frag: true);
+ static final readSleep = Method(uid: 0x53, arg: [1, 2, 3], frag: true);
+ static final readHeartRates = Method(uid: 0x55, arg: [1, 2, 3], frag: true);
+ static final readBloodOxygens = Method(uid: 0x66, arg: [1, 2, 3], frag: true);
static final writeTime = Method(uid: 0x01, arg: [1, 2, 3, 4, 5, 6]);
static final writeRestore = Method(uid: 0x12, arg: []);
}
@@ -152,7 +152,8 @@ class BlueberryResolves {
}
int parseDate(List data) {
- final parts = BlueberryCommandsUtils.radix16bcd(data);
+ // 200x24-0x06-0x05 0x06:0x39:0x02
+ final parts = BlueberryCommandsUtils.radix16bcd(data, no0x: true);
final ymd = '20${parts[0]}-${parts[1]}-${parts[2]}';
final hms = '${parts[3]}:${parts[4]}:${parts[5]}';
final date = DateTime.parse('$ymd $hms');
diff --git a/lib/features/dapps/presentation/responsive_layout/dapps_layout/build_card.dart b/lib/features/dapps/presentation/responsive_layout/dapps_layout/build_card.dart
index 574fa2ba..fa2d6168 100644
--- a/lib/features/dapps/presentation/responsive_layout/dapps_layout/build_card.dart
+++ b/lib/features/dapps/presentation/responsive_layout/dapps_layout/build_card.dart
@@ -76,6 +76,8 @@ Widget buildCard(
)
: image.contains(
'https',
+ ) || image.contains(
+ 'http',
)
? image.contains(
'svg',
diff --git a/lib/features/dapps/subfeatures/add_dapp/presentation/add_bookmark_presenter.dart b/lib/features/dapps/subfeatures/add_dapp/presentation/add_bookmark_presenter.dart
index 5d68ec3e..cacfeadf 100644
--- a/lib/features/dapps/subfeatures/add_dapp/presentation/add_bookmark_presenter.dart
+++ b/lib/features/dapps/subfeatures/add_dapp/presentation/add_bookmark_presenter.dart
@@ -18,7 +18,7 @@ class AddBookmarkPresenter extends CompletePresenter {
Future onSave() async {
String url = urlController.text;
- url = url.contains('https') ? url : 'https://$url';
+ url = url.contains('https') || url.contains('http') ? url : 'https://$url';
loading = true;
try {
diff --git a/lib/features/dapps/subfeatures/open_dapp/domain/domain.dart b/lib/features/dapps/subfeatures/open_dapp/domain/domain.dart
new file mode 100644
index 00000000..2745a3a3
--- /dev/null
+++ b/lib/features/dapps/subfeatures/open_dapp/domain/domain.dart
@@ -0,0 +1,4 @@
+export 'utils/utils.dart';
+export 'helpers/helpers.dart';
+export 'entities/entities.dart';
+export 'dapps_errors.dart';
diff --git a/lib/features/dapps/subfeatures/open_dapp/domain/helpers/bridge/bridge.dart b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/bridge/bridge.dart
new file mode 100644
index 00000000..c0e0d640
--- /dev/null
+++ b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/bridge/bridge.dart
@@ -0,0 +1,2 @@
+export 'bridge_helper.dart';
+export 'bridge_functions_helper.dart';
diff --git a/lib/features/dapps/subfeatures/open_dapp/domain/helpers/bridge/bridge_functions_helper.dart b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/bridge/bridge_functions_helper.dart
new file mode 100644
index 00000000..d010bf28
--- /dev/null
+++ b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/bridge/bridge_functions_helper.dart
@@ -0,0 +1,167 @@
+import 'dart:typed_data';
+
+import 'package:datadashwallet/common/components/components.dart';
+import 'package:datadashwallet/features/common/common.dart';
+import 'package:datadashwallet/features/portfolio/subfeatures/token/add_token/domain/custom_tokens_use_case.dart';
+import 'package:datadashwallet/features/settings/settings.dart';
+import 'package:flutter/material.dart';
+import 'package:mxc_logic/mxc_logic.dart';
+
+import '../../../open_dapp.dart';
+
+class BridgeFunctionsHelper {
+ BridgeFunctionsHelper({
+ required this.state,
+ required this.context,
+ required this.translate,
+ required this.navigator,
+ required this.customTokensUseCase,
+ required this.tokenContractUseCase,
+ required this.transactionHistoryUseCase,
+ required this.chainConfigurationUseCase,
+ required this.addError,
+ required this.loading,
+ });
+
+ OpenDAppState state;
+ TokenContractUseCase tokenContractUseCase;
+ CustomTokensUseCase customTokensUseCase;
+ TransactionsHistoryUseCase transactionHistoryUseCase;
+ ChainConfigurationUseCase chainConfigurationUseCase;
+ NavigatorState? navigator;
+ BuildContext? context;
+ String? Function(String) translate;
+ void Function(bool v) loading;
+ void Function(dynamic error, [StackTrace? stackTrace]) addError;
+
+ Future estimatedFee(
+ String from,
+ String to,
+ EtherAmount? gasPrice,
+ Uint8List data,
+ BigInt? amountOfGas,
+ ) async {
+ loading(true);
+ try {
+ final gasFee = await tokenContractUseCase.estimateGasFeeForContractCall(
+ from: from,
+ to: to,
+ gasPrice: gasPrice,
+ data: data,
+ amountOfGas: amountOfGas);
+ loading(false);
+
+ return gasFee;
+ } catch (e, s) {
+ addError(e, s);
+ } finally {
+ loading(false);
+ }
+ }
+
+ Future sendTransaction(String to, EtherAmount amount,
+ Uint8List? data, TransactionGasEstimation? estimatedGasFee, String url,
+ {String? from}) async {
+ final res = await tokenContractUseCase.sendTransaction(
+ privateKey: state.account!.privateKey,
+ to: to,
+ from: from,
+ amount: amount,
+ data: data,
+ estimatedGasFee: estimatedGasFee);
+ if (!MXCChains.isMXCChains(state.network!.chainId)) {
+ recordTransaction(res);
+ }
+
+ return res.hash;
+ }
+
+ String? signMessage(
+ String hexData,
+ ) {
+ loading(true);
+ try {
+ final res = tokenContractUseCase.signMessage(
+ privateKey: state.account!.privateKey, message: hexData);
+ return res;
+ } catch (e, s) {
+ addError(e, s);
+ } finally {
+ loading(false);
+ }
+ }
+
+ String? signPersonalMessage(
+ String hexData,
+ ) {
+ loading(true);
+ try {
+ final res = tokenContractUseCase.signPersonalMessage(
+ privateKey: state.account!.privateKey, message: hexData);
+ return res;
+ } catch (e, s) {
+ addError(e, s);
+ } finally {
+ loading(false);
+ }
+ }
+
+ String? signTypedMessage(
+ String hexData,
+ ) {
+ loading(true);
+ try {
+ final res = tokenContractUseCase.signTypedMessage(
+ privateKey: state.account!.privateKey, data: hexData);
+ return res;
+ } catch (e, s) {
+ addError(e, s);
+ } finally {
+ loading(false);
+ }
+ }
+
+ bool addAsset(Token token) {
+ loading(true);
+ try {
+ customTokensUseCase.addItem(token);
+ return true;
+ } catch (error, stackTrace) {
+ addError(error, stackTrace);
+ return false;
+ } finally {
+ loading(false);
+ }
+ }
+
+ void recordTransaction(TransactionModel tx) {
+ final currentNetwork = state.network!;
+ final chainId = currentNetwork.chainId;
+ final token = Token(
+ chainId: currentNetwork.chainId,
+ logoUri: currentNetwork.logo,
+ name: currentNetwork.label ?? currentNetwork.web3RpcHttpUrl,
+ symbol: currentNetwork.symbol,
+ address: null,
+ );
+
+ tx = tx.copyWith(token: token);
+
+ transactionHistoryUseCase.spyOnTransaction(
+ tx,
+ );
+ transactionHistoryUseCase.updateItem(
+ tx,
+ );
+ }
+
+ Network? updateNetwork(Network network, int index) {
+ chainConfigurationUseCase.updateItem(network, index);
+ return network;
+ }
+
+ Network? addNewNetwork(Network newNetwork) {
+ chainConfigurationUseCase.addItem(newNetwork);
+ return newNetwork;
+ }
+}
diff --git a/lib/features/dapps/subfeatures/open_dapp/domain/helpers/bridge/bridge_helper.dart b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/bridge/bridge_helper.dart
new file mode 100644
index 00000000..a9aa07e3
--- /dev/null
+++ b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/bridge/bridge_helper.dart
@@ -0,0 +1,386 @@
+import 'dart:convert';
+
+import 'package:datadashwallet/common/common.dart';
+import 'package:datadashwallet/core/src/providers/providers.dart';
+import 'package:datadashwallet/features/common/common.dart';
+
+import 'package:flutter/material.dart';
+import 'package:mxc_logic/mxc_logic.dart';
+import 'package:web3_provider/web3_provider.dart';
+
+import '../../../../../../settings/subfeatures/chain_configuration/domain/domain.dart';
+import '../../../open_dapp.dart';
+
+class BridgeHelper {
+ BridgeHelper({
+ required this.tokenContractUseCase,
+ required this.chainConfigurationUseCase,
+ required this.authUseCase,
+ required this.errorUseCase,
+ required this.bridgeFunctionsHelper,
+ required this.state,
+ required this.context,
+ required this.translate,
+ required this.addError,
+ required this.loading,
+ required this.notify,
+ required this.addMessage,
+ });
+
+ OpenDAppState state;
+ TokenContractUseCase tokenContractUseCase;
+ ChainConfigurationUseCase chainConfigurationUseCase;
+ AuthUseCase authUseCase;
+ ErrorUseCase errorUseCase;
+ BridgeFunctionsHelper bridgeFunctionsHelper;
+ BuildContext? context;
+ String? Function(String) translate;
+ void Function(bool v) loading;
+ void Function(dynamic error, [StackTrace? stackTrace]) addError;
+ void Function([void Function()? fun]) notify;
+ void Function(dynamic message) addMessage;
+
+ void signTransaction({
+ required BridgeParams bridge,
+ required VoidCallback cancel,
+ required Function(String idHaethClientsh) success,
+ required String url,
+ }) async {
+ final amountEther = EtherAmount.inWei(bridge.value ?? BigInt.zero);
+ final amount = amountEther.getValueInUnit(EtherUnit.ether).toString();
+ final bridgeData = MXCType.hexToUint8List(bridge.data ?? '');
+ EtherAmount? gasPrice;
+ double? gasFee;
+ TransactionGasEstimation? estimatedGasFee;
+ BigInt? amountOfGas;
+
+ if (bridge.gasPrice != null) {
+ gasPrice = EtherAmount.fromBase10String(EtherUnit.wei, bridge.gasPrice!);
+ }
+
+ if (bridge.gas != null) {
+ amountOfGas = BigInt.parse(bridge.gas.toString());
+ gasPrice = gasPrice ?? await tokenContractUseCase.getGasPrice();
+ final gasPriceDouble =
+ gasPrice.getValueInUnit(EtherUnit.ether).toDouble();
+ gasFee = gasPriceDouble * amountOfGas.toDouble();
+
+ estimatedGasFee = TransactionGasEstimation(
+ gasPrice: gasPrice, gas: amountOfGas, gasFee: gasFee);
+ } else {
+ estimatedGasFee = await bridgeFunctionsHelper.estimatedFee(
+ bridge.from!, bridge.to!, gasPrice, bridgeData, amountOfGas);
+
+ if (estimatedGasFee == null) {
+ cancel.call();
+ return;
+ }
+ }
+
+ String finalFee =
+ (estimatedGasFee.gasFee / Config.dappSectionFeeDivision).toString();
+ final maxFeeDouble = estimatedGasFee.gasFee * Config.priority;
+ final maxFeeString =
+ (maxFeeDouble / Config.dappSectionFeeDivision).toString();
+ final maxFee =
+ Validation.isExpoNumber(maxFeeString) ? '0.000' : maxFeeString;
+
+ if (Validation.isExpoNumber(finalFee)) {
+ finalFee = '0.000';
+ }
+
+ final symbol = state.network!.symbol;
+
+ try {
+ final result = await showTransactionDialog(context!,
+ title: translate('confirm_transaction')!,
+ amount: amount,
+ from: bridge.from!,
+ to: bridge.to!,
+ estimatedFee: finalFee,
+ maxFee: maxFee,
+ symbol: symbol);
+
+ if (result != null && result) {
+ loading(true);
+
+ final hash = await bridgeFunctionsHelper.sendTransaction(
+ bridge.to!, amountEther, bridgeData, estimatedGasFee, url,
+ from: bridge.from);
+ if (hash != null) success.call(hash);
+ } else {
+ cancel.call();
+ }
+ } catch (e, s) {
+ cancel.call();
+ callErrorHandler(e, s);
+ } finally {
+ loading(false);
+ }
+ }
+
+ void switchEthereumChain(dynamic id, Map params) async {
+ final rawChainId = params["object"]["chainId"] as String;
+ final chainId = MXCFormatter.hexToDecimal(rawChainId);
+ final networks = chainConfigurationUseCase.networks.value;
+ final foundChainIdIndex =
+ networks.indexWhere((element) => element.chainId == chainId);
+
+ if (foundChainIdIndex != -1) {
+ final foundNetwork = networks[foundChainIdIndex];
+ final res = await showSwitchNetworkDialog(context!,
+ fromNetwork: state.network!.label ?? state.network!.web3RpcHttpUrl,
+ toNetwork: foundNetwork.label ?? foundNetwork.web3RpcHttpUrl,
+ onTap: () {
+ switchDefaultNetwork(id, foundNetwork, rawChainId);
+ });
+ if (!(res ?? false)) {
+ cancelRequest(id);
+ }
+ } else {
+ addError(translate('network_not_found'));
+ final e =
+ DAppErrors.switchEthereumChainErrors.unRecognizedChain(rawChainId);
+ sendProviderError(
+ id, e['code'], MXCFormatter.escapeDoubleQuotes(e['message']));
+ }
+ }
+
+ void addEthereumChain(dynamic id, Map params) async {
+ final networkDetails = AddEthereumChain.fromMap(params["object"]);
+
+ final rawChainId = networkDetails.chainId;
+ final chainId = MXCFormatter.hexToDecimal(rawChainId);
+ final networks = chainConfigurationUseCase.networks.value;
+ final foundChainIdIndex =
+ networks.indexWhere((element) => element.chainId == chainId);
+ // user can add a network again meaning It will override the old network
+ final alreadyExists = foundChainIdIndex != -1;
+ final alreadyEnabled =
+ alreadyExists ? networks[foundChainIdIndex].enabled : false;
+
+ // Add network
+ final newNetwork = Network.fromAddEthereumChain(networkDetails, chainId);
+
+ final res = await showAddNetworkDialog(
+ context!,
+ network: newNetwork,
+ approveFunction: (network) => alreadyExists
+ ? bridgeFunctionsHelper.updateNetwork(network, foundChainIdIndex)
+ : bridgeFunctionsHelper.addNewNetwork(network),
+ );
+
+ if (!(res ?? false)) {
+ cancelRequest(id);
+ } else {
+ if (!alreadyEnabled) {
+ final res = await showSwitchNetworkDialog(context!,
+ fromNetwork: state.network!.label ?? state.network!.web3RpcHttpUrl,
+ toNetwork: newNetwork.label ?? newNetwork.web3RpcHttpUrl,
+ onTap: () {
+ switchDefaultNetwork(id, newNetwork, rawChainId);
+ });
+ if (!(res ?? false)) {
+ cancelRequest(id);
+ }
+ }
+ }
+ }
+
+
+ void signMessage({
+ required Map object,
+ required VoidCallback cancel,
+ required Function(String hash) success,
+ }) async {
+ final hexData = object['data'] as String;
+ String message = MXCType.hexToString(hexData);
+ int chainId = state.network!.chainId;
+ String name = state.network!.symbol;
+
+ try {
+ final result = await showSignMessageDialog(
+ context!,
+ title: translate('signature_request')!,
+ message: message,
+ networkName: '$name ($chainId)',
+ );
+
+ if (result != null && result) {
+ final hash = bridgeFunctionsHelper.signMessage(
+ hexData,
+ );
+ if (hash != null) success.call(hash);
+ } else {
+ cancel.call();
+ }
+ } catch (e, s) {
+ cancel.call();
+ addError(e, s);
+ }
+ }
+
+
+ void signPersonalMessage({
+ required Map object,
+ required VoidCallback cancel,
+ required Function(String hash) success,
+ }) async {
+ final hexData = object['data'] as String;
+ String message = MXCType.hexToString(hexData);
+ int chainId = state.network!.chainId;
+ String name = state.network!.symbol;
+
+ try {
+ final result = await showSignMessageDialog(
+ context!,
+ title: translate('signature_request')!,
+ message: message,
+ networkName: '$name ($chainId)',
+ );
+
+ if (result != null && result) {
+ final hash = bridgeFunctionsHelper.signPersonalMessage(
+ hexData,
+ );
+ if (hash != null) success.call(hash);
+ } else {
+ cancel.call();
+ }
+ } catch (e, s) {
+ cancel.call();
+ addError(e, s);
+ }
+ }
+
+ void signTypedMessage({
+ required Map object,
+ required VoidCallback cancel,
+ required Function(String hash) success,
+ }) async {
+ String hexData = object['raw'] as String;
+ Map data =
+ jsonDecode(object['raw'] as String) as Map;
+ Map domain = data['domain'] as Map;
+ String primaryType = data['primaryType'];
+ int chainId = (domain['chainId']) as int;
+ String name = domain['name'] as String;
+
+ try {
+ final result = await showTypedMessageDialog(context!,
+ title: translate('signature_request')!,
+ message: data['message'] as Map,
+ networkName: '$name ($chainId)',
+ primaryType: primaryType);
+
+ if (result != null && result) {
+ final hash = bridgeFunctionsHelper.signTypedMessage(
+ hexData,
+ );
+ if (hash != null) success.call(hash);
+ } else {
+ cancel.call();
+ }
+ } catch (e, s) {
+ cancel.call();
+ addError(e, s);
+ }
+ }
+
+ void setAddress(dynamic id) {
+ if (state.account != null) {
+ final walletAddress = state.account!.address;
+ state.webviewController?.setAddress(walletAddress, id);
+ }
+ }
+
+ void switchDefaultNetwork(int id, Network toNetwork, String rawChainId) {
+ // "{"id":1692336424091,"name":"switchEthereumChain","object":{"chainId":"0x66eed"},"network":"ethereum"}"
+ chainConfigurationUseCase.switchDefaultNetwork(toNetwork);
+ authUseCase.resetNetwork(toNetwork);
+ loadDataDashProviders(toNetwork);
+ notify(() => state.network = toNetwork);
+
+ setChain(id);
+ }
+
+ void addAsset(int id, Map data,
+ {required VoidCallback cancel,
+ required Function(String status) success}) async {
+ final watchAssetData = WatchAssetModel.fromMap(data);
+ String titleText = translate('add_x')
+ ?.replaceFirst('{0}', translate('token')?.toLowerCase() ?? '--') ??
+ '--';
+
+ try {
+ final result = await showAddAssetDialog(
+ context!,
+ token: watchAssetData,
+ title: titleText,
+ );
+
+ if (result != null && result) {
+ final res = bridgeFunctionsHelper.addAsset(Token(
+ decimals: watchAssetData.decimals,
+ address: watchAssetData.contract,
+ symbol: watchAssetData.symbol,
+ chainId: state.network?.chainId));
+
+ if (res) {
+ success.call(res.toString());
+ addMessage(translate('add_token_success_message'));
+ } else {
+ cancel.call();
+ }
+ } else {
+ cancel.call();
+ }
+ } catch (e, s) {
+ cancel.call();
+ addError(e, s);
+ }
+ }
+
+ void callErrorHandler(dynamic e, StackTrace s) {
+ final isHandled = errorUseCase.handleError(
+ context!,
+ e,
+ addError,
+ translate,
+ );
+ if (!isHandled) {
+ addError(e, s);
+ }
+ }
+
+ void setChain(int? id) {
+ state.webviewController
+ ?.setChain(getProviderConfig(), state.network!.chainId, id);
+ }
+
+ void cancelRequest(int id) {
+ state.webviewController?.cancel(id);
+ }
+
+ void checkCancel(bool? res, Function moveOn, int id) {
+ if (!(res ?? false)) {
+ cancelRequest(id);
+ } else {
+ moveOn();
+ }
+ }
+
+ void sendProviderError(int id, int code, String message) {
+ state.webviewController?.sendProviderError(id, code, message);
+ }
+
+ void sendError(String error, int id) {
+ state.webviewController
+ ?.sendError(MXCFormatter.escapeDoubleQuotes(error), id);
+ }
+
+ String getProviderConfig() {
+ return JSChannelScripts.walletProviderInfoScript(state.network!.chainId,
+ state.network!.web3RpcHttpUrl, state.account!.address);
+ }
+}
diff --git a/lib/features/dapps/subfeatures/open_dapp/domain/helpers/helpers.dart b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/helpers.dart
new file mode 100644
index 00000000..4ad096da
--- /dev/null
+++ b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/helpers.dart
@@ -0,0 +1,2 @@
+export 'js_channels/js_channel.dart';
+export 'bridge/bridge.dart';
diff --git a/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/bluetooth_helper.dart b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/bluetooth_helper.dart
new file mode 100644
index 00000000..30077e87
--- /dev/null
+++ b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/bluetooth_helper.dart
@@ -0,0 +1,302 @@
+import 'dart:async';
+import 'dart:typed_data';
+
+import 'package:collection/collection.dart';
+import 'package:datadashwallet/features/common/common.dart';
+import 'package:datadashwallet/features/settings/subfeatures/dapp_hooks/dapp_hooks.dart';
+import 'package:flutter/material.dart';
+import 'package:mxc_logic/mxc_logic.dart';
+import 'package:flutter_blue_plus/flutter_blue_plus.dart' as blue_plus;
+
+import '../../../open_dapp.dart';
+
+class BluetoothHelper {
+ BluetoothHelper({
+ required this.state,
+ required this.context,
+ required this.translate,
+ required this.collectLog,
+ required this.bluetoothUseCase,
+ required this.navigator,
+ required this.minerHooksHelper,
+ required this.loading,
+ required this.characteristicListenerTimer,
+ required characteristicValueStreamSubscription,
+ });
+
+ OpenDAppState state;
+ BluetoothUseCase bluetoothUseCase;
+ void Function(String line) collectLog;
+ NavigatorState? navigator;
+ MinerHooksHelper minerHooksHelper;
+ BuildContext? context;
+ String? Function(String) translate;
+ void Function(bool v) loading;
+ Timer? characteristicListenerTimer;
+ StreamSubscription>? characteristicValueStreamSubscription;
+
+ Future> handleBluetoothRequestDevice(
+ Map channelData,
+ ) async {
+ // final options = RequestDeviceOptions.fromJson(channelData['data']);
+ final options = RequestDeviceOptions.fromMap(channelData);
+ late BluetoothDevice responseDevice;
+
+ await bluetoothUseCase.turnOnBluetoothAndProceed();
+
+ // Get the options data
+ bluetoothUseCase.startScanning(
+ withServices: options.filters != null
+ ? options.filters!
+ .expand((filter) => filter.services ?? [])
+ .toList()
+ .firstOrNull
+ : [],
+ withRemoteIds:
+ null, // No direct mapping in RequestDeviceOptions, adjust as necessary
+ withNames: options.filters != null
+ ? options.filters!
+ .where((filter) => filter.name != null)
+ .map((filter) => filter.name!)
+ .toList()
+ : [],
+ withKeywords: options.filters != null
+ ? options.filters!
+ .where((filter) => filter.namePrefix != null)
+ .map((filter) => filter.namePrefix!)
+ .toList()
+ : [],
+ withMsd: options.filters != null
+ ? options.filters!
+ .expand((filter) => filter.manufacturerData ?? [])
+ .toList()
+ .firstOrNull
+ : [],
+ withServiceData: options.filters != null
+ ? options.filters!
+ .expand((filter) => filter.serviceData ?? [])
+ .toList()
+ .firstOrNull
+ : [],
+ continuousUpdates: true,
+ continuousDivisor: 2,
+ androidUsesFineLocation: true,
+ );
+
+ final blueberryRing = await getBlueberryRing();
+ bluetoothUseCase.stopScanner();
+ if (blueberryRing == null) {
+ return {};
+ } else {
+ responseDevice = blueberryRing;
+ }
+
+ return responseDevice.toMap();
+ }
+
+ // GATT server
+ Future> handleBluetoothRemoteGATTServerGetPrimaryService(
+ Map data) async {
+ collectLog('handleBluetoothRemoteGATTServerGetPrimaryService : $data');
+ final selectedService = await BluetoothEntitiesUtils.getSelectedService(
+ data['service'], state.selectedScanResult!);
+
+ final device = BluetoothDevice.getBluetoothDeviceFromScanResult(
+ state.selectedScanResult!);
+ final bluetoothRemoteGATTService =
+ BluetoothRemoteGATTService.fromBluetoothService(
+ device, selectedService);
+ return bluetoothRemoteGATTService.toMap();
+ }
+
+ void initJSCharacteristicValueEmitter(
+ blue_plus.BluetoothCharacteristic characteristic,
+ ) async {
+ await characteristic.setNotifyValue(true);
+
+ characteristicValueStreamSubscription =
+ characteristic.lastValueStream.listen((event) async {
+ final uInt8List = Uint8List.fromList(event);
+ collectLog('characteristicValueStreamSubscription:event $event');
+ collectLog(
+ 'characteristicValueStreamSubscription:uInt8List ${uInt8List.toString()}');
+ final script = '''
+ navigator.bluetooth.updateCharacteristicValue('${characteristic.uuid.str}', ${uInt8List.toString()},);
+ ''';
+ await state.webviewController!.evaluateJavascript(source: script);
+ });
+ }
+
+ void removeJSCharacteristicValueEmitter(
+ blue_plus.BluetoothCharacteristic characteristic,
+ ) async {
+ await characteristic.setNotifyValue(false);
+
+ characteristicValueStreamSubscription?.cancel();
+ }
+
+ Future> handleBluetoothRemoteGATTServerConnect(
+ Map data) async {
+ collectLog('handleBluetoothRemoteGATTServerConnect : $data');
+ await bluetoothUseCase.connectionHandler(state.selectedScanResult!.device);
+
+ return BluetoothRemoteGATTServer(
+ device: BluetoothDevice.getBluetoothDeviceFromScanResult(
+ state.selectedScanResult!),
+ connected: true)
+ .toMap();
+ }
+
+ // Service
+ Future>
+ handleBluetoothRemoteGATTServiceGetCharacteristic(
+ Map data) async {
+ collectLog('handleBluetoothRemoteGATTServiceGetCharacteristic : $data');
+ final targetCharacteristicUUID = data['characteristic'];
+
+ final selectedService = await BluetoothEntitiesUtils.getSelectedService(
+ data['this'], state.selectedScanResult!);
+ final targetCharacteristic =
+ BluetoothEntitiesUtils.getSelectedCharacteristic(
+ targetCharacteristicUUID, selectedService);
+
+ final device = BluetoothDevice.getBluetoothDeviceFromScanResult(
+ state.selectedScanResult!);
+ final bluetoothRemoteGATTService =
+ BluetoothRemoteGATTService.fromBluetoothService(
+ device, selectedService);
+ final bluetoothRemoteGATTCharacteristic = BluetoothRemoteGATTCharacteristic(
+ service: bluetoothRemoteGATTService,
+ properties:
+ BluetoothCharacteristicProperties.fromCharacteristicProperties(
+ targetCharacteristic.properties),
+ uuid: targetCharacteristic.uuid.str,
+ value: null);
+ return bluetoothRemoteGATTCharacteristic.toMap();
+ }
+
+ Future>
+ handleBluetoothRemoteGATTCharacteristicStartNotifications(
+ Map data) async {
+ collectLog(
+ 'handleBluetoothRemoteGATTCharacteristicStartNotifications : $data');
+ final selectedService = await BluetoothEntitiesUtils.getSelectedService(
+ data['serviceUUID'], state.selectedScanResult!);
+ final selectedCharacteristic =
+ BluetoothEntitiesUtils.getSelectedCharacteristic(
+ data['this'], selectedService);
+
+ final bluetoothRemoteGATTCharacteristic =
+ BluetoothEntitiesUtils.getBluetoothRemoteGATTCharacteristic(
+ selectedCharacteristic, selectedService, state.selectedScanResult!);
+
+ initJSCharacteristicValueEmitter(selectedCharacteristic);
+
+ return bluetoothRemoteGATTCharacteristic.toMap();
+ }
+
+ Future>
+ handleBluetoothRemoteGATTCharacteristicStopNotifications(
+ Map data) async {
+ collectLog(
+ 'handleBluetoothRemoteGATTCharacteristicStopNotifications : $data');
+ final selectedService = await BluetoothEntitiesUtils.getSelectedService(
+ data['serviceUUID'], state.selectedScanResult!);
+ final selectedCharacteristic =
+ BluetoothEntitiesUtils.getSelectedCharacteristic(
+ data['this'], selectedService);
+
+ final bluetoothRemoteGATTCharacteristic =
+ BluetoothEntitiesUtils.getBluetoothRemoteGATTCharacteristic(
+ selectedCharacteristic, selectedService, state.selectedScanResult!);
+
+ removeJSCharacteristicValueEmitter(selectedCharacteristic);
+
+ return bluetoothRemoteGATTCharacteristic.toMap();
+ }
+
+ Future> handleWrites(Map data,
+ {bool withResponse = true}) async {
+ collectLog('handleWrites : $data');
+ final selectedService = await BluetoothEntitiesUtils.getSelectedService(
+ data['serviceUUID'], state.selectedScanResult!);
+ final selectedCharacteristic =
+ BluetoothEntitiesUtils.getSelectedCharacteristic(
+ data['this'], selectedService);
+ final value = Uint8List.fromList(List.from(
+ (data['value'] as Map).values.toList()));
+
+ collectLog('handleWrites:value $value');
+ if (withResponse) {
+ await selectedCharacteristic.write(value);
+ } else {
+ await selectedCharacteristic.write(value, withoutResponse: true);
+ }
+ return {};
+ }
+
+ Future>
+ handleBluetoothRemoteGATTCharacteristicWriteValue(
+ Map data) async {
+ return handleWrites(data);
+ }
+
+ Future>
+ handleBluetoothRemoteGATTCharacteristicWriteValueWithResponse(
+ Map data) async {
+ return handleWrites(data);
+ }
+
+ Future>
+ handleBluetoothRemoteGATTCharacteristicWriteValueWithoutResponse(
+ Map data) async {
+ return handleWrites(data, withResponse: false);
+ }
+
+ Future handleBluetoothRemoteGATTCharacteristicReadValue(
+ Map data) async {
+ collectLog('handleBluetoothRemoteGATTCharacteristicReadValue : $data');
+ final selectedService = await BluetoothEntitiesUtils.getSelectedService(
+ data['serviceUUID'], state.selectedScanResult!);
+ final selectedCharacteristic =
+ BluetoothEntitiesUtils.getSelectedCharacteristic(
+ data['this'], selectedService);
+ final value = selectedCharacteristic.lastValue;
+
+ final uInt8List = Uint8List.fromList(value);
+
+ collectLog('handleBluetoothRemoteGATTCharacteristicReadValue:value $value');
+ collectLog(
+ 'handleBluetoothRemoteGATTCharacteristicReadValue:uInt8List ${uInt8List.toString()}');
+
+ return uInt8List;
+ }
+
+ Future getBlueberryRing() async {
+ loading(true);
+ return Future.delayed(const Duration(seconds: 3), () async {
+ loading(false);
+ BluetoothDevice? responseDevice;
+ final scanResults = bluetoothUseCase.scanResults.value;
+ if (scanResults.length == 1) {
+ // only one scan results
+ final scanResult = scanResults.first;
+ state.selectedScanResult = scanResult;
+ } else {
+ // We need to let the user to choose If two or more devices of rings are available and even If empty maybe let the user to wait
+ final scanResult = await showBlueberryRingsBottomSheet(
+ context!,
+ );
+ if (scanResult != null) {
+ state.selectedScanResult = scanResult;
+ }
+ }
+ if (state.selectedScanResult != null) {
+ responseDevice = BluetoothDevice.getBluetoothDeviceFromScanResult(
+ state.selectedScanResult!);
+ }
+
+ return responseDevice;
+ });
+ }
+}
diff --git a/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/bluetooth_listeners_helper.dart b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/bluetooth_listeners_helper.dart
new file mode 100644
index 00000000..a0b81953
--- /dev/null
+++ b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/bluetooth_listeners_helper.dart
@@ -0,0 +1,100 @@
+import 'package:datadashwallet/core/core.dart';
+import 'package:datadashwallet/features/settings/subfeatures/dapp_hooks/dapp_hooks.dart';
+import 'package:flutter/material.dart';
+import 'package:mxc_logic/mxc_logic.dart';
+
+import '../../../open_dapp.dart';
+
+class BluetoothListenersHelper {
+ BluetoothListenersHelper({
+ required this.state,
+ required this.context,
+ required this.translate,
+ required this.bluetoothHelper,
+ required this.navigator,
+ required this.minerHooksHelper,
+ required this.jsChannelHandlerHelper,
+ });
+
+ OpenDAppState state;
+ NavigatorState? navigator;
+ MinerHooksHelper minerHooksHelper;
+ BluetoothHelper bluetoothHelper;
+ BuildContext? context;
+ String? Function(String) translate;
+ JsChannelHandlersHelper jsChannelHandlerHelper;
+
+ void injectBluetoothListeners() {
+ // Bluetooth API
+
+ state.webviewController!.addJavaScriptHandler(
+ handlerName: JSChannelEvents.requestDevice,
+ callback: (args) => jsChannelHandlerHelper.jsChannelErrorHandler(
+ args, bluetoothHelper.handleBluetoothRequestDevice));
+
+ // BluetoothRemoteGATTServer
+
+ state.webviewController!.addJavaScriptHandler(
+ handlerName: JSChannelEvents.bluetoothRemoteGATTServerConnect,
+ callback: (args) => jsChannelHandlerHelper.jsChannelErrorHandler(
+ args, bluetoothHelper.handleBluetoothRemoteGATTServerConnect));
+
+ state.webviewController!.addJavaScriptHandler(
+ handlerName: JSChannelEvents.bluetoothRemoteGATTServerGetPrimaryService,
+ callback: (args) => jsChannelHandlerHelper.jsChannelErrorHandler(args,
+ bluetoothHelper.handleBluetoothRemoteGATTServerGetPrimaryService));
+
+ // BluetoothRemoteGATTService
+
+ state.webviewController!.addJavaScriptHandler(
+ handlerName:
+ JSChannelEvents.bluetoothRemoteGATTServiceGetCharacteristic,
+ callback: (args) => jsChannelHandlerHelper.jsChannelErrorHandler(args,
+ bluetoothHelper.handleBluetoothRemoteGATTServiceGetCharacteristic));
+
+ // BluetoothRemoteGATTCharacteristic
+
+ state.webviewController!.addJavaScriptHandler(
+ handlerName:
+ JSChannelEvents.bluetoothRemoteGATTCharacteristicStartNotifications,
+ callback: (args) => jsChannelHandlerHelper.jsChannelErrorHandler(
+ args,
+ bluetoothHelper
+ .handleBluetoothRemoteGATTCharacteristicStartNotifications));
+
+ state.webviewController!.addJavaScriptHandler(
+ handlerName:
+ JSChannelEvents.bluetoothRemoteGATTCharacteristicStopNotifications,
+ callback: (args) => jsChannelHandlerHelper.jsChannelErrorHandler(
+ args,
+ bluetoothHelper
+ .handleBluetoothRemoteGATTCharacteristicStopNotifications));
+
+ state.webviewController!.addJavaScriptHandler(
+ handlerName:
+ JSChannelEvents.bluetoothRemoteGATTCharacteristicWriteValue,
+ callback: (args) => jsChannelHandlerHelper.jsChannelErrorHandler(args,
+ bluetoothHelper.handleBluetoothRemoteGATTCharacteristicWriteValue));
+
+ state.webviewController!.addJavaScriptHandler(
+ handlerName: JSChannelEvents
+ .bluetoothRemoteGATTCharacteristicWriteValueWithResponse,
+ callback: (args) => jsChannelHandlerHelper.jsChannelErrorHandler(
+ args,
+ bluetoothHelper
+ .handleBluetoothRemoteGATTCharacteristicWriteValueWithResponse));
+
+ state.webviewController!.addJavaScriptHandler(
+ handlerName: JSChannelEvents
+ .bluetoothRemoteGATTCharacteristicWriteValueWithoutResponse,
+ callback: (args) => jsChannelHandlerHelper.jsChannelErrorHandler(
+ args,
+ bluetoothHelper
+ .handleBluetoothRemoteGATTCharacteristicWriteValueWithoutResponse));
+
+ state.webviewController!.addJavaScriptHandler(
+ handlerName: JSChannelEvents.bluetoothRemoteGATTCharacteristicReadValue,
+ callback: (args) => jsChannelHandlerHelper.jsChannelErrorHandler(args,
+ bluetoothHelper.handleBluetoothRemoteGATTCharacteristicReadValue));
+ }
+}
diff --git a/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/cron_helper.dart b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/cron_helper.dart
new file mode 100644
index 00000000..a4f9ee78
--- /dev/null
+++ b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/cron_helper.dart
@@ -0,0 +1,137 @@
+import 'package:datadashwallet/core/core.dart';
+import 'package:datadashwallet/features/settings/subfeatures/dapp_hooks/dapp_hooks.dart';
+import 'package:flutter/material.dart';
+import 'package:mxc_logic/mxc_logic.dart';
+
+import '../../../open_dapp.dart';
+
+class CronHelper {
+ CronHelper({
+ required this.state,
+ required this.context,
+ required this.translate,
+ required this.dAppHooksUseCase,
+ required this.navigator,
+ required this.minerHooksHelper,
+ });
+
+ OpenDAppState state;
+ DAppHooksUseCase dAppHooksUseCase;
+ NavigatorState? navigator;
+ MinerHooksHelper minerHooksHelper;
+ BuildContext? context;
+ String? Function(String) translate;
+
+ // Update via functions & get data via steam & send the data via event eaach time
+ // ready => updateSystemInfo (service statues, mining service status, time, selected miners, camera permission location permission)
+
+ Future> handleChangeCronTransition(
+ Map channelData, AXSCronServices axsCronService) async {
+ final axsCronService =
+ AXSCronServicesExtension.getCronServiceFromJson(channelData);
+ if (axsCronService == AXSCronServices.miningAutoClaimCron) {
+ ChangeCronTransitionRequestModel;
+ final changeCronTransitionRequestModel =
+ ChangeCronTransitionRequestModel.fromMap(
+ channelData['cron'], MiningCronServiceDataModel.fromMap);
+
+ // Here i change the data that won't effect the
+ final currentDappHooksData = state.dappHooksData;
+ final newData = changeCronTransitionRequestModel.data;
+
+ if (newData != null) {
+ final minersList = newData.minersList ??
+ currentDappHooksData.minerHooks.selectedMiners;
+ dAppHooksUseCase.updateMinersList(minersList);
+
+ final newTimeOfDay = TimeOfDay.fromDateTime(newData.time!);
+ final currentTimeOfDay =
+ TimeOfDay.fromDateTime(currentDappHooksData.minerHooks.time);
+
+ if (newData.time != null && newTimeOfDay != currentTimeOfDay) {
+ await minerHooksHelper.changeMinerHookTiming(newTimeOfDay);
+ }
+ }
+
+ final miningCronServiceData =
+ MiningCronServiceDataModel.fromDAppHooksData(
+ dAppHooksUseCase.dappHooksData.value);
+
+ final responseData = CronServiceDataModel.fromDAppHooksData(
+ axsCronService,
+ dAppHooksUseCase.dappHooksData.value,
+ miningCronServiceData);
+
+ final response = AXSJSChannelResponseModel(
+ status: AXSJSChannelResponseStatus.success,
+ data: responseData,
+ message: null);
+ return response.toMap(miningCronServiceData.toMapWrapper);
+ } else {
+ throw 'Unknown service';
+ }
+ }
+
+ Future> handleChangeCronTransitionStatusEvent(
+ Map channelData,
+ AXSCronServices axsCronService,
+ ) async {
+ if (axsCronService == AXSCronServices.miningAutoClaimCron) {
+ final status = channelData['cron']['status'];
+
+ await minerHooksHelper.changeMinerHooksEnabled(status);
+ final miningCronServiceData =
+ MiningCronServiceDataModel.fromDAppHooksData(
+ dAppHooksUseCase.dappHooksData.value);
+
+ final responseData = CronServiceDataModel.fromDAppHooksData(
+ axsCronService,
+ dAppHooksUseCase.dappHooksData.value,
+ miningCronServiceData);
+ final response = AXSJSChannelResponseModel(
+ status: AXSJSChannelResponseStatus.success,
+ message: null,
+ data: responseData);
+ return response.toMap(miningCronServiceData.toMapWrapper);
+ } else {
+ throw 'Unknown cron service';
+ }
+ }
+
+ Future> handleGetSystemInfoEvent(
+ Map channelData,
+ AXSCronServices axsCronService,
+ ) async {
+ if (axsCronService == AXSCronServices.miningAutoClaimCron) {
+ final dappHooksData = state.dappHooksData;
+
+ final miningCronServiceData =
+ MiningCronServiceDataModel.fromDAppHooksData(dappHooksData);
+
+ final responseData = CronServiceDataModel.fromDAppHooksData(
+ axsCronService, dappHooksData, miningCronServiceData);
+ final response = AXSJSChannelResponseModel(
+ status: AXSJSChannelResponseStatus.success,
+ message: null,
+ data: responseData,
+ );
+ return response.toMap(miningCronServiceData.toMapWrapper);
+ } else {
+ throw 'Unknown cron service';
+ }
+ }
+
+ Future> handleGoToAdvancedSettingsEvent(
+ Map channelData, AXSCronServices axsCronService) async {
+ goToAdvancedSettings();
+ final response = AXSJSChannelResponseModel(
+ status: AXSJSChannelResponseStatus.success, message: null, data: null);
+ return response.toMap((data) => {});
+ }
+
+ void goToAdvancedSettings() {
+ navigator!.push(route(
+ const DAppHooksPage(),
+ ));
+ }
+}
diff --git a/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/cron_listeners_helper.dart b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/cron_listeners_helper.dart
new file mode 100644
index 00000000..6281e32e
--- /dev/null
+++ b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/cron_listeners_helper.dart
@@ -0,0 +1,40 @@
+import 'package:flutter/material.dart';
+import 'package:mxc_logic/mxc_logic.dart';
+
+import '../../../open_dapp.dart';
+
+class CronListenersHelper {
+ CronListenersHelper(
+ {required this.state,
+ required this.context,
+ required this.jsChannelHandlerHelper,
+ required this.cronHelper});
+
+ OpenDAppState state;
+ BuildContext? context;
+ JsChannelHandlersHelper jsChannelHandlerHelper;
+ CronHelper cronHelper;
+
+ // call this on webview created
+ void injectMinerDappListeners() async {
+ state.webviewController!.addJavaScriptHandler(
+ handlerName: JSChannelEvents.changeCronTransitionEvent,
+ callback: (args) => jsChannelHandlerHelper.jsChannelCronErrorHandler(
+ args, cronHelper.handleChangeCronTransition));
+
+ state.webviewController!.addJavaScriptHandler(
+ handlerName: JSChannelEvents.changeCronTransitionStatusEvent,
+ callback: (args) => jsChannelHandlerHelper.jsChannelCronErrorHandler(
+ args, cronHelper.handleChangeCronTransitionStatusEvent));
+
+ state.webviewController!.addJavaScriptHandler(
+ handlerName: JSChannelEvents.getSystemInfoEvent,
+ callback: (args) => jsChannelHandlerHelper.jsChannelCronErrorHandler(
+ args, cronHelper.handleGetSystemInfoEvent));
+
+ state.webviewController!.addJavaScriptHandler(
+ handlerName: JSChannelEvents.goToAdvancedSettingsEvent,
+ callback: (args) => jsChannelHandlerHelper.jsChannelCronErrorHandler(
+ args, cronHelper.handleGoToAdvancedSettingsEvent));
+ }
+}
diff --git a/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/js_channel.dart b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/js_channel.dart
new file mode 100644
index 00000000..4a94f697
--- /dev/null
+++ b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/js_channel.dart
@@ -0,0 +1,5 @@
+export 'cron_helper.dart';
+export 'bluetooth_helper.dart';
+export 'js_channel_handlers_helper.dart';
+export 'cron_listeners_helper.dart';
+export 'bluetooth_listeners_helper.dart';
diff --git a/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/js_channel_handlers_helper.dart b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/js_channel_handlers_helper.dart
new file mode 100644
index 00000000..493b3975
--- /dev/null
+++ b/lib/features/dapps/subfeatures/open_dapp/domain/helpers/js_channels/js_channel_handlers_helper.dart
@@ -0,0 +1,82 @@
+import 'dart:convert';
+
+import 'package:datadashwallet/features/common/packages/bluetooth/bluetooth.dart';
+import 'package:flutter/material.dart';
+import 'package:mxc_logic/mxc_logic.dart';
+
+import '../../../open_dapp.dart';
+
+class JsChannelHandlersHelper {
+ JsChannelHandlersHelper({
+ required this.state,
+ required this.context,
+ required this.translate,
+ required this.addError,
+ });
+
+ OpenDAppState state;
+ BuildContext? context;
+ String? Function(String) translate;
+ void Function(dynamic error, [StackTrace? stackTrace]) addError;
+
+
+
+ Future> jsChannelCronErrorHandler(
+ List args,
+ Future> Function(
+ Map,
+ AXSCronServices,
+ )
+ callback,
+ ) async {
+ try {
+ Map channelDataMap;
+
+ final channelData = args[0];
+ channelDataMap = channelData as Map;
+
+ final axsCronService =
+ AXSCronServicesExtension.getCronServiceFromJson(channelDataMap);
+ final callbackRes = await callback(channelDataMap, axsCronService);
+ return callbackRes;
+ } catch (e) {
+ final response = AXSJSChannelResponseModel(
+ status: AXSJSChannelResponseStatus.failed,
+ data: null,
+ message: e.toString());
+ return response.toMap((data) => {'message': e.toString()});
+ }
+ }
+
+ Future jsChannelErrorHandler(
+ List args,
+ Future Function(
+ Map,
+ )
+ callback,
+ ) async {
+ try {
+ Map channelDataMap;
+
+ final channelData = args[0];
+ channelDataMap = channelData == null
+ ? {}
+ : channelData is String
+ ? json.decode(channelData) as Map
+ : channelData as Map;
+
+ final callbackRes = await callback(channelDataMap);
+ return callbackRes;
+ } catch (e) {
+ if (e is BluetoothTimeoutError) {
+ addError(translate('unable_to_continue_bluetooth_is_turned_off')!);
+ }
+
+ final response = AXSJSChannelResponseModel(
+ status: AXSJSChannelResponseStatus.failed,
+ data: null,
+ message: e.toString());
+ return response.toMap((data) => {'message': e});
+ }
+ }
+}
diff --git a/lib/features/dapps/subfeatures/open_dapp/domain/utils/bluetooth_entities_utils.dart b/lib/features/dapps/subfeatures/open_dapp/domain/utils/bluetooth_entities_utils.dart
new file mode 100644
index 00000000..e4782644
--- /dev/null
+++ b/lib/features/dapps/subfeatures/open_dapp/domain/utils/bluetooth_entities_utils.dart
@@ -0,0 +1,42 @@
+import 'package:datadashwallet/features/common/packages/bluetooth/blue_plus/blue_plus.dart';
+
+import '../../open_dapp.dart';
+import 'package:flutter_blue_plus/flutter_blue_plus.dart' as blue_plus;
+
+class BluetoothEntitiesUtils {
+ static BluetoothRemoteGATTCharacteristic getBluetoothRemoteGATTCharacteristic(
+ blue_plus.BluetoothCharacteristic selectedCharacteristic,
+ blue_plus.BluetoothService selectedService,
+ blue_plus.ScanResult selectedScanResult) {
+ final device =
+ BluetoothDevice.getBluetoothDeviceFromScanResult(selectedScanResult);
+ final bluetoothRemoteGATTService =
+ BluetoothRemoteGATTService.fromBluetoothService(
+ device, selectedService);
+ final bluetoothRemoteGATTCharacteristic = BluetoothRemoteGATTCharacteristic(
+ service: bluetoothRemoteGATTService,
+ properties:
+ BluetoothCharacteristicProperties.fromCharacteristicProperties(
+ selectedCharacteristic.properties),
+ uuid: selectedCharacteristic.uuid.str,
+ value: null);
+ return bluetoothRemoteGATTCharacteristic;
+ }
+
+ static blue_plus.BluetoothCharacteristic getSelectedCharacteristic(
+ String uuid, blue_plus.BluetoothService selectedService) {
+ final characteristicUUID = GuidHelper.parse(uuid);
+ final selectedCharacteristic =
+ BluePlusBluetoothUtils.getCharacteristicWithService(
+ selectedService, characteristicUUID);
+ return selectedCharacteristic;
+ }
+
+ static Future getSelectedService(
+ String uuid, blue_plus.ScanResult selectedScanResult) async {
+ final serviceUUID = GuidHelper.parse(uuid);
+ final selectedService = await BluePlusBluetoothUtils.getPrimaryService(
+ selectedScanResult, serviceUUID);
+ return selectedService;
+ }
+}
diff --git a/lib/features/dapps/subfeatures/open_dapp/domain/utils/js_channel_utils.dart b/lib/features/dapps/subfeatures/open_dapp/domain/utils/js_channel_utils.dart
new file mode 100644
index 00000000..45746ffa
--- /dev/null
+++ b/lib/features/dapps/subfeatures/open_dapp/domain/utils/js_channel_utils.dart
@@ -0,0 +1,29 @@
+import 'package:mxc_logic/mxc_logic.dart';
+
+import '../../open_dapp.dart';
+
+class JSChannelUtils {
+
+
+ static void injectAXSWalletJSChannel(OpenDAppState state) async {
+ // Making It easy for accessing axs wallet
+ // use this way window.axs.callHandler
+ await state.webviewController!.evaluateJavascript(
+ source: JSChannelScripts.axsWalletObjectInjectScript(
+ JSChannelConfig.axsWalletJSObjectName));
+
+ await state.webviewController!.injectJavascriptFileFromAsset(
+ assetFilePath: 'assets/js/bluetooth/bluetooth.js');
+
+ // There is a gap for detecting the axs object in webview, It's intermittent after adding function structure to the scripts
+ Future.delayed(
+ const Duration(milliseconds: 500),
+ () async {
+ await state.webviewController!.evaluateJavascript(
+ source: JSChannelScripts.axsWalletReadyInjectScript(
+ JSChannelEvents.axsReadyEvent,
+ ));
+ },
+ );
+ }
+}
diff --git a/lib/features/dapps/subfeatures/open_dapp/domain/utils/panel_utils.dart b/lib/features/dapps/subfeatures/open_dapp/domain/utils/panel_utils.dart
new file mode 100644
index 00000000..941c409b
--- /dev/null
+++ b/lib/features/dapps/subfeatures/open_dapp/domain/utils/panel_utils.dart
@@ -0,0 +1,44 @@
+import 'dart:async';
+
+import 'package:flutter/material.dart';
+
+import '../../open_dapp.dart';
+
+const double maxPanelHeight = 100.0;
+
+const settleDuration = Duration(milliseconds: 400);
+const cancelDuration = Duration(milliseconds: 400);
+
+class PanelUtils {
+ static void showPanel(OpenDAppState state, Timer? panelTimer) async {
+ final status = state.animationController!.status;
+ if (state.animationController!.value != 1 &&
+ status == AnimationStatus.completed ||
+ status == AnimationStatus.dismissed) {
+ await state.animationController!.animateTo(
+ 1.0,
+ duration: settleDuration,
+ curve: Curves.ease,
+ );
+ panelTimer = Timer(
+ const Duration(seconds: 3),
+ () => hidePanel(state, panelTimer),
+ );
+ }
+ }
+
+ static void hidePanel(OpenDAppState state, Timer? panelTimer) async {
+ final status = state.animationController!.status;
+ if (state.animationController!.value != 0 &&
+ status == AnimationStatus.completed) {
+ await state.animationController!.animateTo(
+ 0.0,
+ duration: cancelDuration,
+ curve: Curves.easeInExpo,
+ );
+ if (panelTimer != null) {
+ panelTimer.cancel();
+ }
+ }
+ }
+}
diff --git a/lib/features/dapps/subfeatures/open_dapp/domain/utils/utils.dart b/lib/features/dapps/subfeatures/open_dapp/domain/utils/utils.dart
index e69de29b..6426d551 100644
--- a/lib/features/dapps/subfeatures/open_dapp/domain/utils/utils.dart
+++ b/lib/features/dapps/subfeatures/open_dapp/domain/utils/utils.dart
@@ -0,0 +1,3 @@
+export 'bluetooth_entities_utils.dart';
+export 'js_channel_utils.dart';
+export 'panel_utils.dart';
diff --git a/lib/features/dapps/subfeatures/open_dapp/open_dapp.dart b/lib/features/dapps/subfeatures/open_dapp/open_dapp.dart
new file mode 100644
index 00000000..3f539d7a
--- /dev/null
+++ b/lib/features/dapps/subfeatures/open_dapp/open_dapp.dart
@@ -0,0 +1,5 @@
+export 'open_dapp_state.dart';
+export 'open_dapp_presenter.dart';
+export 'open_dapp_page.dart';
+export 'widgets/widgets.dart';
+export 'domain/domain.dart';
diff --git a/lib/features/dapps/subfeatures/open_dapp/open_dapp_page.dart b/lib/features/dapps/subfeatures/open_dapp/open_dapp_page.dart
index e6ea06ca..a73f60fa 100644
--- a/lib/features/dapps/subfeatures/open_dapp/open_dapp_page.dart
+++ b/lib/features/dapps/subfeatures/open_dapp/open_dapp_page.dart
@@ -100,8 +100,7 @@ class OpenAppPage extends HookConsumerWidget {
presenter.changeProgress(progress);
presenter.setChain(null);
},
- onUpdateVisitedHistory:
- (controller, url, androidIsReload) {
+ onUpdateVisitedHistory: (controller, url, androidIsReload) {
presenter.updateCurrentUrl(url);
},
shouldOverrideUrlLoading: presenter.checkDeepLink,
@@ -125,8 +124,28 @@ class OpenAppPage extends HookConsumerWidget {
url: url);
break;
case EIP1193.signMessage:
+ Map object = params["object"];
+ presenter.signMessage(
+ object: object,
+ cancel: () {
+ controller?.cancel(id);
+ },
+ success: (idHash) {
+ controller?.sendResult(idHash, id);
+ },
+ );
break;
case EIP1193.signPersonalMessage:
+ Map object = params["object"];
+ presenter.signPersonalMessage(
+ object: object,
+ cancel: () {
+ controller?.cancel(id);
+ },
+ success: (idHash) {
+ controller?.sendResult(idHash, id);
+ },
+ );
break;
case EIP1193.signTypedMessage:
Map object = params["object"];
diff --git a/lib/features/dapps/subfeatures/open_dapp/open_dapp_presenter.dart b/lib/features/dapps/subfeatures/open_dapp/open_dapp_presenter.dart
index 28418532..fb12a4fe 100644
--- a/lib/features/dapps/subfeatures/open_dapp/open_dapp_presenter.dart
+++ b/lib/features/dapps/subfeatures/open_dapp/open_dapp_presenter.dart
@@ -1,26 +1,18 @@
import 'dart:async';
import 'dart:convert';
-import 'dart:developer';
+import 'package:flutter/services.dart';
+
import 'package:clipboard/clipboard.dart';
-import 'package:collection/collection.dart';
+
import 'package:datadashwallet/app/logger.dart';
import 'package:datadashwallet/common/common.dart';
import 'package:datadashwallet/core/core.dart';
-import 'package:datadashwallet/features/common/common.dart';
-import 'package:datadashwallet/features/dapps/subfeatures/open_dapp/domain/dapps_errors.dart';
-
-import 'package:datadashwallet/features/dapps/subfeatures/open_dapp/widgets/widgets.dart';
-import 'package:datadashwallet/features/settings/subfeatures/dapp_hooks/dapp_hooks_page.dart';
import 'package:datadashwallet/features/settings/subfeatures/dapp_hooks/utils/utils.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:flutter_blue_plus/flutter_blue_plus.dart' as blue_plus;
+
import 'package:mxc_logic/mxc_logic.dart';
import 'package:web3_provider/web3_provider.dart';
-import 'package:eth_sig_util/util/utils.dart';
-import './domain/entities/entities.dart';
-import 'open_dapp_state.dart';
+import 'open_dapp.dart';
final openDAppPageContainer =
PresenterContainer(
@@ -44,6 +36,9 @@ class OpenDAppPresenter extends CompletePresenter {
ref.read(backgroundFetchConfigUseCaseProvider);
late final _bluetoothUseCase = ref.read(bluetoothUseCaseProvider);
+ Timer? characteristicListenerTimer;
+ StreamSubscription>? characteristicValueStreamSubscription;
+
MinerHooksHelper get minerHooksHelper => MinerHooksHelper(
translate: translate,
context: context,
@@ -52,6 +47,83 @@ class OpenDAppPresenter extends CompletePresenter {
backgroundFetchConfigUseCase: _backgroundFetchConfigUseCase,
);
+ JsChannelHandlersHelper get jsChannelHandlersHelper =>
+ JsChannelHandlersHelper(
+ translate: translate,
+ context: context,
+ state: state,
+ addError: addError,
+ );
+
+ CronHelper get cronHelper => CronHelper(
+ translate: translate,
+ context: context,
+ dAppHooksUseCase: _dAppHooksUseCase,
+ minerHooksHelper: minerHooksHelper,
+ navigator: navigator,
+ state: state,
+ );
+
+ BluetoothHelper get bluetoothHelper => BluetoothHelper(
+ translate: translate,
+ context: context,
+ collectLog: collectLog,
+ minerHooksHelper: minerHooksHelper,
+ navigator: navigator,
+ state: state,
+ loading: (bool value) => loading = value,
+ bluetoothUseCase: _bluetoothUseCase,
+ characteristicListenerTimer: characteristicListenerTimer,
+ characteristicValueStreamSubscription:
+ characteristicValueStreamSubscription,
+ );
+
+ CronListenersHelper get cronListenersHelper => CronListenersHelper(
+ context: context,
+ state: state,
+ cronHelper: cronHelper,
+ jsChannelHandlerHelper: jsChannelHandlersHelper,
+ );
+
+ BluetoothListenersHelper get bluetoothListenersHelper =>
+ BluetoothListenersHelper(
+ translate: translate,
+ context: context,
+ bluetoothHelper: bluetoothHelper,
+ minerHooksHelper: minerHooksHelper,
+ jsChannelHandlerHelper: jsChannelHandlersHelper,
+ navigator: navigator,
+ state: state,
+ );
+
+ BridgeFunctionsHelper get bridgeFunctionsHelper => BridgeFunctionsHelper(
+ translate: translate,
+ context: context,
+ state: state,
+ addError: addError,
+ chainConfigurationUseCase: _chainConfigurationUseCase,
+ tokenContractUseCase: _tokenContractUseCase,
+ transactionHistoryUseCase: _transactionHistoryUseCase,
+ customTokensUseCase: _customTokensUseCase,
+ loading: (bool value) => loading = value,
+ navigator: navigator,
+ );
+
+ BridgeHelper get bridgeHelper => BridgeHelper(
+ translate: translate,
+ context: context,
+ state: state,
+ addError: addError,
+ addMessage: addMessage,
+ authUseCase: _authUseCase,
+ chainConfigurationUseCase: _chainConfigurationUseCase,
+ errorUseCase: _errorUseCase,
+ tokenContractUseCase: _tokenContractUseCase,
+ bridgeFunctionsHelper: bridgeFunctionsHelper,
+ loading: (bool value) => loading = value,
+ notify: notify,
+ );
+
@override
void initState() {
super.initState();
@@ -84,15 +156,21 @@ class OpenDAppPresenter extends CompletePresenter {
@override
Future dispose() {
- characteriticListnerTimer?.cancel();
+ cancelCharacteristicListenerTimer();
+ closeBlueberryConnection();
return super.dispose();
}
+ // Disconnects from Blueberry If there a selected device.
+ void closeBlueberryConnection() {
+ state.selectedScanResult?.device.disconnect();
+ }
+
void onWebViewCreated(InAppWebViewController controller) async {
notify(() => state.webviewController = controller);
updateCurrentUrl(null);
- injectMinerDappListeners();
- injectBluetoothListeners();
+ cronListenersHelper.injectMinerDappListeners();
+ bluetoothListenersHelper.injectBluetoothListeners();
}
void updateCurrentUrl(Uri? value) async {
@@ -117,356 +195,8 @@ class OpenDAppPresenter extends CompletePresenter {
);
}
- Future _estimatedFee(
- String from,
- String to,
- EtherAmount? gasPrice,
- Uint8List data,
- BigInt? amountOfGas,
- ) async {
- loading = true;
- try {
- final gasFee = await _tokenContractUseCase.estimateGasFeeForContractCall(
- from: from,
- to: to,
- gasPrice: gasPrice,
- data: data,
- amountOfGas: amountOfGas);
- loading = false;
-
- return gasFee;
- } catch (e, s) {
- addError(e, s);
- } finally {
- loading = false;
- }
- }
-
- Future _sendTransaction(String to, EtherAmount amount,
- Uint8List? data, TransactionGasEstimation? estimatedGasFee, String url,
- {String? from}) async {
- final res = await _tokenContractUseCase.sendTransaction(
- privateKey: state.account!.privateKey,
- to: to,
- from: from,
- amount: amount,
- data: data,
- estimatedGasFee: estimatedGasFee);
- if (!MXCChains.isMXCChains(state.network!.chainId)) {
- recordTransaction(res);
- }
-
- return res.hash;
- }
-
- String? _signTypedMessage(
- String hexData,
- ) {
- loading = true;
- try {
- final res = _tokenContractUseCase.signTypedMessage(
- privateKey: state.account!.privateKey, data: hexData);
- return res;
- } catch (e, s) {
- addError(e, s);
- } finally {
- loading = false;
- }
- }
-
- bool _addAsset(Token token) {
- loading = true;
- try {
- _customTokensUseCase.addItem(token);
- return true;
- } catch (error, stackTrace) {
- addError(error, stackTrace);
- return false;
- } finally {
- loading = false;
- }
- }
-
- void recordTransaction(TransactionModel tx) {
- final currentNetwork = state.network!;
- final chainId = currentNetwork.chainId;
- final token = Token(
- chainId: currentNetwork.chainId,
- logoUri: currentNetwork.logo,
- name: currentNetwork.label ?? currentNetwork.web3RpcHttpUrl,
- symbol: currentNetwork.symbol,
- address: null,
- );
-
- tx = tx.copyWith(token: token);
-
- _transactionHistoryUseCase.spyOnTransaction(
- tx,
- );
- _transactionHistoryUseCase.updateItem(
- tx,
- );
- }
-
- void signTransaction({
- required BridgeParams bridge,
- required VoidCallback cancel,
- required Function(String idHaethClientsh) success,
- required String url,
- }) async {
- final amountEther = EtherAmount.inWei(bridge.value ?? BigInt.zero);
- final amount = amountEther.getValueInUnit(EtherUnit.ether).toString();
- final bridgeData = hexToBytes(bridge.data ?? '');
- EtherAmount? gasPrice;
- double? gasFee;
- TransactionGasEstimation? estimatedGasFee;
- BigInt? amountOfGas;
-
- if (bridge.gasPrice != null) {
- gasPrice = EtherAmount.fromBase10String(EtherUnit.wei, bridge.gasPrice!);
- }
-
- if (bridge.gas != null) {
- amountOfGas = BigInt.parse(bridge.gas.toString());
- gasPrice = gasPrice ?? await _tokenContractUseCase.getGasPrice();
- final gasPriceDouble =
- gasPrice.getValueInUnit(EtherUnit.ether).toDouble();
- gasFee = gasPriceDouble * amountOfGas.toDouble();
-
- estimatedGasFee = TransactionGasEstimation(
- gasPrice: gasPrice, gas: amountOfGas, gasFee: gasFee);
- } else {
- estimatedGasFee = await _estimatedFee(
- bridge.from!, bridge.to!, gasPrice, bridgeData, amountOfGas);
-
- if (estimatedGasFee == null) {
- cancel.call();
- return;
- }
- }
-
- String finalFee =
- (estimatedGasFee.gasFee / Config.dappSectionFeeDivision).toString();
- final maxFeeDouble = estimatedGasFee.gasFee * Config.priority;
- final maxFeeString =
- (maxFeeDouble / Config.dappSectionFeeDivision).toString();
- final maxFee =
- Validation.isExpoNumber(maxFeeString) ? '0.000' : maxFeeString;
-
- if (Validation.isExpoNumber(finalFee)) {
- finalFee = '0.000';
- }
-
- final symbol = state.network!.symbol;
-
- try {
- final result = await showTransactionDialog(context!,
- title: translate('confirm_transaction')!,
- amount: amount,
- from: bridge.from!,
- to: bridge.to!,
- estimatedFee: finalFee,
- maxFee: maxFee,
- symbol: symbol);
-
- if (result != null && result) {
- loading = true;
-
- final hash = await _sendTransaction(
- bridge.to!, amountEther, bridgeData, estimatedGasFee, url,
- from: bridge.from);
- if (hash != null) success.call(hash);
- } else {
- cancel.call();
- }
- } catch (e, s) {
- cancel.call();
- callErrorHandler(e, s);
- } finally {
- loading = false;
- }
- }
-
- void callErrorHandler(dynamic e, StackTrace s) {
- final isHandled = _errorUseCase.handleError(
- context!,
- e,
- addError,
- translate,
- );
- if (!isHandled) {
- addError(e, s);
- }
- }
-
- void switchEthereumChain(dynamic id, Map params) async {
- final rawChainId = params["object"]["chainId"] as String;
- final chainId = MXCFormatter.hexToDecimal(rawChainId);
- final networks = _chainConfigurationUseCase.networks.value;
- final foundChainIdIndex =
- networks.indexWhere((element) => element.chainId == chainId);
-
- if (foundChainIdIndex != -1) {
- final foundNetwork = networks[foundChainIdIndex];
- final res = await showSwitchNetworkDialog(context!,
- fromNetwork: state.network!.label ?? state.network!.web3RpcHttpUrl,
- toNetwork: foundNetwork.label ?? foundNetwork.web3RpcHttpUrl,
- onTap: () {
- switchDefaultNetwork(id, foundNetwork, rawChainId);
- });
- if (!(res ?? false)) {
- cancelRequest(id);
- }
- } else {
- addError(translate('network_not_found'));
- final e =
- DAppErrors.switchEthereumChainErrors.unRecognizedChain(rawChainId);
- sendProviderError(
- id, e['code'], MXCFormatter.escapeDoubleQuotes(e['message']));
- }
- }
-
- void checkCancel(bool? res, Function moveOn, int id) {
- if (!(res ?? false)) {
- cancelRequest(id);
- } else {
- moveOn();
- }
- }
-
- void sendProviderError(int id, int code, String message) {
- state.webviewController?.sendProviderError(id, code, message);
- }
-
- void sendError(String error, int id) {
- state.webviewController
- ?.sendError(MXCFormatter.escapeDoubleQuotes(error), id);
- }
-
- void cancelRequest(int id) {
- state.webviewController?.cancel(id);
- }
-
- void unSupportedRequest() {
- addError(translate('network_not_found'));
- }
-
- void addEthereumChain(dynamic id, Map params) async {
- final networkDetails = AddEthereumChain.fromMap(params["object"]);
-
- final rawChainId = networkDetails.chainId;
- final chainId = MXCFormatter.hexToDecimal(rawChainId);
- final networks = _chainConfigurationUseCase.networks.value;
- final foundChainIdIndex =
- networks.indexWhere((element) => element.chainId == chainId);
- // user can add a network again meaning It will override the old network
- final alreadyExists = foundChainIdIndex != -1;
- final alreadyEnabled =
- alreadyExists ? networks[foundChainIdIndex].enabled : false;
-
- // Add network
- final newNetwork = Network.fromAddEthereumChain(networkDetails, chainId);
-
- final res = await showAddNetworkDialog(
- context!,
- network: newNetwork,
- approveFunction: (network) => alreadyExists
- ? updateNetwork(network, foundChainIdIndex)
- : addNewNetwork(network),
- );
-
- if (!(res ?? false)) {
- cancelRequest(id);
- } else {
- if (!alreadyEnabled) {
- final res = await showSwitchNetworkDialog(context!,
- fromNetwork: state.network!.label ?? state.network!.web3RpcHttpUrl,
- toNetwork: newNetwork.label ?? newNetwork.web3RpcHttpUrl,
- onTap: () {
- switchDefaultNetwork(id, newNetwork, rawChainId);
- });
- if (!(res ?? false)) {
- cancelRequest(id);
- }
- }
- }
- }
-
- Network? updateNetwork(Network network, int index) {
- _chainConfigurationUseCase.updateItem(network, index);
- return network;
- }
-
- Network? addNewNetwork(Network newNetwork) {
- _chainConfigurationUseCase.addItem(newNetwork);
- return newNetwork;
- }
-
- void signPersonalMessage() {}
-
- void signTypedMessage({
- required Map object,
- required VoidCallback cancel,
- required Function(String hash) success,
- }) async {
- String hexData = object['raw'] as String;
- Map data =
- jsonDecode(object['raw'] as String) as Map;
- Map domain = data['domain'] as Map;
- String primaryType = data['primaryType'];
- int chainId = (domain['chainId']) as int;
- String name = domain['name'] as String;
-
- try {
- final result = await showTypedMessageDialog(context!,
- title: translate('signature_request')!,
- message: data['message'] as Map,
- networkName: '$name ($chainId)',
- primaryType: primaryType);
-
- if (result != null && result) {
- final hash = _signTypedMessage(
- hexData,
- );
- if (hash != null) success.call(hash);
- } else {
- cancel.call();
- }
- } catch (e, s) {
- cancel.call();
- addError(e, s);
- }
- }
-
void changeProgress(int progress) => notify(() => state.progress = progress);
- void setAddress(dynamic id) {
- if (state.account != null) {
- final walletAddress = state.account!.address;
- state.webviewController?.setAddress(walletAddress, id);
- }
- }
-
- void switchDefaultNetwork(int id, Network toNetwork, String rawChainId) {
- // "{"id":1692336424091,"name":"switchEthereumChain","object":{"chainId":"0x66eed"},"network":"ethereum"}"
- _chainConfigurationUseCase.switchDefaultNetwork(toNetwork);
- _authUseCase.resetNetwork(toNetwork);
- loadDataDashProviders(toNetwork);
- notify(() => state.network = toNetwork);
-
- setChain(id);
- }
-
- void setChain(int? id) {
- state.webviewController
- ?.setChain(getProviderConfig(), state.network!.chainId, id);
- }
-
- String getProviderConfig() {
- return JSChannelScripts.walletProviderInfoScript(state.network!.chainId,
- state.network!.web3RpcHttpUrl, state.account!.address);
- }
-
void copy(List params) {
Clipboard.setData(ClipboardData(text: params[0]));
}
@@ -490,43 +220,6 @@ class OpenDAppPresenter extends CompletePresenter {
return Validation.isAddress(address);
}
- void addAsset(int id, Map data,
- {required VoidCallback cancel,
- required Function(String status) success}) async {
- final watchAssetData = WatchAssetModel.fromMap(data);
- String titleText = translate('add_x')
- ?.replaceFirst('{0}', translate('token')?.toLowerCase() ?? '--') ??
- '--';
-
- try {
- final result = await showAddAssetDialog(
- context!,
- token: watchAssetData,
- title: titleText,
- );
-
- if (result != null && result) {
- final res = _addAsset(Token(
- decimals: watchAssetData.decimals,
- address: watchAssetData.contract,
- symbol: watchAssetData.symbol,
- chainId: state.network?.chainId));
-
- if (res) {
- success.call(res.toString());
- addMessage(translate('add_token_success_message'));
- } else {
- cancel.call();
- }
- } else {
- cancel.call();
- }
- } catch (e, s) {
- cancel.call();
- addError(e, s);
- }
- }
-
void launchAddress(String address) {
_launcherUseCase.viewAddress(address);
}
@@ -547,11 +240,6 @@ class OpenDAppPresenter extends CompletePresenter {
return NavigationActionPolicy.ALLOW;
}
- final double maxPanelHeight = 100.0;
-
- final cancelDuration = const Duration(milliseconds: 400);
- final settleDuration = const Duration(milliseconds: 400);
-
injectScrollDetector() {
state.webviewController!
.evaluateJavascript(source: JSChannelScripts.overScrollScript);
@@ -568,34 +256,90 @@ class OpenDAppPresenter extends CompletePresenter {
Timer? panelTimer;
- void showPanel() async {
- final status = state.animationController!.status;
- if (state.animationController!.value != 1 &&
- status == AnimationStatus.completed ||
- status == AnimationStatus.dismissed) {
- await state.animationController!.animateTo(
- 1.0,
- duration: settleDuration,
- curve: Curves.ease,
+ void showPanel() => PanelUtils.showPanel(state, panelTimer);
+
+ void hidePanel() => PanelUtils.hidePanel(state, panelTimer);
+
+ void signTransaction({
+ required BridgeParams bridge,
+ required VoidCallback cancel,
+ required Function(String idHaethClientsh) success,
+ required String url,
+ }) async =>
+ bridgeHelper.signTransaction(
+ bridge: bridge,
+ cancel: cancel,
+ success: success,
+ url: url,
);
- panelTimer = Timer(const Duration(seconds: 3), hidePanel);
- }
- }
- void hidePanel() async {
- final status = state.animationController!.status;
- if (state.animationController!.value != 0 &&
- status == AnimationStatus.completed) {
- await state.animationController!.animateTo(
- 0.0,
- duration: cancelDuration,
- curve: Curves.easeInExpo,
+ void switchEthereumChain(dynamic id, Map params) async =>
+ bridgeHelper.switchEthereumChain(
+ id,
+ params,
+ );
+
+ void addEthereumChain(dynamic id, Map params) async =>
+ bridgeHelper.addEthereumChain(
+ id,
+ params,
+ );
+
+ void signMessage({
+ required Map object,
+ required VoidCallback cancel,
+ required Function(String hash) success,
+ }) async =>
+ bridgeHelper.signMessage(
+ object: object,
+ cancel: cancel,
+ success: success,
+ );
+
+ void signPersonalMessage({
+ required Map object,
+ required VoidCallback cancel,
+ required Function(String hash) success,
+ }) async =>
+ bridgeHelper.signPersonalMessage(
+ object: object,
+ cancel: cancel,
+ success: success,
+ );
+
+ void signTypedMessage({
+ required Map object,
+ required VoidCallback cancel,
+ required Function(String hash) success,
+ }) async =>
+ bridgeHelper.signTypedMessage(
+ object: object,
+ cancel: cancel,
+ success: success,
+ );
+
+ void setAddress(dynamic id) => bridgeHelper.setAddress(
+ id,
+ );
+
+ void switchDefaultNetwork(int id, Network toNetwork, String rawChainId) =>
+ bridgeHelper.switchDefaultNetwork(
+ id,
+ toNetwork,
+ rawChainId,
);
- if (panelTimer != null) {
- panelTimer!.cancel();
- }
- }
- }
+
+ void addAsset(int id, Map data,
+ {required VoidCallback cancel,
+ required Function(String status) success}) async =>
+ bridgeHelper.addAsset(
+ id,
+ data,
+ cancel: cancel,
+ success: success,
+ );
+
+ void setChain(int? id) => bridgeHelper.setChain(id);
void closedApp() {
navigator!.pop();
@@ -624,589 +368,12 @@ class OpenDAppPresenter extends CompletePresenter {
}
}
- void changeOnLoadStopCalled() {
- state.isLoadStopCalled = !state.isLoadStopCalled;
- }
-
- // call this on webview created
- void injectMinerDappListeners() async {
- state.webviewController!.addJavaScriptHandler(
- handlerName: JSChannelEvents.changeCronTransitionEvent,
- callback: (args) =>
- jsChannelCronErrorHandler(args, handleChangeCronTransition));
-
- state.webviewController!.addJavaScriptHandler(
- handlerName: JSChannelEvents.changeCronTransitionStatusEvent,
- callback: (args) => jsChannelCronErrorHandler(
- args, handleChangeCronTransitionStatusEvent));
-
- state.webviewController!.addJavaScriptHandler(
- handlerName: JSChannelEvents.getSystemInfoEvent,
- callback: (args) =>
- jsChannelCronErrorHandler(args, handleGetSystemInfoEvent));
-
- state.webviewController!.addJavaScriptHandler(
- handlerName: JSChannelEvents.goToAdvancedSettingsEvent,
- callback: (args) =>
- jsChannelCronErrorHandler(args, handleGoToAdvancedSettingsEvent));
- }
-
- void injectBluetoothListeners() {
- // Bluetooth API
-
- state.webviewController!.addJavaScriptHandler(
- handlerName: JSChannelEvents.requestDevice,
- callback: (args) =>
- jsChannelErrorHandler(args, handleBluetoothRequestDevice));
-
- // BluetoothRemoteGATTServer
-
- state.webviewController!.addJavaScriptHandler(
- handlerName: JSChannelEvents.bluetoothRemoteGATTServerConnect,
- callback: (args) => jsChannelErrorHandler(
- args, handleBluetoothRemoteGATTServerConnect));
-
- state.webviewController!.addJavaScriptHandler(
- handlerName: JSChannelEvents.bluetoothRemoteGATTServerGetPrimaryService,
- callback: (args) => jsChannelErrorHandler(
- args, handleBluetoothRemoteGATTServerGetPrimaryService));
-
- // BluetoothRemoteGATTService
-
- state.webviewController!.addJavaScriptHandler(
- handlerName:
- JSChannelEvents.bluetoothRemoteGATTServiceGetCharacteristic,
- callback: (args) => jsChannelErrorHandler(
- args, handleBluetoothRemoteGATTServiceGetCharacteristic));
-
- // BluetoothRemoteGATTCharacteristic
-
- state.webviewController!.addJavaScriptHandler(
- handlerName:
- JSChannelEvents.bluetoothRemoteGATTCharacteristicStartNotifications,
- callback: (args) => jsChannelErrorHandler(
- args, handleBluetoothRemoteGATTCharacteristicStartNotifications));
-
- state.webviewController!.addJavaScriptHandler(
- handlerName:
- JSChannelEvents.bluetoothRemoteGATTCharacteristicStopNotifications,
- callback: (args) => jsChannelErrorHandler(
- args, handleBluetoothRemoteGATTCharacteristicStopNotifications));
-
- state.webviewController!.addJavaScriptHandler(
- handlerName:
- JSChannelEvents.bluetoothRemoteGATTCharacteristicWriteValue,
- callback: (args) => jsChannelErrorHandler(
- args, handleBluetoothRemoteGATTCharacteristicWriteValue));
-
- state.webviewController!.addJavaScriptHandler(
- handlerName: JSChannelEvents
- .bluetoothRemoteGATTCharacteristicWriteValueWithResponse,
- callback: (args) => jsChannelErrorHandler(args,
- handleBluetoothRemoteGATTCharacteristicWriteValueWithResponse));
-
- state.webviewController!.addJavaScriptHandler(
- handlerName: JSChannelEvents
- .bluetoothRemoteGATTCharacteristicWriteValueWithoutResponse,
- callback: (args) => jsChannelErrorHandler(args,
- handleBluetoothRemoteGATTCharacteristicWriteValueWithoutResponse));
-
- state.webviewController!.addJavaScriptHandler(
- handlerName: JSChannelEvents.bluetoothRemoteGATTCharacteristicReadValue,
- callback: (args) => jsChannelErrorHandler(
- args, handleBluetoothRemoteGATTCharacteristicReadValue));
- }
-
- // GATT server
- Future> handleBluetoothRemoteGATTServerGetPrimaryService(
- Map data) async {
- collectLog('handleBluetoothRemoteGATTServerGetPrimaryService : $data');
- final selectedService = await getSelectedService(data['service']);
-
- final device = BluetoothDevice.getBluetoothDeviceFromScanResult(
- state.selectedScanResult!);
- final bluetoothRemoteGATTService =
- BluetoothRemoteGATTService.fromBluetoothService(
- device, selectedService);
- return bluetoothRemoteGATTService.toMap();
- }
-
- Future> handleBluetoothRemoteGATTServerConnect(
- Map data) async {
- collectLog('handleBluetoothRemoteGATTServerConnect : $data');
- await state.selectedScanResult?.device.connect();
-
- return BluetoothRemoteGATTServer(
- device: BluetoothDevice.getBluetoothDeviceFromScanResult(
- state.selectedScanResult!),
- connected: true)
- .toMap();
- }
-
- Future getSelectedService(
- String uuid,
- ) async {
- final serviceUUID = GuidHelper.parse(uuid);
- final selectedService = await BluePlusBluetoothUtils.getPrimaryService(
- state.selectedScanResult!, serviceUUID);
- return selectedService;
- }
-
- // Util
- blue_plus.BluetoothCharacteristic getSelectedCharacteristic(
- String uuid, blue_plus.BluetoothService selectedService) {
- final characteristicUUID = GuidHelper.parse(uuid);
- final selectedCharacteristic =
- BluePlusBluetoothUtils.getCharacteristicWithService(
- selectedService, characteristicUUID);
- return selectedCharacteristic;
- }
-
- // Service
- Future>
- handleBluetoothRemoteGATTServiceGetCharacteristic(
- Map data) async {
- collectLog('handleBluetoothRemoteGATTServiceGetCharacteristic : $data');
- final targetCharacteristicUUID = data['characteristic'];
-
- final selectedService = await getSelectedService(data['this']);
- final targetCharacteristic =
- getSelectedCharacteristic(targetCharacteristicUUID, selectedService);
-
- final device = BluetoothDevice.getBluetoothDeviceFromScanResult(
- state.selectedScanResult!);
- final bluetoothRemoteGATTService =
- BluetoothRemoteGATTService.fromBluetoothService(
- device, selectedService);
- final bluetoothRemoteGATTCharacteristic = BluetoothRemoteGATTCharacteristic(
- service: bluetoothRemoteGATTService,
- properties:
- BluetoothCharacteristicProperties.fromCharacteristicProperties(
- targetCharacteristic.properties),
- uuid: targetCharacteristic.uuid.str,
- value: null);
- return bluetoothRemoteGATTCharacteristic.toMap();
- }
-
- BluetoothRemoteGATTCharacteristic getBluetoothRemoteGATTCharacteristic(
- blue_plus.BluetoothCharacteristic selectedCharacteristic,
- blue_plus.BluetoothService selectedService) {
- final device = BluetoothDevice.getBluetoothDeviceFromScanResult(
- state.selectedScanResult!);
- final bluetoothRemoteGATTService =
- BluetoothRemoteGATTService.fromBluetoothService(
- device, selectedService);
- final bluetoothRemoteGATTCharacteristic = BluetoothRemoteGATTCharacteristic(
- service: bluetoothRemoteGATTService,
- properties:
- BluetoothCharacteristicProperties.fromCharacteristicProperties(
- selectedCharacteristic.properties),
- uuid: selectedCharacteristic.uuid.str,
- value: null);
- return bluetoothRemoteGATTCharacteristic;
- }
-
- Future>
- handleBluetoothRemoteGATTCharacteristicStartNotifications(
- Map data) async {
- collectLog('handleBluetoothRemoteGATTCharacteristicStartNotifications : $data');
- final selectedService = await getSelectedService(data['serviceUUID']);
- final selectedCharacteristic =
- getSelectedCharacteristic(data['this'], selectedService);
-
- final bluetoothRemoteGATTCharacteristic =
- getBluetoothRemoteGATTCharacteristic(
- selectedCharacteristic, selectedService);
-
- initJSCharacteristicValueEmitter(selectedCharacteristic);
-
- return bluetoothRemoteGATTCharacteristic.toMap();
- }
-
- Future>
- handleBluetoothRemoteGATTCharacteristicStopNotifications(
- Map data) async {
- collectLog('handleBluetoothRemoteGATTCharacteristicStopNotifications : $data');
- final selectedService = await getSelectedService(data['serviceUUID']);
- final selectedCharacteristic =
- getSelectedCharacteristic(data['this'], selectedService);
-
- final bluetoothRemoteGATTCharacteristic =
- getBluetoothRemoteGATTCharacteristic(
- selectedCharacteristic, selectedService);
-
- removeJSCharacteristicValueEmitter(selectedCharacteristic);
-
- return bluetoothRemoteGATTCharacteristic.toMap();
- }
-
- Future> handleWrites(Map data,
- {bool withResponse = true}) async {
- collectLog('handleWrites : $data');
- final selectedService = await getSelectedService(data['serviceUUID']);
- final selectedCharacteristic =
- getSelectedCharacteristic(data['this'], selectedService);
- final value = Uint8List.fromList(List.from((data['value'] as Map).values.toList()));
-
- try {
- collectLog('handleWrites:value $value');
- if (withResponse) {
- await selectedCharacteristic.write(value);
- } else {
- await selectedCharacteristic.write(value, withoutResponse: true);
- }
- return {};
- } catch (e) {
- return {'error': 'true'};
- }
- }
-
- Future>
- handleBluetoothRemoteGATTCharacteristicWriteValue(
- Map data) async {
- return handleWrites(data);
- }
-
- Future>
- handleBluetoothRemoteGATTCharacteristicWriteValueWithResponse(
- Map data) async {
- return handleWrites(data);
- }
-
- Future>
- handleBluetoothRemoteGATTCharacteristicWriteValueWithoutResponse(
- Map data) async {
- return handleWrites(data, withResponse: false);
- }
-
- Future handleBluetoothRemoteGATTCharacteristicReadValue(
- Map data) async {
- collectLog('handleBluetoothRemoteGATTCharacteristicReadValue : $data');
- final selectedService = await getSelectedService(data['serviceUUID']);
- final selectedCharacteristic =
- getSelectedCharacteristic(data['this'], selectedService);
- final value = selectedCharacteristic.lastValue;
-
- final uInt8List = Uint8List.fromList(value);
-
- collectLog('handleBluetoothRemoteGATTCharacteristicReadValue:value $value');
- collectLog(
- 'handleBluetoothRemoteGATTCharacteristicReadValue:uInt8List ${uInt8List.toString()}');
-
- return uInt8List;
- }
-
- Timer? characteriticListnerTimer;
- StreamSubscription>? characteristicValueStreamSubscription;
-
- void initJSCharacteristicValueEmitter(
- blue_plus.BluetoothCharacteristic characteristic,
- ) async {
- await characteristic.setNotifyValue(true);
- // characteriticListnerTimer = Timer.periodic(const Duration(seconds: 5), (timer) {
- // characteristic.read();
- // });
-
- characteristicValueStreamSubscription =
- characteristic.lastValueStream.listen((event) async {
- final uInt8List = Uint8List.fromList(event);
- print(uInt8List);
- collectLog('characteristicValueStreamSubscription:event $event');
- collectLog(
- 'characteristicValueStreamSubscription:uInt8List ${uInt8List.toString()}');
- final script = '''
- navigator.bluetooth.updateCharacteristicValue('${characteristic.uuid.str}', ${uInt8List.toString()},);
- ''';
- await state.webviewController!.evaluateJavascript(source: script);
- });
- }
-
- void removeJSCharacteristicValueEmitter(
- blue_plus.BluetoothCharacteristic characteristic,
- ) async {
- await characteristic.setNotifyValue(false);
-
- characteristicValueStreamSubscription?.cancel();
- }
-
- void injectAXSWalletJSChannel() async {
- // Making It easy for accessing axs wallet
- // use this way window.axs.callHandler
- await state.webviewController!.evaluateJavascript(
- source: JSChannelScripts.axsWalletObjectInjectScript(
- JSChannelConfig.axsWalletJSObjectName));
-
- await state.webviewController!.injectJavascriptFileFromAsset(
- assetFilePath: 'assets/js/bluetooth/bluetooth.js');
-
- // There is a gap for detecting the axs object in webview, It's intermittent after adding function structure to the scripts
- Future.delayed(
- const Duration(milliseconds: 500),
- () async {
- await state.webviewController!.evaluateJavascript(
- source: JSChannelScripts.axsWalletReadyInjectScript(
- JSChannelEvents.axsReadyEvent,
- ));
- },
- );
- }
-
- Future> jsChannelCronErrorHandler(
- List args,
- Future> Function(
- Map,
- AXSCronServices,
- )
- callback,
- ) async {
- try {
- Map channelDataMap;
-
- final channelData = args[0];
- channelDataMap = channelData as Map;
-
- final axsCronService =
- AXSCronServicesExtension.getCronServiceFromJson(channelDataMap);
- final callbackRes = await callback(channelDataMap, axsCronService);
- return callbackRes;
- } catch (e) {
- final response = AXSJSChannelResponseModel(
- status: AXSJSChannelResponseStatus.failed,
- data: null,
- message: e.toString());
- return response.toMap((data) => {'message': e.toString()});
- }
- }
-
- Future jsChannelErrorHandler(
- List args,
- Future Function(
- Map,
- )
- callback,
- ) async {
- try {
- Map channelDataMap;
-
- final channelData = args[0];
- channelDataMap = channelData == null
- ? {}
- : channelData is String
- ? json.decode(channelData) as Map
- : channelData as Map;
-
- final callbackRes = await callback(channelDataMap);
- return callbackRes;
- } catch (e) {
- if (e is BluetoothTimeoutError) {
- addError(translate('unable_to_continue_bluetooth_is_turned_off')!);
- }
-
- final response = AXSJSChannelResponseModel(
- status: AXSJSChannelResponseStatus.failed,
- data: null,
- message: e.toString());
- return response.toMap((data) => {'message': e.toString()});
- }
- }
-
- // Update via functions & get data via steam & send the data via event eaach time
- // ready => updateSystemInfo (service statues, mining service status, time, selected miners, camera permission location permission)
-
- Future> handleChangeCronTransition(
- Map channelData, AXSCronServices axsCronService) async {
- final axsCronService =
- AXSCronServicesExtension.getCronServiceFromJson(channelData);
- if (axsCronService == AXSCronServices.miningAutoClaimCron) {
- ChangeCronTransitionRequestModel;
- final changeCronTransitionRequestModel =
- ChangeCronTransitionRequestModel.fromMap(
- channelData['cron'], MiningCronServiceDataModel.fromMap);
-
- // Here i change the data that won't effect the
- final currentDappHooksData = state.dappHooksData;
- final newData = changeCronTransitionRequestModel.data;
+ void changeOnLoadStopCalled() =>
+ state.isLoadStopCalled = !state.isLoadStopCalled;
- if (newData != null) {
- final minersList = newData.minersList ??
- currentDappHooksData.minerHooks.selectedMiners;
- _dAppHooksUseCase.updateMinersList(minersList);
+ void injectAXSWalletJSChannel() =>
+ JSChannelUtils.injectAXSWalletJSChannel(state);
- final newTimeOfDay = TimeOfDay.fromDateTime(newData.time!);
- final currentTimeOfDay =
- TimeOfDay.fromDateTime(currentDappHooksData.minerHooks.time);
-
- if (newData.time != null && newTimeOfDay != currentTimeOfDay) {
- await minerHooksHelper.changeMinerHookTiming(newTimeOfDay);
- }
- }
-
- final miningCronServiceData =
- MiningCronServiceDataModel.fromDAppHooksData(
- _dAppHooksUseCase.dappHooksData.value);
-
- final responseData = CronServiceDataModel.fromDAppHooksData(
- axsCronService,
- _dAppHooksUseCase.dappHooksData.value,
- miningCronServiceData);
-
- final response = AXSJSChannelResponseModel(
- status: AXSJSChannelResponseStatus.success,
- data: responseData,
- message: null);
- return response.toMap(miningCronServiceData.toMapWrapper);
- } else {
- throw 'Unknown service';
- }
- }
-
- Future> handleBluetoothRequestDevice(
- Map channelData,
- ) async {
- // final options = RequestDeviceOptions.fromJson(channelData['data']);
- final options = RequestDeviceOptions.fromMap(channelData);
- late BluetoothDevice responseDevice;
-
- await _bluetoothUseCase.turnOnBluetoothAndProceed();
-
- // Get the options data
- _bluetoothUseCase.startScanning(
- withServices: options.filters != null
- ? options.filters!
- .expand((filter) => filter.services ?? [])
- .toList()
- .firstOrNull
- : [],
- withRemoteIds:
- null, // No direct mapping in RequestDeviceOptions, adjust as necessary
- withNames: options.filters != null
- ? options.filters!
- .where((filter) => filter.name != null)
- .map((filter) => filter.name!)
- .toList()
- : [],
- withKeywords: options.filters != null
- ? options.filters!
- .where((filter) => filter.namePrefix != null)
- .map((filter) => filter.namePrefix!)
- .toList()
- : [],
- withMsd: options.filters != null
- ? options.filters!
- .expand((filter) => filter.manufacturerData ?? [])
- .toList()
- .firstOrNull
- : [],
- withServiceData: options.filters != null
- ? options.filters!
- .expand((filter) => filter.serviceData ?? [])
- .toList()
- .firstOrNull
- : [],
- continuousUpdates: true,
- continuousDivisor: 2,
- androidUsesFineLocation: true,
- );
-
- final blueberryRing = await getBlueberryRing();
- _bluetoothUseCase.stopScanner();
- if (blueberryRing == null) {
- return {};
- } else {
- responseDevice = blueberryRing;
- }
-
- return responseDevice.toMap();
- }
-
- Future getBlueberryRing() async {
- loading = true;
- return Future.delayed(const Duration(seconds: 3), () async {
- loading = false;
- BluetoothDevice? responseDevice;
- final scanResults = _bluetoothUseCase.scanResults.value;
- if (scanResults.length == 1) {
- // only one scan results
- final scanResult = scanResults.first;
- state.selectedScanResult = scanResult;
- } else {
- // We need to let the user to choose If two or more devices of rings are available and even If empty maybe let the user to wait
- final scanResult = await showBlueberryRingsBottomSheet(
- context!,
- );
- if (scanResult != null) {
- state.selectedScanResult = scanResult;
- }
- }
- if (state.selectedScanResult != null) {
- responseDevice = BluetoothDevice.getBluetoothDeviceFromScanResult(
- state.selectedScanResult!);
- }
-
- return responseDevice;
- });
- }
-
- Future> handleChangeCronTransitionStatusEvent(
- Map channelData,
- AXSCronServices axsCronService,
- ) async {
- if (axsCronService == AXSCronServices.miningAutoClaimCron) {
- final status = channelData['cron']['status'];
-
- await minerHooksHelper.changeMinerHooksEnabled(status);
- final miningCronServiceData =
- MiningCronServiceDataModel.fromDAppHooksData(
- _dAppHooksUseCase.dappHooksData.value);
-
- final responseData = CronServiceDataModel.fromDAppHooksData(
- axsCronService,
- _dAppHooksUseCase.dappHooksData.value,
- miningCronServiceData);
- final response = AXSJSChannelResponseModel(
- status: AXSJSChannelResponseStatus.success,
- message: null,
- data: responseData);
- return response.toMap(miningCronServiceData.toMapWrapper);
- } else {
- throw 'Unknown cron service';
- }
- }
-
- Future> handleGetSystemInfoEvent(
- Map channelData,
- AXSCronServices axsCronService,
- ) async {
- if (axsCronService == AXSCronServices.miningAutoClaimCron) {
- final dappHooksData = state.dappHooksData;
-
- final miningCronServiceData =
- MiningCronServiceDataModel.fromDAppHooksData(dappHooksData);
-
- final responseData = CronServiceDataModel.fromDAppHooksData(
- axsCronService, dappHooksData, miningCronServiceData);
- final response = AXSJSChannelResponseModel(
- status: AXSJSChannelResponseStatus.success,
- message: null,
- data: responseData,
- );
- return response.toMap(miningCronServiceData.toMapWrapper);
- } else {
- throw 'Unknown cron service';
- }
- }
-
- Future> handleGoToAdvancedSettingsEvent(
- Map channelData, AXSCronServices axsCronService) async {
- goToAdvancedSettings();
- final response = AXSJSChannelResponseModel(
- status: AXSJSChannelResponseStatus.success, message: null, data: null);
- return response.toMap((data) => {});
- }
-
- void goToAdvancedSettings() {
- navigator!.push(route(
- const DAppHooksPage(),
- ));
- }
+ void cancelCharacteristicListenerTimer() =>
+ characteristicListenerTimer?.cancel();
}
diff --git a/lib/features/dapps/subfeatures/open_dapp/widgets/message_info.dart b/lib/features/dapps/subfeatures/open_dapp/widgets/message_info.dart
new file mode 100644
index 00000000..5e48a36d
--- /dev/null
+++ b/lib/features/dapps/subfeatures/open_dapp/widgets/message_info.dart
@@ -0,0 +1,78 @@
+import 'package:datadashwallet/common/common.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_i18n/flutter_i18n.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:mxc_ui/mxc_ui.dart';
+
+import '../open_dapp_presenter.dart';
+
+class MessageInfo extends ConsumerWidget {
+ const MessageInfo({
+ Key? key,
+ required this.networkName,
+ required this.message,
+ this.onTap,
+ }) : super(key: key);
+
+ final String networkName;
+ final String message;
+ final VoidCallback? onTap;
+
+ @override
+ Widget build(BuildContext context, WidgetRef ref) {
+ final presenter = ref.read(openDAppPageContainer.actions);
+ return Column(
+ children: [
+ Padding(
+ padding: const EdgeInsets.symmetric(horizontal: 6),
+ child: Column(
+ children: [
+ titleItem(context),
+ messageItem(context, presenter, message),
+ ],
+ ),
+ ),
+ const SizedBox(height: 8),
+ signButton(context),
+ ],
+ );
+ }
+
+ Widget signButton(BuildContext context) {
+ String titleText = 'sign';
+ AxsButtonType type = AxsButtonType.primary;
+
+ return MxcButton.primary(
+ key: const ValueKey('signButton'),
+ size: AxsButtonSize.xl,
+ title: FlutterI18n.translate(context, titleText),
+ type: type,
+ onTap: () {
+ if (onTap != null) onTap!();
+ Navigator.of(context).pop(true);
+ },
+ );
+ }
+
+ Widget titleItem(BuildContext context) {
+ return Column(
+ children: [
+ Row(
+ mainAxisAlignment: MainAxisAlignment.start,
+ children: [
+ Text(
+ networkName,
+ style: FontTheme.of(context).body2.secondary(),
+ softWrap: true,
+ ),
+ const SizedBox(height: 4),
+ ],
+ )
+ ],
+ );
+ }
+
+ Widget messageItem(BuildContext context, OpenDAppPresenter presenter, String message) {
+ return SingleLineInfoItem(title: FlutterI18n.translate(context, 'message'), value: message);
+ }
+}
diff --git a/lib/features/dapps/subfeatures/open_dapp/widgets/sign_message_bottom_sheet.dart b/lib/features/dapps/subfeatures/open_dapp/widgets/sign_message_bottom_sheet.dart
new file mode 100644
index 00000000..74169c30
--- /dev/null
+++ b/lib/features/dapps/subfeatures/open_dapp/widgets/sign_message_bottom_sheet.dart
@@ -0,0 +1,52 @@
+import 'package:flutter/material.dart';
+import 'package:mxc_ui/mxc_ui.dart';
+
+import 'message_info.dart';
+
+Future showSignMessageDialog(
+ BuildContext context, {
+ String? title,
+ required String networkName,
+ required String message,
+ VoidCallback? onTap,
+}) {
+ return showModalBottomSheet(
+ context: context,
+ useRootNavigator: true,
+ isScrollControlled: true,
+ isDismissible: false,
+ useSafeArea: true,
+ backgroundColor: Colors.transparent,
+ builder: (BuildContext context) => Container(
+ padding: const EdgeInsets.only(left: 16, right: 16, top: 0, bottom: 44),
+ decoration: BoxDecoration(
+ color: ColorsTheme.of(context).screenBackground,
+ borderRadius: const BorderRadius.only(
+ topLeft: Radius.circular(20),
+ topRight: Radius.circular(20),
+ ),
+ ),
+ child: Column(
+ mainAxisSize: MainAxisSize.min,
+ children: [
+ MxcAppBarEvenly.title(
+ titleText: title ?? '',
+ action: Container(
+ alignment: Alignment.centerRight,
+ child: InkWell(
+ child: const Icon(Icons.close),
+ onTap: () => Navigator.of(context).pop(false),
+ ),
+ ),
+ ),
+ MessageInfo(
+ message: message,
+ networkName: networkName,
+ onTap: onTap,
+ ),
+ const SizedBox(height: 10),
+ ],
+ ),
+ ),
+ );
+}
diff --git a/lib/features/dapps/subfeatures/open_dapp/widgets/widgets.dart b/lib/features/dapps/subfeatures/open_dapp/widgets/widgets.dart
index acbf5eb8..d3d1af6a 100644
--- a/lib/features/dapps/subfeatures/open_dapp/widgets/widgets.dart
+++ b/lib/features/dapps/subfeatures/open_dapp/widgets/widgets.dart
@@ -10,3 +10,5 @@ export 'transaction_dialog.dart';
export 'transaction_info.dart';
export 'typed_message_bottom_sheet.dart';
export 'typed_message_info.dart';
+export 'message_info.dart';
+export 'sign_message_bottom_sheet.dart';
diff --git a/lib/features/security/presentation/passcode_change/passcode_change_confirm_page/passcode_change_confirm_page_presenter.dart b/lib/features/security/presentation/passcode_change/passcode_change_confirm_page/passcode_change_confirm_page_presenter.dart
index 083f73d3..8aa2df0e 100644
--- a/lib/features/security/presentation/passcode_change/passcode_change_confirm_page/passcode_change_confirm_page_presenter.dart
+++ b/lib/features/security/presentation/passcode_change/passcode_change_confirm_page/passcode_change_confirm_page_presenter.dart
@@ -31,6 +31,8 @@ class PasscodeChangeConfirmPagePresenter extends PasscodeBasePagePresenter {
_passcodeUseCase.setNeedSetPasscode(false);
_passcodeUseCase.setPasscode(expectedNumbers.join());
- navigator?.popFeature();
+ navigator?.popUntil((route) {
+ return route.settings.name?.contains('SecuritySettingsPage') ?? false;
+ });
}
}
diff --git a/lib/features/settings/presentation/settings_page.dart b/lib/features/settings/presentation/settings_page.dart
index 0c72b89f..548c0454 100644
--- a/lib/features/settings/presentation/settings_page.dart
+++ b/lib/features/settings/presentation/settings_page.dart
@@ -37,7 +37,7 @@ class SettingsPage extends HookConsumerWidget {
height: Sizes.space2XLarge,
),
GestureDetector(
- onTap: AXSFireBase.incrementBuildTap,
+ onTap: presenter.testOnly,
child: Text(
'${FlutterI18n.translate(context, 'app_version')}${state.appVersion ?? ''}',
style: FontTheme.of(context)
diff --git a/lib/features/settings/presentation/settings_page_presenter.dart b/lib/features/settings/presentation/settings_page_presenter.dart
index ea9bad61..e44a0c78 100644
--- a/lib/features/settings/presentation/settings_page_presenter.dart
+++ b/lib/features/settings/presentation/settings_page_presenter.dart
@@ -15,6 +15,10 @@ class SettingsPresenter extends CompletePresenter {
late final _webviewUseCase = WebviewUseCase();
late final _authUseCase = ref.read(authUseCaseProvider);
late final _accountUserCase = ref.read(accountUseCaseProvider);
+ late final blueberryRingBackgroundNotificationsUseCase =
+ ref.read(blueberryRingBackgroundNotificationsUseCaseProvider);
+ late final contextLessTranslationUseCase =
+ ref.read(contextLessTranslationUseCaseProvider);
@override
void initState() {
@@ -102,4 +106,11 @@ class SettingsPresenter extends CompletePresenter {
void loadCache() {
_webviewUseCase.clearCache();
}
+
+ void testOnly() async {
+ await blueberryRingBackgroundNotificationsUseCase.checkLowBattery();
+ await blueberryRingBackgroundNotificationsUseCase.checkActivityReminder();
+ await blueberryRingBackgroundNotificationsUseCase.checkSleepInsight();
+ await blueberryRingBackgroundNotificationsUseCase.checkHeartAlert();
+ }
}
diff --git a/lib/features/settings/subfeatures/dapp_hooks/dapp_hooks.dart b/lib/features/settings/subfeatures/dapp_hooks/dapp_hooks.dart
new file mode 100644
index 00000000..05a9423b
--- /dev/null
+++ b/lib/features/settings/subfeatures/dapp_hooks/dapp_hooks.dart
@@ -0,0 +1,6 @@
+export 'dapp_hooks_page.dart';
+export 'dapp_hooks_presenter.dart';
+export 'dapp_hooks_state.dart';
+export 'domain/domain.dart';
+export 'utils/utils.dart';
+export 'widgets/widgets.dart';
diff --git a/lib/features/settings/subfeatures/dapp_hooks/dapp_hooks_page.dart b/lib/features/settings/subfeatures/dapp_hooks/dapp_hooks_page.dart
index cb5352ce..d3393042 100644
--- a/lib/features/settings/subfeatures/dapp_hooks/dapp_hooks_page.dart
+++ b/lib/features/settings/subfeatures/dapp_hooks/dapp_hooks_page.dart
@@ -125,11 +125,28 @@ class DAppHooksPage extends HookConsumerWidget {
const SizedBox(height: Sizes.spaceNormal),
MXCDropDown(
key: const Key('minerHooksTimingDropDown'),
- onTap: dappHooksPresenter.showTimePickerDialog,
+ onTap: dappHooksPresenter.showTimePickerMinerDialog,
selectedItem: autoClaimTime,
enabled:
isMXCChains && dappHooksState.dAppHooksData!.minerHooks.enabled,
),
+ // const SizedBox(height: Sizes.spaceLarge),
+ // MXCSwitchRowItem(
+ // key: const Key('blueberryRingHookSwitch'),
+ // title: translate('blueberry_hooks'),
+ // value: dappHooksState.dAppHooksData!.blueberryRingHooks.enabled,
+ // onChanged: dappHooksPresenter.changeBlueberryHooksEnabled,
+ // enabled: isMXCChains,
+ // titleStyle: FontTheme.of(context).h6(),
+ // ),
+ // const SizedBox(height: Sizes.spaceNormal),
+ // MXCDropDown(
+ // key: const Key('BlueberryHooksTimingDropDown'),
+ // onTap: dappHooksPresenter.showTimePickerBlueberryRingDialog,
+ // selectedItem: autoClaimTime,
+ // enabled:
+ // isMXCChains && dappHooksState.dAppHooksData!.blueberryRingHooks.enabled,
+ // ),
],
);
}
diff --git a/lib/features/settings/subfeatures/dapp_hooks/dapp_hooks_presenter.dart b/lib/features/settings/subfeatures/dapp_hooks/dapp_hooks_presenter.dart
index 5e7ad2cd..90e83528 100644
--- a/lib/features/settings/subfeatures/dapp_hooks/dapp_hooks_presenter.dart
+++ b/lib/features/settings/subfeatures/dapp_hooks/dapp_hooks_presenter.dart
@@ -38,6 +38,13 @@ class DAppHooksPresenter extends CompletePresenter
accountUseCase: _accountUseCase,
backgroundFetchConfigUseCase: _backgroundFetchConfigUseCase);
+ BlueberryHooksHelper get blueberryRingHooksHelper => BlueberryHooksHelper(
+ translate: translate,
+ context: context,
+ dAppHooksUseCase: _dAppHooksUseCase,
+ accountUseCase: _accountUseCase,
+ backgroundFetchConfigUseCase: _backgroundFetchConfigUseCase);
+
WiFiHooksHelper get wifiHooksHelper => WiFiHooksHelper(
translate: translate,
context: context,
@@ -82,6 +89,9 @@ class DAppHooksPresenter extends CompletePresenter
void changeMinerHooksEnabled(bool value) =>
minerHooksHelper.changeMinerHooksEnabled(value);
+ void changeBlueberryHooksEnabled(bool value) =>
+ blueberryRingHooksHelper.changeBLueberryRingHooksEnabled(value);
+
void showWiFiHooksFrequency() {
showWiFiHooksFrequencyBottomSheet(context!,
onTap: wifiHooksHelper.handleFrequencyChange,
@@ -89,8 +99,20 @@ class DAppHooksPresenter extends CompletePresenter
state.dAppHooksData!.wifiHooks.duration));
}
- void showTimePickerDialog() async {
+ void showTimePickerMinerDialog() async {
final currentTimeOfDay = state.dAppHooksData!.minerHooks.time;
+ showTimePickerDialog(
+ currentTimeOfDay, minerHooksHelper.changeMinerHookTiming);
+ }
+
+ void showTimePickerBlueberryRingDialog() async {
+ final currentTimeOfDay = state.dAppHooksData!.blueberryRingHooks.time;
+ showTimePickerDialog(currentTimeOfDay,
+ blueberryRingHooksHelper.changeBlueberryRingHookTiming);
+ }
+
+ void showTimePickerDialog(DateTime currentTimeOfDay,
+ Future Function(TimeOfDay value) changeTimeFunction) async {
final initialTime = TimeOfDay.fromDateTime(currentTimeOfDay);
final newTimeOfDay = await showTimePicker(
context: context!,
@@ -99,7 +121,7 @@ class DAppHooksPresenter extends CompletePresenter
);
if (newTimeOfDay != null) {
- minerHooksHelper.changeMinerHookTiming(newTimeOfDay);
+ changeTimeFunction(newTimeOfDay);
}
}
diff --git a/lib/features/settings/subfeatures/dapp_hooks/domain/dapp_hooks_use_case.dart b/lib/features/settings/subfeatures/dapp_hooks/domain/dapp_hooks_use_case.dart
index 66cdfee2..dcd09e8d 100644
--- a/lib/features/settings/subfeatures/dapp_hooks/domain/dapp_hooks_use_case.dart
+++ b/lib/features/settings/subfeatures/dapp_hooks/domain/dapp_hooks_use_case.dart
@@ -18,13 +18,15 @@ import 'dapp_hooks_repository.dart';
class DAppHooksUseCase extends ReactiveUseCase {
DAppHooksUseCase(
- this._repository,
- this._chainConfigurationUseCase,
- this._tokenContractUseCase,
- this._minerUseCase,
- this._accountUseCase,
- this._errorUseCase,
- this._contextLessTranslationUseCase) {
+ this._repository,
+ this._chainConfigurationUseCase,
+ this._tokenContractUseCase,
+ this._minerUseCase,
+ this._accountUseCase,
+ this._errorUseCase,
+ this._contextLessTranslationUseCase,
+ this._blueberryRingBackgroundSyncUseCase,
+ ) {
initialize();
}
@@ -35,6 +37,7 @@ class DAppHooksUseCase extends ReactiveUseCase {
final ErrorUseCase _errorUseCase;
final MinerUseCase _minerUseCase;
final ContextLessTranslationUseCase _contextLessTranslationUseCase;
+ final BlueberryRingBackgroundSyncUseCase _blueberryRingBackgroundSyncUseCase;
// Context less translation, This should be only used for BG functions
String cTranslate(String key) =>
@@ -58,6 +61,8 @@ class DAppHooksUseCase extends ReactiveUseCase {
String get wifiHookTasksTaskId => BackgroundExecutionConfig.wifiHooksTask;
String get minerAutoClaimTaskTaskId =>
BackgroundExecutionConfig.minerAutoClaimTask;
+ String get blueberryAutoSyncTask =>
+ BackgroundExecutionConfig.blueberryAutoSyncTask;
void initialize() {
_chainConfigurationUseCase.selectedNetwork.listen((network) {
@@ -85,6 +90,34 @@ class DAppHooksUseCase extends ReactiveUseCase {
updateItem(newDAppHooksData);
}
+ void updateRingsList(List rings) {
+ final newDAppHooksData = dappHooksData.value.copyWith(
+ blueberryRingHooks: dappHooksData.value.blueberryRingHooks.copyWith(
+ selectedRings: rings,
+ ),
+ );
+ updateItem(newDAppHooksData);
+ }
+
+ void updateBlueberryRingHookTiming(TimeOfDay value) {
+ final newDAppHooksData = dappHooksData.value.copyWith(
+ blueberryRingHooks: dappHooksData.value.blueberryRingHooks.copyWith(
+ time: dappHooksData.value.blueberryRingHooks.time
+ .copyWith(hour: value.hour, minute: value.minute, second: 0),
+ ),
+ );
+ updateItem(newDAppHooksData);
+ }
+
+ void updateBlueberryRingHooksEnabled(bool value) {
+ final newDAppHooksData = dappHooksData.value.copyWith(
+ blueberryRingHooks: dappHooksData.value.blueberryRingHooks.copyWith(
+ enabled: value,
+ ),
+ );
+ updateItem(newDAppHooksData);
+ }
+
void updateMinersList(List miners) {
final newDAppHooksData = dappHooksData.value.copyWith(
minerHooks: dappHooksData.value.minerHooks.copyWith(
@@ -296,29 +329,7 @@ class DAppHooksUseCase extends ReactiveUseCase {
// delay is in minutes
Future startWifiHooksService(int delay) async {
- try {
- final result = await AXSBackgroundFetch.startBackgroundProcess(
- taskId: wifiHookTasksTaskId);
-
- if (!result) return result;
-
- final scheduleState =
- await bgFetch.BackgroundFetch.scheduleTask(bgFetch.TaskConfig(
- taskId: BackgroundExecutionConfig.wifiHooksTask,
- delay: delay * 60 * 1000,
- periodic: true,
- requiresNetworkConnectivity: true,
- startOnBoot: true,
- stopOnTerminate: false,
- enableHeadless: true,
- forceAlarmManager: false,
- requiredNetworkType: bgFetch.NetworkType.ANY,
- ));
-
- return scheduleState;
- } catch (e) {
- return false;
- }
+ return await startPeriodicalBackgroundService(delay, wifiHookTasksTaskId);
}
bool isTimeReached(DateTime dateTime) {
@@ -326,15 +337,27 @@ class DAppHooksUseCase extends ReactiveUseCase {
return difference <= 15;
}
- // This function is called after execusion & for scheduling
- Future scheduleAutoClaimTransaction(
+ Future scheduleTaskForExecution(
DateTime dateTime,
+ Future Function(int delay) startServiceFunction,
) async {
final difference = MXCTime.getMinutesDifferenceByDateTime(dateTime);
final delay = difference.isNegative ? (24 * 60 + difference) : difference;
- return await startAutoClaimService(delay);
+ return await startServiceFunction(delay);
}
+ // This function is called after execusion & for scheduling
+ Future scheduleAutoClaimTransaction(
+ DateTime dateTime,
+ ) async =>
+ scheduleTaskForExecution(dateTime, startAutoClaimService);
+
+ // This function is called after execusion & for scheduling
+ Future