UX: improve appBar in safeHome

https://sentry.io/share/issue/da813434b4ba48c7b53dadaeb5d70cc1/

.gitignore

@@ -47,9 +47,6 @@ android/key.properties
 # Rust things
 /target
 
-# Linux builds
-linux/
-
 # Custom
 scripts/private/
 AppDir/
@@ -59,5 +56,4 @@ android/app/build.gradle
 integration_test/duniter/data/chains/
 
 # Ignore PC deps
-macos/
+scripts/pushGecko
-windows/

.gitlab-ci.yml

@@ -7,7 +7,7 @@ stages:
 .env:
   image: axiomteam/gecko-ci:v0.0.11
   tags:
-    - redshift
+    - docker
 
 format:
   extends: .env
@@ -28,8 +28,6 @@ build_and_test:
     - if: $CI_COMMIT_TAG || $CI_MERGE_REQUEST_ID
     - when: manual
   stage: build_and_test
-  tags:
-    - redshift
   script:
     - flutter analyze
 

assets/translations/en.json

@@ -71,7 +71,8 @@
     "areYouSureToDeleteWallet": "Are you sure you want to delete the chest \"{}\"?",
     "areYouSureForgetAllChests": "Are you sure you want to forget all your chests?",
     "areYouSureToForgetWallet": "Are you sure you wan to forget the wallet \"{}\"?",
-    "areYouSureYouWantToCertify": "Are you sure you want to certify the address:\n\n{}",
+    "areYouSureYouWantToCertify1": "Are you sure you want to certify the identity :",
+    "areYouSureYouWantToCertify2": "having the address :",
     "yes": "Yes",
     "no": "No",
     "keepYourMnemonicSecret": "Try to keep this phrase a secret, as it allows anyone who knows it to access all your wallets.",
@@ -156,7 +157,7 @@
     "hours": "{} hours {}",
     "days": "{} days",
     "months": "{} months",
-    "certify": "Certify",
+    "certify": "Certify this\nidentity",
     "from": "From:",
     "to": "To:",
     "amount": "Amount:",
@@ -168,7 +169,7 @@
     "deleteThisWallet": "Delete this wallet",
     "cancel": "Cancel",
     "inBlockchainResult": "In {} blockchain",
-    "search": "Search",
+    "search": "Search an identity\nor an address",
     "currencyNode": "{} node :",
     "contactsManagementWithNbr": "My contacts ({})",
     "contactsManagement": "My contacts",
@@ -195,5 +196,11 @@
     "youCannotRevokeThisIdentity": "You cannot revoke this identity while\nit is member of the blacksmiths web",
     "showUdAmounts": "Show amounts in UD",
     "ud": "{}UD",
-    "chooseATargetWallet": "Choose a target wallet"
+    "chooseATargetWallet": "Choose a target wallet",
+    "thisMnemonicHasBeenCopiedToClipboard": "This mnemonic has been copied to clipboard",
+    "smithCantMigrateIdentity":"You can't migrate this identity while you're member of smith web",
+    "received": "Received",
+    "sent": "Sent",
+    "createIdentity": "Create a new \nidentity",
+    "memberAccountOf": "Account of {}"
 }

assets/translations/es.json

@@ -1,90 +1,92 @@
 {
-    "searchWallet": "Buscar\nbilletera",
+    "searchWallet": "Buscar\nmonedero",
-    "manageWallets": "Gestionar\nbilleteras",
+    "manageWallets": "Gestionar\nmonederos",
     "scanQRCode": "Escanear un\ncódigo QR",
-    "wellConnectedToNode": "Estas bien conectada al nodo\n{}",
+    "wellConnectedToNode": "Estás bien conectado al nodo\n{}",
     "networkLost": "Se ha perdido la red...",
     "noDuniterEndointAvailable": "No hay servidor disponible...",
     "connectionPending": "Conexión pendiente...",
     "noLizard": "no hay lagarto ;-)",
     "loading": "Cargando...",
-    "forgot_password.png": "forgot_password_en.png",
+    "forgot_password.png": "forgot_password_es.png",
-    "warningForgotPassword": "In a blockchain, there is no email recovery procedure. Only your recovery phrase can allow you to recover your Ğ1 at any time.",
+    "warningForgotPassword": "En una cadena de bloques o blockchain, no hay procedimiento de recuperación mediante correo electrónico. Sólo tu frase de recuperación puede permitirte recuperar tus Ğ1 en cualquier momento.",
     "fastAppDescription": "La aplicación de pago {}\nmás rápida que un reptil de Vietnam",
-    "createWallet": "Crear una billetera",
+    "createWallet": "Crear un monedero",
-    "restoreWallet": "Restaurar mis billeteras",
+    "restoreWallet": "Restaurar mis monederos",
     "parameters": "Parámetros",
-    "chooseAnotherMnemonic": "Choose an other\nmnemonic sentence",
+    "chooseAnotherMnemonic": "Elige otra frase de restauración",
-    "iNotedMyMnemonic": "He escrito mi frase",
+    "iNotedMyMnemonic": "He anotado mi frase de restauración",
-    "printMyMnemonic": "Print my mnemonic sentence",
+    "printMyMnemonic": "Imprimir mi frase de restauración",
-    "manageChest": "Configure this chest",
+    "manageChest": "Configurar este cofre",
-    "changeChest": "Change chest",
+    "changeChest": "Cambiar de cofre",
-    "geckoChest": "Ğecko chest",
+    "GeckoChest": "Cofre de Ğecko",
-    "toUnlockEnterPassword": "To unlock your safe, enter your secret code, away from prying lizards:",
+    "toUnlockEnterPassword": "Para desbloquear tu cofre, introduce tu contraseña, lejos de lagartijas curiosas:",
-    "rememberPassword": "Keep this code in memory for 15 minutes",
+    "rememberPassword": "Mantener en memoria mi contraseña durante 15 minutos",
-    "myRootWallet": "Mi billetera principal",
+    "myRootWallet": "Mi monedero principal",
-    "currentWallet": "My current chest",
+    "currentWallet": "Mi cofre actual",
-    "wallet": "Billetera",
+    "wallet": "monedero",
-    "displayMnemonic": "Display my mnemonic sentence",
+    "displayMnemonic": "Mostrar mi frase de restauración",
     "changePassword": "Cambiar mi contraseña",
-    "createDerivation": "Create a new derivation",
+    "createDerivation": "Crear una nueva derivación",
-    "createCustomDerivation": "Create a new custom derivation",
+    "createCustomDerivation": "Crear una nueva derivación personalizada",
-    "deleteChest": "Delete this chest",
+    "deleteChest": "Borrar este cofre",
-    "openThisChest": "Open this chest",
+    "openThisChest": "Abrir este cofre",
-    "createChest": "Create a new chest",
+    "createChest": "Crear un nuevo cofre",
-    "importChest": "Import a chest",
+    "importChest": "Importar un cofre",
-    "selectMyChest": "Select my chest",
+    "selectMyChest": "Seleccionar mi cofre",
-    "accessMyChest": "Access my chest",
+    "accessMyChest": "Acceder a mi cofre",
-    "manageMembership": "Manage my membership",
+    "manageMembership": "Administrar mi afiliación",
-    "chooseThisWallet": "Elegir esta billetera",
+    "chooseThisWallet": "Elegir este monedero",
-    "thisWalletIsDefault": "This wallet is the default one",
+    "thisWalletIsDefault": "Monedero definido por defecto",
-    "defineWalletAsDefault": "Define this as the default one",
+    "defineWalletAsDefault": "Definir este monedero como por defecto",
-    "displayActivity": "Display activity",
+    "displayActivity": "Visualizar actividad",
-    "displayNActivity": "Display\nactivity",
+    "displayNActivity": "Visualizar\nactividad",
     "memberValidated": "Miembro validado!",
-    "copyAddress": "Copiar\ndirección",
+    "copyAddress": "Copiar\nla dirección",
     "copy": "Copiar",
-    "thisAddressHasBeenCopiedToClipboard": "Esta dirección se ha copiado al cortapapeles",
+    "thisAddressHasBeenCopiedToClipboard": "Esta dirección se ha copiado al portapapeles",
-    "chooseWalletName": "Choose a new name\nfor your wallet:",
+    "chooseWalletName": "Elige un nuevo nombre\npara tu monedero:",
-    "choosePassword": "Choose a random password:",
+    "choosePassword": "Elige una contraseña aleatoria:",
-    "chooseDerivation": "Choose a derivation:",
+    "chooseDerivation": "Elige una derivación:",
     "validate": "Validar",
     "confirm": "Confirmar",
     "confirmPayment": "Confirmar pago",
-    "geckoGenerateYourWalletFromMnemonic": "Ğecko builds your wallet from a **restoration sentence**. It is a bit like the blueprint that builds your wallet.",
+    "GeckoGenerateYourWalletFromMnemonic": "Ğecko construye tu monedero a partir de una **frase de restauración**. Es como unos planos que permiten restaurar tu monedero.",
-    "keepThisMnemonicSecure": "Keep this sentence carefully, because without it Ğecko will not be able to rebuild your wallets the day you change your phone.",
+    "keepThisMnemonicSecure": "Guarda esta frase con cuidado, porque sin ella Ğecko no podrá restaurar tus monederos el día que cambies de dispositivo.",
-    "geckoGeneratedYourMnemonicKeepItSecret": "Ğecko generated your mnemonic successfully! Keep it secret, because anyone who knows it can access all your wallets.",
+    "GeckoGeneratedYourMnemonicKeepItSecret": "¡Ğecko generó tu frase de restauración con éxito! Mantenla en secreto, porque cualquiera que la sepa puede acceder a todos tus monederos.",
-    "newWallet": "New Wallet",
+    "newWallet": "Nuevo monedero",
-    "itsTimeToUseAPenAndPaper": "It's time to take a **pen and paper** in order to write down your mnemonic.",
+    "itsTimeToUseAPenAndPaper": "Es el momento de coger un **papel y un bolígrafo** para anotar tu frase de restauración.",
-    "yourMnemonic": "Your mnemonic",
+    "yourMnemonic": "tu frase de restauración",
-    "gecko_also_can_forget.png": "gecko_also_can_forget_en.png",
+    "gecko_also_can_forget.png": "gecko_also_can_forget_es.png",
-    "didYouNoteMnemonicToBeSureTypeWord": "Did you write down your menmonic?\n\n To be sure, please type the **{}th word** of your restoration phrase in the field below:",
+    "didYouNoteMnemonicToBeSureTypeWord": "¿Anotaste bien tu frase de restauración? Para asegurarnos, escriba la **palabra #{}** de tu frase de restauración en el cuadro de abajo:",
-    "geckoWillGenerateAPassword": "Gecko will now generate for you a short password that will allow you to quickly access your wallets, without having to type your recovery sentence every time.",
+    "GeckoWillGenerateAPassword": "Ahora Ğecko te generará una contraseña corta que te permitirá acceder rápidamente a tus monederos, sin tener que escribir cada vez tu frase de recuperación.",
-    "myPassword": "My password",
+    "myPassword": "Mi contraseña",
-    "thisPasswordProtectsYourWalletsInASecureChest": "This secret code protects your wallets in a safe **which only you have the code for**, so that your wallets cannot be used by others.",
+    "thisPasswordProtectsYourWalletsInASecureChest": "Esta contraseña protege tus monederos en un cofre **del que sólo tú tienes acceso**, para que tus monederos no puedan ser utilizados por otros.",
-    "hereIsThePasswordKeepIt": "And here is your password!\n\nMemorize it or write it down, because you will be asked **every time** you want to make a payment on this device.",
+    "hereIsThePasswordKeepIt": "¡Y aquí está tu contraseña!\n\nMemorízala o anótala, porque Ğecko te la pedirá **cada vez** que quieras hacer un pago en este dispositivo.",
     "chooseAnotherPassword": "Elige otra contraseña",
-    "iNotedMyPassword": "I noted my password",
+    "iNotedMyPassword": "He anotado mi contraseña",
-    "geckoWillCheckPassword": "Gecko will check with you if you have remembered your secret code.\n\n Type your secret code in the field below to check that you have written it down correctly.",
+    "GeckoWillCheckPassword": "Ğecko comprobará contigo si has recordado tu contraseña. Escribe tu contraseña en el cuadro de abajo para comprobar que lo has apuntado correctamente.",
-    "yourChestAndWalletWereCreatedSuccessfully": "Super!\n\nYour chest and your first portfolio have been created with great success.\n\nCongratulations!",
+    "yourChestAndWalletWereCreatedSuccessfully": "¡Genial!\n\nTu cofre y tu primer monedero han sido creados con éxito.\n\n¡Felicidades!",
-    "allGood": "That's all good!",
+    "allGood": "¡Todo bien!",
-    "areYouSureToDeleteWallet": "Are you sure you want to delete the chest \"{}\"?",
+    "areYouSureToDeleteWallet": "¿Seguro de que quieres eliminar el cofre \"{}\"?",
-    "areYouSureForgetAllChests": "Are you sure you want to forget all your chests?",
+    "areYouSureForgetAllChests": "¿Seguro de que quieres olvidar todos tus cofres?",
-    "areYouSureToForgetWallet": "Are you sure you wan to forget the wallet \"{}\"?",
+    "areYouSureToForgetWallet": "¿Seguro de que quieres olvidar el monedero \"{}\"?",
-    "areYouSureYouWantToCertify": "Are you sure you want to certify the address:\n\n{}",
+    "areYouSureYouWantToCertify": "¿Seguro de que quiere certificar a la dirección\n\n{}?",
-    "yes": "Si",
+    "areYouSureYouWantToCertify1": "¿Seguro de que quiere certificar a la identidad :",
+    "areYouSureYouWantToCertify2": " a la dirección :",
+    "yes": "Sí",
     "no": "No",
-    "keepYourMnemonicSecret": "Try to keep this phrase a secret, as it allows anyone who knows it to access all your wallets.",
+    "keepYourMnemonicSecret": "Intenta mantener esta frase de restauración en secreto, ya que permite a cualquiera que la conozca acceder a todas tus monederos.",
-    "iGeneratedYourMnemonicKeepItSecret": "I've generated your restoration phrase!\n Try to keep it a secret, as it allows anyone who knows it to access all your portfolios.",
+    "iGeneratedYourMnemonicKeepItSecret": "¡He generado tu frase de restauración!\nIntenta mantenerla en secreto, ya que permite a cualquiera que la conozca acceder a todos tus monederos.",
-    "myMnemonic": "My mnemonic",
+    "myMnemonic": "Mi frase de restauración",
-    "close": "Close",
+    "close": "Cerrar",
-    "toRestoreEnterMnemonic": "To restore your Gecko wallets, enter in the fields below the 12 words that constitute your restoration phrase:",
+    "toRestoreEnterMnemonic": "Para restaurar tus monederos Ğecko, introduce las 12 palabras que componen tu frase de restauración en los cuadros de abajo:",
-    "pasteFromClipboard": "Paste from\nclipboard",
+    "pasteFromClipboard": "Pegar del\nportapapeles",
-    "restoreAChest": "Restore a chest",
+    "restoreAChest": "Restaurar un cofre",
-    "restoreThisChest": "Restore this chest",
+    "restoreThisChest": "Restaurar este cofre",
     "continue": "Continuar",
-    "itsTheGoodWord": "It's the good word!",
+    "itsTheGoodWord": "¡Es la palabra correcta!",
-    "nthMnemonicWord": "word of your mnemonic",
+    "nthMnemonicWord": "palabra de tu mnemotecnia",
     "1th": "Primera",
     "2th": "Segunda",
     "3th": "Tercera",
@@ -98,17 +100,17 @@
     "11th": "Undécima",
     "12th": "Duodécima",
     "yourPasswordLengthIsX": "La longitud de tu contraseña es {}",
-    "noIdentity": "No identity",
+    "noIdentity": "Ninguna identidad",
     "identityCreated": "Identidad creada",
     "identityConfirmed": "Identidad confirmada",
-    "identityExpired": "Identitdad caducada",
+    "identityExpired": "Identidad caducada",
     "confirmYourIdentity": "Confirma tu identidad",
-    "noDuniterNodeAvailableTryLater": "No Duniter node available, please try again later",
+    "noDuniterNodeAvailableTryLater": "No hay ningún nodo Duniter disponible, por favor, inténtalo más tarde",
-    "youAreConnectedToNode": "You are connected to node",
+    "youAreConnectedToNode": "Estás conectado al nodo",
     "accountActivity": "Actividad de la cuenta",
-    "noNetworkNoHistory": "Network state does not allow\nto display account history",
+    "noNetworkNoHistory": "El estado de la red no permite\nmostrar el historial de la cuenta",
-    "noDataToDisplay": "No data to be displayed.",
+    "noDataToDisplay": "No hay datos que mostrar.",
-    "noTransactionToDisplay": "No transaction to display",
+    "noTransactionToDisplay": "No hay transacciónes a mostrar",
     "month1": "Enero",
     "month2": "Febrero",
     "month3": "Marzo",
@@ -124,76 +126,82 @@
     "today": "Hoy",
     "yesterday": "Ayer",
     "thisWeek": "Esta semana",
-    "chestNotCompatibleMustReinstallGecko": "The version of your safes is no longer compatible with this version of Ğecko.\nAll your safes will be forgotten, you must import them again.",
+    "chestNotCompatibleMustReinstallGecko": "La versión de tus cofres no es compatible con esta versión de Ğecko.\nTodos tus cofres serán olvidados, debes importarlos de nuevo.",
-    "notConnectedToInternet": "No estas conectado a internet",
+    "notConnectedToInternet": "No estás conectado a Internet",
-    "researchResults": "Results of your research",
+    "researchResults": "Resultados de tu búsqueda",
-    "resultsFor": "Results for ",
+    "resultsFor": "Resultados para ",
-    "forgetAllMyChests": "Forget all my chests",
+    "forgetAllMyChests": "Olvida todos mis cofres",
-    "transaction": "Transaccion",
+    "transaction": "Transacción",
-    "certification": "Certificacion",
+    "certification": "Certificación",
-    "identityConfirm": "Identity confirmation",
+    "identityConfirm": "Confirmación de la identidad",
-    "revokeAdhesion": "Adhesion revocation",
+    "revokeAdhesion": "Revocación de adhesión",
-    "strangeTransaction": "Strange transaction",
+    "strangeTransaction": "Transacción extraña",
     "sending": "Enviando...",
     "propagating": "Propagando...",
     "validating": "Validando...",
-    "anErrorOccurred": "Ocurrió un error",
+    "anErrorOccured": "Ocurrió un error",
-    "24hbetweenCerts": "You have to wait 24h between certs",
+    "24hbetweenCerts": "Hay que esperar 24 horas entre certificaciones",
-    "canNotCertifySelf": "You can not certify yourself",
+    "canNotCertifySelf": "No puedes certificarte a ti mismo",
-    "nameAlreadyExist": "This name is already taken",
+    "nameAlreadyExist": "Este nombre ya está ocupado",
-    "2GDtoKeepAlive": "You have to keep at least 2ĞD to keep your account alive",
+    "2GDtoKeepAlive": "Tienes que mantener al menos 2ĞD para mantener tu cuenta viva",
-    "youHaveToFeedThisAccountBeforeUsing": "You have to feed this account\nbefore using it.",
+    "youHaveToFeedThisAccountBeforeUsing": "Tienes que nutrir el balance\nde esta cuenta antes de usarla.",
-    "execTimeoutOver": "Execution timeout is over",
+    "execTimeoutOver": "Se ha agotado el tiempo de ejecución",
-    "seeAWallet": "Ver una billetera",
+    "seeAWallet": "Ver un monedero",
     "mustWaitXBeforeCertify": "Tienes que esperar\n{} antes de\nvolver a certificar",
-    "mustConfirmHisIdentity": "This person must confirm\nhis identity before can be\ncertified",
+    "mustConfirmHisIdentity": "Esta persona debe confirmar\nsu identidad antes de poder ser certificada",
-    "canRenewCertInX": "You can renew\nthis certification\nin {}",
+    "canRenewCertInX": "Podrás renovar\nla certificación\nen {}",
-    "executeATransfer": "Execute a transfer",
+    "executeATransfer": "Ejecutar una transacción",
-    "executeTheTransfer": "Execute the transfer",
+    "executeTheTransfer": "Ejecutar la transacción",
-    "doATransfer" : "Execute a\ntransfer",
+    "doATransfer" : "Hacer una\ntransacción",
     "seconds": "{} segundos",
     "minutes": "{} minutos",
     "hours": "{} horas {}",
     "days": "{} dias",
     "months": "{} meses",
-    "certify": "Certify",
+    "certify": "Certificar esta\nidentidad",
     "from": "De:",
     "to": "A:",
     "amount": "Importe:",
-    "choiceOfSourceWallet": "Choose a source wallet",
+    "choiceOfSourceWallet": "Elige un monedero de origen",
     "extrinsicInProgress": "{} en progreso",
-    "extrinsicValidated": "{} validado !",
+    "extrinsicValidated": "¡ {} validado !",
     "fromMinus": "de",
     "toMinus": "a",
-    "deleteThisWallet": "Delete this wallet",
+    "deleteThisWallet": "Borrar este monedero",
     "cancel": "Cancelar",
-    "inBlockchainResult": "In {} blockchain",
+    "inBlockchainResult": "En la blockchain {}",
-    "search": "Buscar",
+    "search": "Buscar una identidad\no una dirección",
-    "currencyNode": "{} nodo :",
+    "currencyNode": "Nodo {} :",
     "contactsManagementWithNbr": "Mis contactos ({})",
     "contactsManagement": "Mis contactos",
-    "noContacts": "You don't have any contact",
+    "noContacts": "No tienes ningún contacto",
-    "addContact": "Add\nto contacts",
+    "addContact": "Añadir\na contactos",
-    "removeContact": "Remove\nthis contact",
+    "removeContact": "Eliminar\neste contacto",
-    "derivationsScanProgress": "Scan address {}/{}",
+    "derivationsScanProgress": "Escaneado de la dirección {}/{}",
-    "youAreOffline": "You are offline...",
+    "youAreOffline": "Estás desconectado...",
-    "importG1v1": "Import old G1v1 account",
+    "importG1v1": "Importar la cuenta antigua de G1v1",
-    "selectDestWallet": "Select a target wallet:",
+    "selectDestWallet": "Selecciona un monedero destino:",
-    "youMustWaitBeforeCashoutThisAccount": "You have to wait a few moment before migrate this account",
+    "youMustWaitBeforeCashoutThisAccount": "Tienes que esperar unos minutos antes de migrar esta cuenta",
-    "thisAccountIsEmpty": "This account is empty",
+    "thisAccountIsEmpty": "Esta cuenta está vacía",
-    "youCannotMigrateIdentityToExistingIdentity": "You cannot migrate an identity\nto an account that already has an identity",
+    "youCannotMigrateIdentityToExistingIdentity": "No se puede migrar una identidad\na una cuenta que ya tiene una identidad",
-    "importOldAccount": "Import your old account",
+    "importOldAccount": "Importar antigua cuenta",
-    "enterCesiumId": "Ingrese su ID de Cesium",
+    "enterCesiumId": "Ingresa tu frase secreta de Cesium",
-    "enterCesiumPassword": "Ingrese su contraseña de Cesium",
+    "enterCesiumPassword": "Ingresa tu contraseña de Cesium",
-    "migrateAccount": "Migrate account",
+    "migrateAccount": "Migrar cuenta",
-    "migrateIdentity": "Migrate identity",
+    "migrateIdentity": "Migrar identidad",
-    "identityMigration": "Identity migration",
+    "identityMigration": "Migración de la identidad",
-    "areYouSureMigrateIdentity": "Are you sure you want to permanently migrate identity **{}** with balance of **{}** ?",
+    "areYouSureMigrateIdentity": "¿Estás seguro de que quieres migrar permanentemente la identidad **{}** con saldo de **{}**?",
-    "someoneCreatedYourIdentity": "Someone created your {} identity !",
+    "someoneCreatedYourIdentity": "¡ Alguien ha creado tu {} identidad !",
     "confirmMyIdentity": "Confirmar mi identidad",
     "revokeMyIdentity": "Revocar mi identidad",
-    "youCannotRevokeThisIdentity": "You cannot revoke this identity while\nit is member of the blacksmiths web",
+    "youCannotRevokeThisIdentity": "No puedes revocar esta identidad mientras\nseas miembro de la red de forjadores",
-    "showUdAmounts": "Show amounts in UD",
+    "showUdAmounts": "Mostrar importes en DU",
-    "ud": "{}UD",
+    "ud": "{}DU",
-    "chooseATargetWallet": "Elija una billetera de destino"
+    "chooseATargetWallet": "Elige un monedero de destino",
+    "thisMnemonicHasBeenCopiedToClipboard": "This mnemonic has been copied to clipboard",
+    "smithCantMigrateIdentity":"You can't migrate this identity while you're member of smith web",
+    "received": "Received",
+    "sent": "Sent",
+    "createIdentity": "Create a new \nidentity",
+    "memberAccountOf": "Account of {}"
 }

assets/translations/fr.json

@@ -66,12 +66,13 @@
     "chooseAnotherPassword": "Choisir un autre code secret",
     "iNotedMyPassword": "J'ai noté mon code secret",
     "geckoWillCheckPassword": "Gecko va vérifier avec vous si vous avez bien mémorisé votre code secret.\n\nTapez votre code secret dans le champ ci-dessous pour vérifier que vous l’avez bien noté.",
-    "yourChestAndWalletWereCreatedSuccessfully": "Top !\n\nVotre coffre votre premier portefeuille ont été créés avec un immense succès.\n\nFélicitations !",
+    "yourChestAndWalletWereCreatedSuccessfully": "Top !\n\nVotre coffre et votre premier portefeuille ont été créés avec un immense succès.\n\nFélicitations !",
     "allGood": "C’est tout bon !",
     "areYouSureToDeleteWallet": "Êtes-vous sûr de vouloir supprimer le coffre \"{}\" ?",
     "areYouSureForgetAllChests": "Êtes-vous sûr de vouloir oublier tous vos coffres ?",
     "areYouSureToForgetWallet": "Êtes-vous sûr de vouloir oublier le portefeuille \"{}\" ?",
-    "areYouSureYouWantToCertify": "Êtes-vous certain de vouloir certifier l'adresse:\n\n{}",
+    "areYouSureYouWantToCertify1": "Êtes-vous certain de vouloir certifier l'identité :",
+    "areYouSureYouWantToCertify2": "ayant pour adresse :",
     "yes": "Oui",
     "no": "Non",
     "keepYourMnemonicSecret": "Tâchez de garder cette phrase bien secrète, car elle permet à quiconque la connaît d’accéder à tous vos portefeuilles.",
@@ -157,7 +158,7 @@
     "hours": "{} heures {}",
     "days": "{} jours",
     "months": "{} mois",
-    "certify": "Certifier",
+    "certify": "Certifier cette\nidentité",
     "from": "Depuis:",
     "to": "Vers:",
     "amount": "Montant:",
@@ -169,7 +170,7 @@
     "deleteThisWallet": "Supprimer ce portefeuille",
     "cancel": "Annuler",
     "inBlockchainResult": "Dans la blockchain {}",
-    "search": "Rechercher",
+    "search": "Rechercher une identité\nou une adresse",
     "currencyNode": "Noeud {} :",
     "contactsManagementWithNbr": "Mes contacts ({})",
     "contactsManagement": "Mes contacts",
@@ -180,7 +181,7 @@
     "youAreOffline": "Vous êtes hors ligne...",
     "importG1v1": "Importer un ancien compte G1v1",
     "selectDestWallet": "Sélectionnez un portefeuille cible:",
-    "youMustWaitBeforeCashoutThisAccount": "Vous devez attendre quelques minutes avant de pouvoir migrer ce compte",
+    "youMustWaitBeforeCashoutThisAccount": "Vous devez attendre quelques minutes\navant de pouvoir migrer ce compte",
     "thisAccountIsEmpty": "Ce compte est vide",
     "youCannotMigrateIdentityToExistingIdentity": "Vous ne pouvez pas migrer une identité\nvers un compte disposant déjà d'une identité",
     "importOldAccount": "Importer son ancien compte",
@@ -196,5 +197,11 @@
     "youCannotRevokeThisIdentity": "Vous ne pouvez pas révoquer cette identité tant\nqu'elle fait partie de la toile forgerons",
     "showUdAmounts": "Afficher les montants en DU",
     "ud": "{}DU",
-    "chooseATargetWallet": "Choisissez un portefeuille cible"
+    "chooseATargetWallet": "Choisissez un portefeuille cible",
-}
+    "thisMnemonicHasBeenCopiedToClipboard": "Cette phrase secrète viens d'être copié dans votre presse-papier.",
+    "smithCantMigrateIdentity":"Vous ne pouvez pas migrer cette identité\ntant que vous êtes dans la toile forgerons",
+    "received": "Reçus",
+    "sent": "Envoyés",
+    "createIdentity": "Créer sa nouvelle\nidentité",
+    "memberAccountOf": "Compte de {}"
+}

config/gdev_endpoints.json

@@ -1,3 +1,4 @@
 [
+      "wss://gdev.p2p.legal/ws",
       "wss://gdev.librelois.fr/ws"
 ]

integration_test/scenarios/migrate_cesium_identity.dart

@@ -26,7 +26,7 @@ void main() async {
     await tapKey(keyImportG1v1);
     await enterText(keyCesiumId, 'test');
     await enterText(keyCesiumPassword, 'test');
-    await waitFor(cesiumTest1.shortAddress());
+    await waitFor('DCovzCEnQm9GUWe6mr8u42JR1JAuoj3HbQUGdCkfTzSr');
     await waitFor('100.0');
     await waitFor('3', exactMatch: true);
 

integration_test/utility/tests_utility.dart

@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:gecko/globals.dart';
@@ -135,7 +136,7 @@ Future<void> waitFor(String text,
   Finder finder = exactMatch ? find.text(text) : find.textContaining(text);
   log.d('INTEGRATION TEST: Wait for: $text');
 
-  final String searchType = reverse ? 'reversed text' : 'text';
+  final searchType = reverse ? 'reversed text' : 'text';
 
   do {
     if (DateTime.now().isAfter(end)) {
@@ -258,14 +259,14 @@ Future<WalletData> _addImportAccount(
   final address = await sub.importAccount(
       mnemonic: mnemonic, derivePath: '//$derivation', password: 'AAAAA');
   final myWallet = WalletData(
-      version: dataVersion,
       chest: chest,
       address: address,
       number: number,
       name: name,
       derivation: derivation,
-      imageDefaultPath: '${number % 4}.png');
+      imageDefaultPath: '${number % 4}.png',
-  await walletBox.add(myWallet);
+      isOwned: true);
+  await walletBox.put(myWallet.address, myWallet);
 
   return myWallet;
 }

lib/globals.dart

@@ -7,7 +7,7 @@ import 'package:hive_flutter/hive_flutter.dart';
 import 'package:logger/logger.dart';
 
 // Version of box data
-const int dataVersion = 4;
+const int dataVersion = 6;
 
 late String appVersion;
 const int pinLength = 5;
@@ -50,3 +50,8 @@ const debugPin = true;
 String indexerEndpoint = '';
 late double balanceRatio;
 late int udValue;
+
+// Indexer
+late DateTime startBlockchainTime;
+
+late int currentUdIndex;

lib/main.dart

@@ -15,13 +15,15 @@
 
 import 'dart:async';
 import 'dart:io';
+
 import 'package:flutter/services.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:gecko/globals.dart';
-import 'package:gecko/providers/cesium_plus.dart';
 import 'package:gecko/models/chest_data.dart';
-import 'package:gecko/providers/chest_provider.dart';
 import 'package:gecko/models/g1_wallets_list.dart';
+import 'package:gecko/models/wallet_data.dart';
+import 'package:gecko/providers/cesium_plus.dart';
+import 'package:gecko/providers/chest_provider.dart';
 import 'package:gecko/providers/duniter_indexer.dart';
 import 'package:gecko/providers/generate_wallets.dart';
 import 'package:gecko/providers/settings_provider.dart';
@@ -30,7 +32,6 @@ import 'package:gecko/providers/wallets_profiles.dart';
 import 'package:gecko/providers/home.dart';
 import 'package:gecko/providers/my_wallets.dart';
 import 'package:gecko/providers/search.dart';
-import 'package:gecko/models/wallet_data.dart';
 import 'package:gecko/providers/wallet_options.dart';
 import 'package:gecko/screens/home.dart';
 import 'package:flutter/material.dart';
@@ -61,29 +62,17 @@ Future<void> main() async {
   await homeProvider.initHive();
   appVersion = await homeProvider.getAppVersion();
 
-  // Reset GraphQL cache
-  // final cache = HiveStore();
-  // cache.reset();
-
   // Configure Hive and open boxes
   Hive.registerAdapter(WalletDataAdapter());
   Hive.registerAdapter(ChestDataAdapter());
   Hive.registerAdapter(G1WalletsListAdapter());
   Hive.registerAdapter(IdAdapter());
 
-  walletBox = await Hive.openBox<WalletData>("walletBox");
   chestBox = await Hive.openBox<ChestData>("chestBox");
-  configBox = await Hive.openBox("configBox");
-  await Hive.deleteBoxFromDisk('g1WalletsBox');
-  g1WalletsBox = await Hive.openBox<G1WalletsList>("g1WalletsBox");
-  contactsBox = await Hive.openBox<G1WalletsList>("contactsBox");
 
-  await homeProvider.getValidEndpoints();
+  // Reset GraphQL cache
-  // await configBox.delete('isCacheChecked');
+  // final cache = HiveStore();
-  if (configBox.get('isCacheChecked') == null) {
+  // cache.reset();
-    configBox.put('isCacheChecked', false);
-  }
-  // log.d(await configBox.get('endpoint'));
 
   HttpOverrides.global = MyHttpOverrides();
 
@@ -98,31 +87,35 @@ Future<void> main() async {
     // // ]);
     // Catcher(rootWidget: Gecko(endPointGVA, _store), debugConfig: debugOptions);
 
-    await SentryFlutter.init(
+    await SentryFlutter.init((options) {
-      (options) {
+      options.dsn =
-        options.dsn =
+          'https://c09587b46eaa42e8b9fda28d838ed180@o496840.ingest.sentry.io/5572110';
-            'https://c09587b46eaa42e8b9fda28d838ed180@o496840.ingest.sentry.io/5572110';
+    },
-      },
+        appRunner: () => SystemChrome.setPreferredOrientations(
-      appRunner: () => runApp(
+                [DeviceOrientation.portraitUp]).then((_) {
-        EasyLocalization(
+              runApp(EasyLocalization(
-          supportedLocales: const [Locale('en'), Locale('fr'), Locale('es')],
+                supportedLocales: const [
-          path: 'assets/translations',
+                  Locale('en'),
-          fallbackLocale: const Locale('en'),
+                  Locale('fr'),
-          child: const Gecko(),
+                  Locale('es')
-        ),
+                ],
-      ),
+                path: 'assets/translations',
-    );
+                fallbackLocale: const Locale('en'),
+                child: const Gecko(),
+              ));
+            }));
   } else {
     log.i('Debug mode enabled: No sentry alerte');
 
-    runApp(
+    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp])
-      EasyLocalization(
+        .then((_) {
+      runApp(EasyLocalization(
         supportedLocales: const [Locale('en'), Locale('fr'), Locale('es')],
         path: 'assets/translations',
         fallbackLocale: const Locale('en'),
         child: const Gecko(),
-      ),
+      ));
-    );
+    });
   }
 }
 
@@ -131,8 +124,6 @@ class Gecko extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
-
     // To configure multi_endpoints GraphQLProvider: https://stackoverflow.com/q/70656513/8301867
 
     return MultiProvider(

lib/models/chest_data.dart

@@ -1,7 +1,5 @@
 import 'dart:io';
-
 import 'package:hive_flutter/hive_flutter.dart';
-
 part 'chest_data.g.dart';
 
 @HiveType(typeId: 1)

lib/models/queries_indexer.dart

@@ -56,5 +56,43 @@ query ($address: String!, $number: Int!, $cursor: String) {
 }
 ''';
 
-// To parse indexer date format
+const String getCertsReceived = r'''
-// log.d(DateTime.parse("2022-06-13T16:51:24.001+00:00").toString());
+query ($address: String!) {
+  certification(where: {receiver: {pubkey: {_eq: $address}}}) {
+    issuer {
+      pubkey
+      name
+    }
+    created_at
+  }
+}
+''';
+
+const String getCertsSent = r'''
+query ($address: String!) {
+  certification(where: {issuer: {pubkey: {_eq: $address}}}) {
+    receiver {
+      pubkey
+      name
+    }
+    created_at
+  }
+}
+''';
+
+const String isIdtyExistQ = r'''
+query ($name: String!) {
+  identity(where: {name: {_eq: $name}}) {
+    name
+  }
+}
+''';
+
+const String getBlockchainStartQ = r'''
+query {
+  block(limit: 1) {
+    created_at
+    number
+  }
+}
+''';

lib/models/wallet_data.dart

@@ -4,38 +4,42 @@ part 'wallet_data.g.dart';
 @HiveType(typeId: 0)
 class WalletData extends HiveObject {
   @HiveField(0)
-  int? version;
+  String address;
 
   @HiveField(1)
   int? chest;
 
   @HiveField(2)
-  String? address;
-
-  @HiveField(3)
   int? number;
 
-  @HiveField(4)
+  @HiveField(3)
   String? name;
 
-  @HiveField(5)
+  @HiveField(4)
   int? derivation;
 
-  @HiveField(6)
+  @HiveField(5)
   String? imageDefaultPath;
 
-  @HiveField(7)
+  @HiveField(6)
   String? imageCustomPath;
 
+  @HiveField(7)
+  bool isOwned;
+
+  @HiveField(8)
+  bool isMember;
+
   WalletData(
-      {this.version,
+      {required this.address,
       this.chest,
-      this.address,
       this.number,
       this.name,
       this.derivation,
       this.imageDefaultPath,
-      this.imageCustomPath});
+      this.imageCustomPath,
+      this.isOwned = false,
+      this.isMember = false});
 
   // representation of WalletData when debugging
   @override

lib/models/wallet_data.g.dart

@@ -17,37 +17,40 @@ class WalletDataAdapter extends TypeAdapter<WalletData> {
       for (int i = 0; i < numOfFields; i++) reader.readByte(): reader.read(),
     };
     return WalletData(
-      version: fields[0] as int?,
+      address: fields[0] as String,
       chest: fields[1] as int?,
-      address: fields[2] as String?,
+      number: fields[2] as int?,
-      number: fields[3] as int?,
+      name: fields[3] as String?,
-      name: fields[4] as String?,
+      derivation: fields[4] as int?,
-      derivation: fields[5] as int?,
+      imageDefaultPath: fields[5] as String?,
-      imageDefaultPath: fields[6] as String?,
+      imageCustomPath: fields[6] as String?,
-      imageCustomPath: fields[7] as String?,
+      isOwned: fields[7] as bool,
+      isMember: fields[8] as bool,
     );
   }
 
   @override
   void write(BinaryWriter writer, WalletData obj) {
     writer
-      ..writeByte(8)
+      ..writeByte(9)
       ..writeByte(0)
-      ..write(obj.version)
+      ..write(obj.address)
       ..writeByte(1)
       ..write(obj.chest)
       ..writeByte(2)
-      ..write(obj.address)
-      ..writeByte(3)
       ..write(obj.number)
-      ..writeByte(4)
+      ..writeByte(3)
       ..write(obj.name)
-      ..writeByte(5)
+      ..writeByte(4)
       ..write(obj.derivation)
-      ..writeByte(6)
+      ..writeByte(5)
       ..write(obj.imageDefaultPath)
+      ..writeByte(6)
+      ..write(obj.imageCustomPath)
       ..writeByte(7)
-      ..write(obj.imageCustomPath);
+      ..write(obj.isOwned)
+      ..writeByte(8)
+      ..write(obj.isMember);
   }
 
   @override

lib/models/widgets_keys.dart

@@ -61,6 +61,9 @@ const keyCloseTransactionScreen = Key('keyCloseTransactionScreen');
 const keyListTransactions = Key('keyListTransactions');
 const keyActivityScreen = Key('keyActivityScreen');
 
+// Certification view
+const keyCertsReceived = Key('keyCertsReceived');
+
 // Unlock wallet
 const keyUnlockWallet = Key('keyUnlockWallet');
 const keyPinForm = Key('keyPinForm');

lib/providers/cesium_plus.dart

@@ -8,8 +8,6 @@ import 'package:path_provider/path_provider.dart';
 
 class CesiumPlusProvider with ChangeNotifier {
   TextEditingController cesiumName = TextEditingController();
-  Image defaultAvatar(double size) =>
-      Image.asset(('assets/icon_user.png'), height: size);
 
   CancelToken avatarCancelToken = CancelToken();
 
@@ -156,3 +154,6 @@ class CesiumPlusProvider with ChangeNotifier {
     return finalAvatar;
   }
 }
+
+Image defaultAvatar(double size) =>
+    Image.asset(('assets/icon_user.png'), height: size);

lib/providers/chest_provider.dart

@@ -16,11 +16,11 @@ class ChestProvider with ChangeNotifier {
 
   Future deleteChest(context, ChestData chest) async {
     final bool? answer = await (_confirmDeletingChest(context, chest.name));
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
     if (answer ?? false) {
       await sub.deleteAccounts(getChestWallets(chest));
       await chestBox.delete(chest.key);
-      MyWalletsProvider myWalletProvider =
+      final myWalletProvider =
           Provider.of<MyWalletsProvider>(context, listen: false);
 
       myWalletProvider.pinCode = '';
@@ -45,7 +45,7 @@ class ChestProvider with ChangeNotifier {
     log.d(chest.key);
     walletBox.toMap().forEach((key, WalletData value) {
       if (value.chest == chest.key) {
-        toDelete.add(value.address!);
+        toDelete.add(value.address);
       }
     });
     return toDelete;

lib/providers/duniter_indexer.dart

@@ -5,18 +5,15 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:gecko/globals.dart';
-import 'package:gecko/models/g1_wallets_list.dart';
 import 'package:gecko/models/queries_indexer.dart';
-import 'package:gecko/models/wallet_data.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/cesium_plus.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
-import 'package:gecko/providers/wallet_options.dart';
 import 'package:gecko/providers/wallets_profiles.dart';
 import 'package:gecko/screens/wallet_view.dart';
+import 'package:gecko/widgets/balance.dart';
 import 'package:graphql_flutter/graphql_flutter.dart';
 import 'package:provider/provider.dart';
-import 'package:truncate/truncate.dart';
 
 class DuniterIndexer with ChangeNotifier {
   Map<String, String?> walletNameIndexer = {};
@@ -27,6 +24,7 @@ class DuniterIndexer with ChangeNotifier {
   List? transBC;
   List listIndexerEndpoints = [];
   bool isLoadingIndexer = false;
+  Map<String, String> idtyStatusCache = {};
 
   void reload() {
     notifyListeners();
@@ -155,102 +153,12 @@ class DuniterIndexer with ChangeNotifier {
     return indexerEndpoint;
   }
 
-  Widget getNameByAddress(BuildContext context, String address,
-      [WalletData? wallet,
-      double size = 20,
-      bool canEdit = false,
-      Color color = Colors.black,
-      FontWeight fontWeight = FontWeight.w400,
-      FontStyle fontStyle = FontStyle.italic]) {
-    WalletOptionsProvider walletOptions =
-        Provider.of<WalletOptionsProvider>(context, listen: false);
-    if (indexerEndpoint == '') {
-      if (wallet == null) {
-        return const SizedBox();
-      } else {
-        if (canEdit) {
-          return walletOptions.walletName(context, wallet, size, color);
-        } else {
-          return walletOptions.walletNameController(context, wallet, size);
-        }
-      }
-    }
-    final httpLink = HttpLink(
-      '$indexerEndpoint/v1/graphql',
-    );
-
-    final client = ValueNotifier(
-      GraphQLClient(
-        cache: GraphQLCache(store: HiveStore()),
-        link: httpLink,
-      ),
-    );
-    return GraphQLProvider(
-      client: client,
-      child: Query(
-          options: QueryOptions(
-            document: gql(
-                getNameByAddressQ), // this is the query string you just created
-            variables: {
-              'address': address,
-            },
-            // pollInterval: const Duration(seconds: 10),
-          ),
-          builder: (QueryResult result,
-              {VoidCallback? refetch, FetchMore? fetchMore}) {
-            if (result.hasException) {
-              return Text(result.exception.toString());
-            }
-
-            if (result.isLoading) {
-              return const Text('Loading');
-            }
-
-            walletNameIndexer[address] =
-                result.data?['account_by_pk']?['identity']?['name'];
-
-            g1WalletsBox.put(
-                address,
-                G1WalletsList(
-                    address: address, username: walletNameIndexer[address]));
-
-            // log.d(g1WalletsBox.toMap().values.first.username);
-
-            if (walletNameIndexer[address] == null) {
-              if (wallet == null) {
-                return const SizedBox();
-              } else {
-                if (canEdit) {
-                  return walletOptions.walletName(context, wallet, size, color);
-                } else {
-                  return walletOptions.walletNameController(
-                      context, wallet, size);
-                }
-              }
-            }
-
-            return Text(
-              color == Colors.grey[700]!
-                  ? '(${walletNameIndexer[address]!})'
-                  : truncate(walletNameIndexer[address]!, 20),
-              style: TextStyle(
-                fontSize: size,
-                color: color,
-                fontWeight: fontWeight,
-                fontStyle: fontStyle,
-              ),
-            );
-          }),
-    );
-  }
-
   Widget searchIdentity(BuildContext context, String name) {
     // WalletOptionsProvider _walletOptions =
     //     Provider.of<WalletOptionsProvider>(context, listen: false);
-    CesiumPlusProvider cesiumPlusProvider =
-        Provider.of<CesiumPlusProvider>(context, listen: false);
     WalletsProfilesProvider walletsProfiles =
         Provider.of<WalletsProfilesProvider>(context, listen: false);
+    final duniterIndexer = Provider.of<DuniterIndexer>(context, listen: false);
     if (indexerEndpoint == '') {
       return const Text('Aucun résultat');
     }
@@ -294,6 +202,11 @@ class DuniterIndexer with ChangeNotifier {
               return Text('noResult'.tr());
             }
 
+            for (Map profile in identities) {
+              duniterIndexer.walletNameIndexer
+                  .putIfAbsent(profile['pubkey'], () => profile['name']);
+            }
+
             double avatarSize = 55;
             return Expanded(
               child: ListView(children: <Widget>[
@@ -304,7 +217,7 @@ class DuniterIndexer with ChangeNotifier {
                         key: keySearchResult(profile['pubkey']),
                         horizontalTitleGap: 40,
                         contentPadding: const EdgeInsets.all(5),
-                        leading: cesiumPlusProvider.defaultAvatar(avatarSize),
+                        leading: defaultAvatar(avatarSize),
                         title: Row(children: <Widget>[
                           Text(getShortPubkey(profile['pubkey']),
                               style: const TextStyle(
@@ -321,7 +234,8 @@ class DuniterIndexer with ChangeNotifier {
                                 Column(
                                     mainAxisAlignment: MainAxisAlignment.center,
                                     children: [
-                                      balance(context, profile['pubkey'], 16),
+                                      Balance(
+                                          address: profile['pubkey'], size: 16),
                                     ]),
                               ]),
                         ),
@@ -340,10 +254,7 @@ class DuniterIndexer with ChangeNotifier {
                               walletsProfiles.address = profile['pubkey'];
                               return WalletViewScreen(
                                 address: profile['pubkey'],
-                                username: g1WalletsBox
+                                username: name,
-                                    .get(profile['pubkey'])
-                                    ?.id
-                                    ?.username,
                                 avatar:
                                     g1WalletsBox.get(profile['pubkey'])?.avatar,
                               );
@@ -369,8 +280,8 @@ class DuniterIndexer with ChangeNotifier {
       transBC.add(i);
       transBC[i] = [];
       transBC[i].add(DateTime.parse(transaction['created_at']));
-      final int amountBrut = transaction['amount'];
+      final amountBrut = transaction['amount'];
-      final double amount = removeDecimalZero(amountBrut / 100);
+      final amount = removeDecimalZero(amountBrut / 100);
       if (direction == "RECEIVED") {
         transBC[i].add(transaction['issuer_pubkey']);
         transBC[i].add(transaction['issuer']['identity']?['name'] ?? '');
@@ -443,7 +354,37 @@ class DuniterIndexer with ChangeNotifier {
     String result = n.toStringAsFixed(n.truncateToDouble() == n ? 0 : 2);
     return double.parse(result);
   }
-
+}
-  // checkHistoryResult(
+
-  //     QueryResult<Object?> result, FetchMoreOptions options, String address) {}
+//// Manuals queries
+
+Future<bool> isIdtyExist(String name) async {
+  final variables = <String, dynamic>{
+    'name': name,
+  };
+  final result = await _execQuery(isIdtyExistQ, variables);
+  return result.data!['identity']?.isEmpty ?? false ? false : true;
+}
+
+Future<DateTime> getBlockStart() async {
+  final result = await _execQuery(getBlockchainStartQ, {});
+  startBlockchainTime = DateTime.parse(result.data!['block'][0]['created_at']);
+  return startBlockchainTime;
+}
+
+Future<QueryResult> _execQuery(
+    String query, Map<String, dynamic> variables) async {
+  final httpLink = HttpLink(
+    '$indexerEndpoint/v1/graphql',
+  );
+
+  final GraphQLClient client = GraphQLClient(
+    cache: GraphQLCache(),
+    link: httpLink,
+  );
+
+  final QueryOptions options =
+      QueryOptions(document: gql(query), variables: variables);
+
+  return await client.query(options);
 }

lib/providers/generate_wallets.dart

@@ -249,7 +249,7 @@ class GenerateWalletsProvider with ChangeNotifier {
   }
 
   Future<List<String>> generateWordList(BuildContext context) async {
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
 
     generatedMnemonic = await sub.generateMnemonic(lang: appLang);
     List<String> wordsList = [];
@@ -369,7 +369,7 @@ class GenerateWalletsProvider with ChangeNotifier {
   }
 
   Future<bool> scanDerivations(BuildContext context) async {
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
     final currentChestNumber = configBox.get('currentChest');
     bool isAlive = false;
     scanedValidWalletNumber = 0;
@@ -414,14 +414,14 @@ class GenerateWalletsProvider with ChangeNotifier {
             password: pin.text);
 
         WalletData myWallet = WalletData(
-            version: dataVersion,
             chest: currentChestNumber,
             address: addressData.address!,
             number: scanedValidWalletNumber,
             name: walletName,
             derivation: derivationNbr,
-            imageDefaultPath: '${scanedValidWalletNumber % 4}.png');
+            imageDefaultPath: '${scanedValidWalletNumber % 4}.png',
-        await walletBox.add(myWallet);
+            isOwned: true);
+        await walletBox.put(myWallet.address, myWallet);
         scanedValidWalletNumber = scanedValidWalletNumber + 1;
       }
       scanedWalletNumber = scanedWalletNumber + 1;
@@ -445,6 +445,8 @@ class GenerateWalletsProvider with ChangeNotifier {
           onTimeout: () => {},
         );
 
+    log.d(balance);
+
     log.d(
         "${addressData.address!}: ${balance['transferableBalance']} $currencyName");
     if (balance['transferableBalance'] != 0) {
@@ -452,14 +454,14 @@ class GenerateWalletsProvider with ChangeNotifier {
       await sub.importAccount(mnemonic: generatedMnemonic!, password: pin.text);
 
       WalletData myWallet = WalletData(
-          version: dataVersion,
           chest: currentChestNumber,
           address: addressData.address!,
           number: 0,
           name: walletName,
           derivation: -1,
-          imageDefaultPath: '0.png');
+          imageDefaultPath: '0.png',
-      await walletBox.add(myWallet);
+          isOwned: true);
+      await walletBox.put(myWallet.address, myWallet);
       return true;
     } else {
       return false;

lib/providers/home.dart

@@ -8,17 +8,11 @@ import 'dart:math';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+
 import 'dart:async';
 import 'package:gecko/globals.dart';
-import 'package:gecko/models/wallet_data.dart';
-import 'package:gecko/models/widgets_keys.dart';
-import 'package:gecko/providers/my_wallets.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
 import 'package:gecko/providers/wallet_options.dart';
-import 'package:gecko/providers/wallets_profiles.dart';
-import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
-import 'package:gecko/screens/myWallets/wallets_home.dart';
-import 'package:gecko/screens/search.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:flutter/foundation.dart' show kDebugMode, kIsWeb;
 import 'package:path_provider/path_provider.dart' as pp;
@@ -33,6 +27,7 @@ class HomeProvider with ChangeNotifier {
   Widget appBarTitle = Text('Ğecko', style: TextStyle(color: Colors.grey[850]));
   String homeMessage = "loading".tr();
   String defaultMessage = "noLizard".tr();
+  bool isWalletBoxInit = false;
 
   Future<void> initHive() async {
     late Directory hivePath;
@@ -67,9 +62,11 @@ class HomeProvider with ChangeNotifier {
 
   Future changeCurrencyUnit(BuildContext context) async {
     final sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final walletOptions =
+        Provider.of<WalletOptionsProvider>(context, listen: false);
     final bool isUdUnit = configBox.get('isUdUnit') ?? false;
     await configBox.put('isUdUnit', !isUdUnit);
-    balanceCache = {};
+    walletOptions.balanceCache = {};
     sub.getBalanceRatio();
     notifyListeners();
   }
@@ -132,104 +129,6 @@ class HomeProvider with ChangeNotifier {
   //       volume: volume, mode: PlayerMode.LOW_LATENCY, stayAwake: false);
   // }
 
-  Widget bottomAppBar(BuildContext context) {
-    MyWalletsProvider myWalletProvider =
-        Provider.of<MyWalletsProvider>(context, listen: false);
-    WalletsProfilesProvider historyProvider =
-        Provider.of<WalletsProfilesProvider>(context, listen: false);
-
-    final size = MediaQuery.of(context).size;
-
-    const bool showBottomBar = true;
-
-    return Visibility(
-      visible: showBottomBar,
-      child: Container(
-        color: yellowC,
-        width: size.width,
-        height: 80,
-        child:
-            // Stack(
-            //   children: [
-            //     // CustomPaint(
-            //     //   size: Size(size.width, 110),
-            //     //   painter: CustomRoundedButton(),
-            //     // ),
-            Row(mainAxisAlignment: MainAxisAlignment.start, children: [
-          // SizedBox(width: 0),
-          const Spacer(),
-          const SizedBox(width: 11),
-          IconButton(
-            key: keyAppBarSearch,
-            iconSize: 40,
-            icon: const Image(image: AssetImage('assets/loupe-noire.png')),
-            onPressed: () {
-              Navigator.popUntil(
-                context,
-                ModalRoute.withName('/'),
-              );
-              Navigator.push(
-                context,
-                MaterialPageRoute(builder: (homeContext) {
-                  return const SearchScreen();
-                }),
-              );
-            },
-          ),
-          const SizedBox(width: 22),
-          const Spacer(),
-          IconButton(
-            key: keyAppBarQrcode,
-            iconSize: 70,
-            icon: const Image(image: AssetImage('assets/qrcode-scan.png')),
-            onPressed: () async {
-              Navigator.popUntil(
-                context,
-                ModalRoute.withName('/'),
-              );
-              historyProvider.scan(homeContext);
-            },
-          ),
-          const Spacer(),
-          const SizedBox(width: 15),
-          IconButton(
-            key: keyAppBarChest,
-            iconSize: 60,
-            icon: const Image(image: AssetImage('assets/wallet.png')),
-            onPressed: () async {
-              WalletData? defaultWallet = myWalletProvider.getDefaultWallet();
-              String? pin;
-              if (myWalletProvider.pinCode == '') {
-                pin = await Navigator.push(
-                  context,
-                  MaterialPageRoute(
-                    builder: (homeContext) {
-                      return UnlockingWallet(wallet: defaultWallet);
-                    },
-                  ),
-                );
-              }
-
-              if (pin != null || myWalletProvider.pinCode != '') {
-                Navigator.popUntil(
-                  context,
-                  ModalRoute.withName('/'),
-                );
-                Navigator.push(
-                  context,
-                  MaterialPageRoute(builder: (context) {
-                    return const WalletsHome();
-                  }),
-                );
-              }
-            },
-          ),
-          const Spacer(),
-        ]),
-      ),
-    );
-  }
-
   void reload() {
     notifyListeners();
   }

lib/providers/my_wallets.dart

@@ -15,6 +15,8 @@ class MyWalletsProvider with ChangeNotifier {
   bool isNewDerivationLoading = false;
   String lastFlyBy = '';
   String dragAddress = '';
+  bool isPinValid = false;
+  bool isPinLoading = true;
 
   int getCurrentChest() {
     if (configBox.get('currentChest') == null) {
@@ -26,7 +28,7 @@ class MyWalletsProvider with ChangeNotifier {
 
   bool checkIfWalletExist() {
     if (chestBox.isEmpty) {
-      log.i('No wallets detected');
+      // log.i('No wallets detected');
       return false;
     } else {
       return true;
@@ -46,7 +48,7 @@ class MyWalletsProvider with ChangeNotifier {
   }
 
   WalletData? getWalletDataById(List<int?> id) {
-    if (id.isEmpty) return WalletData();
+    if (id.isEmpty) return WalletData(address: '', isOwned: true);
     int? chest = id[0];
     int? nbr = id[1];
     WalletData? targetedWallet;
@@ -76,18 +78,18 @@ class MyWalletsProvider with ChangeNotifier {
 
   WalletData getDefaultWallet([int? chest]) {
     if (chestBox.isEmpty) {
-      return WalletData(chest: 0, number: 0);
+      return WalletData(address: '', chest: 0, number: 0, isOwned: true);
     } else {
       chest ??= getCurrentChest();
       int? defaultWalletNumber = chestBox.get(chest)!.defaultWallet;
       return getWalletDataById([chest, defaultWalletNumber]) ??
-          WalletData(chest: chest, number: 0);
+          WalletData(address: '', chest: chest, number: 0, isOwned: true);
     }
   }
 
   Future<int> deleteAllWallet(context) async {
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
-    MyWalletsProvider myWalletProvider =
+    final myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
     try {
       log.w('DELETE ALL WALLETS ?');
@@ -124,30 +126,30 @@ class MyWalletsProvider with ChangeNotifier {
 
     int? chest = getCurrentChest();
 
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
 
     WalletData defaultWallet = getDefaultWallet();
 
     final address = await sub.derive(
-        context, defaultWallet.address!, newDerivationNbr, pinCode);
+        context, defaultWallet.address, newDerivationNbr, pinCode);
 
     WalletData newWallet = WalletData(
-        version: dataVersion,
         chest: chest,
         address: address,
         number: newWalletNbr,
         name: name,
         derivation: newDerivationNbr,
-        imageDefaultPath: '${newWalletNbr % 4}.png');
+        imageDefaultPath: '${newWalletNbr % 4}.png',
+        isOwned: true);
 
-    await walletBox.add(newWallet);
+    await walletBox.put(newWallet.address, newWallet);
 
     isNewDerivationLoading = false;
     notifyListeners();
   }
 
   Future<void> generateRootWallet(context, String name) async {
-    MyWalletsProvider myWalletProvider =
+    final myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
 
     isNewDerivationLoading = true;
@@ -156,29 +158,32 @@ class MyWalletsProvider with ChangeNotifier {
     int? chest = getCurrentChest();
 
     List<WalletData> walletConfig = readAllWallets(chest);
+    walletConfig.sort((p1, p2) {
+      return Comparable.compare(p1.number!, p2.number!);
+    });
 
     if (walletConfig.isEmpty) {
       newWalletNbr = 0;
     } else {
       newWalletNbr = walletConfig.last.number! + 1;
     }
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
 
     WalletData defaultWallet = myWalletProvider.getDefaultWallet();
 
     final address =
-        await sub.generateRootKeypair(defaultWallet.address!, pinCode);
+        await sub.generateRootKeypair(defaultWallet.address, pinCode);
 
     WalletData newWallet = WalletData(
-        version: dataVersion,
         chest: chest,
         address: address,
         number: newWalletNbr,
         name: name,
         derivation: -1,
-        imageDefaultPath: '${newWalletNbr % 4}.png');
+        imageDefaultPath: '${newWalletNbr % 4}.png',
+        isOwned: true);
 
-    await walletBox.add(newWallet);
+    await walletBox.put(newWallet.address, newWallet);
 
     isNewDerivationLoading = false;
     notifyListeners();
@@ -192,6 +197,9 @@ class MyWalletsProvider with ChangeNotifier {
     chestNumber ??= getCurrentChest();
 
     List<WalletData> walletConfig = readAllWallets(chestNumber);
+    walletConfig.sort((p1, p2) {
+      return Comparable.compare(p1.number!, p2.number!);
+    });
 
     if (walletConfig.isEmpty) {
       newDerivationNbr = 2;

lib/providers/search.dart

@@ -68,8 +68,7 @@ class SearchProvider with ChangeNotifier {
   // }
 
   Future<List<G1WalletsList>> searchAddress() async {
-    final WalletsProfilesProvider walletProfiles =
+    final walletProfiles = WalletsProfilesProvider('pubkey');
-        WalletsProfilesProvider('pubkey');
 
     if (walletProfiles.isAddress(searchController.text)) {
       G1WalletsList wallet = G1WalletsList(address: searchController.text);

lib/providers/substrate_sdk.dart

@@ -1,6 +1,7 @@
 // ignore_for_file: use_build_context_synchronously
 
 import 'package:easy_localization/easy_localization.dart';
+import 'package:fast_base58/fast_base58.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:gecko/globals.dart';
@@ -10,6 +11,7 @@ import 'package:gecko/providers/home.dart';
 import 'package:gecko/providers/my_wallets.dart';
 import 'package:gecko/providers/wallet_options.dart';
 import 'package:gecko/providers/wallets_profiles.dart';
+import 'package:pinenacl/ed25519.dart';
 import 'package:polkawallet_sdk/api/apiKeyring.dart';
 import 'package:polkawallet_sdk/api/types/networkParams.dart';
 import 'package:polkawallet_sdk/api/types/txInfoData.dart';
@@ -39,9 +41,11 @@ class SubstrateSdk with ChangeNotifier {
   TextEditingController csSalt = TextEditingController();
   TextEditingController csPassword = TextEditingController();
   String g1V1NewAddress = '';
+  String g1V1OldPubkey = '';
   bool isCesiumIDVisible = false;
   bool isCesiumAddresLoading = false;
   late int udValue;
+  Map<String, List<int>> certsCounterCache = {};
 
   /////////////////////////////////////
   ////////// 1: API METHODS ///////////
@@ -122,12 +126,20 @@ class SubstrateSdk with ChangeNotifier {
     return await _getStorage('identity.identityIndexOf("$address")') ?? 0;
   }
 
-  Future<List<int>> getCerts(String address) async {
+  Future<List<int>> getCertsCounter(String address) async {
     final idtyIndex = await _getIdentityIndexOf(address);
     final certsReceiver =
         await _getStorage('cert.storageIdtyCertMeta($idtyIndex)') ?? [];
 
-    return [certsReceiver['receivedCount'], certsReceiver['issuedCount']];
+    if (certsCounterCache[address] == null) {
+      certsCounterCache.putIfAbsent(address, () => []);
+    }
+    certsCounterCache.update(
+        address,
+        (value) =>
+            [certsReceiver['receivedCount'], certsReceiver['issuedCount']]);
+
+    return certsCounterCache[address]!;
   }
 
   Future<int> getCertValidityPeriod(String from, String to) async {
@@ -168,7 +180,7 @@ class SubstrateSdk with ChangeNotifier {
   }
 
   Future<Map<String, double>> getBalance(String address) async {
-    // log.d('currencyParameters: $currencyParameters');
+    log.d('BALANCE: $address');
 
     if (!nodeConnected) {
       return {
@@ -186,13 +198,11 @@ class SubstrateSdk with ChangeNotifier {
     final Map? idtyData = idtyIndex == null
         ? null
         : await _getStorage('identity.identities($idtyIndex)');
-    final int currentUdIndex =
-        int.parse(await _getStorage('universalDividend.currentUdIndex()'));
     final List pastReevals =
         await _getStorage('universalDividend.pastReevals()');
 
     // Compute amount of claimable UDs
-    final int unclaimedUds = _computeUnclaimUds(currentUdIndex,
+    final int unclaimedUds = _computeUnclaimUds(
         idtyData?['data']?['firstEligibleUd'] ?? 0, pastReevals);
 
     // Calculate transferable and potential balance
@@ -214,8 +224,7 @@ class SubstrateSdk with ChangeNotifier {
     return finalBalances;
   }
 
-  int _computeUnclaimUds(
+  int _computeUnclaimUds(int firstEligibleUd, List pastReevals) {
-      int currentUdIndex, int firstEligibleUd, List pastReevals) {
     int totalAmount = 0;
 
     if (firstEligibleUd == 0) return 0;
@@ -239,8 +248,13 @@ class SubstrateSdk with ChangeNotifier {
     return totalAmount;
   }
 
-  Future<bool> isMemberGet(String address) async {
+  Future<bool> isMember(String address) async {
-    return await idtyStatus(address) == 'Validated';
+    final isMember = await idtyStatus(address) == 'Validated';
+    final walletData = walletBox.get(address) ?? WalletData(address: address);
+    walletData.isMember = isMember;
+    walletBox.put(address, walletData);
+    // notifyListeners();
+    return isMember;
   }
 
   Future<bool> isSmithGet(String address) async {
@@ -260,7 +274,7 @@ class SubstrateSdk with ChangeNotifier {
     Map<String, int> result = {};
     final toStatus = await idtyStatus(to);
 
-    if (from != to && await isMemberGet(from)) {
+    if (from != to && await isMember(from)) {
       final removableOn = await getCertValidityPeriod(from, to);
       final certMeta = await getCertMeta(from);
       final int nextIssuableOn = certMeta['nextIssuableOn'] ?? 0;
@@ -275,6 +289,9 @@ class SubstrateSdk with ChangeNotifier {
         result.putIfAbsent('certDelay', () => certDelayDuration);
       } else if (toStatus == 'Created') {
         result.putIfAbsent('toStatus', () => 1);
+      } else if (toStatus == 'noid') {
+        result.putIfAbsent('toStatus', () => 2);
+        result.putIfAbsent('canCert', () => 0);
       } else {
         result.putIfAbsent('canCert', () => 0);
       }
@@ -295,7 +312,7 @@ class SubstrateSdk with ChangeNotifier {
   }
 
   Future<String> idtyStatus(String address) async {
-    // WalletOptionsProvider walletOptions =
+    // final walletOptions =
     //     Provider.of<WalletOptionsProvider>(homeContext, listen: false);
 
     var idtyIndex = await _getIdentityIndexOf(address);
@@ -319,6 +336,15 @@ class SubstrateSdk with ChangeNotifier {
     }
   }
 
+  Future<bool> isSmith(String address) async {
+    var idtyIndex = await _getIdentityIndexOf(address);
+    if (idtyIndex == 0) return false;
+
+    final isSmith =
+        await _getStorage('smithsMembership.membership($idtyIndex)');
+    return isSmith == null ? false : true;
+  }
+
   Future<String> getGenesisHash() async {
     final String genesisHash = await sdk.webView!.evalJavascript(
           'api.genesisHash.toHex()',
@@ -380,6 +406,77 @@ class SubstrateSdk with ChangeNotifier {
     return estimateFees.partialFee / 100;
   }
 
+  int hexStringToUint16(String input) {
+    // Slice the string in 2-char substrings and parse it from hex to decimal
+    final bytes = sliceString(input, 2).map((s) => int.parse(s, radix: 16));
+
+    // Create a Uint8 from the 2-bytes list
+    final u8list = Uint8List.fromList(bytes.toList());
+
+    // Return a Uint16 little endian representation
+    return ByteData.view(u8list.buffer).getUint16(0, Endian.little);
+  }
+
+  List<String> sliceString(String input, int count) {
+    if (input.isEmpty) return [];
+
+    if (input.length % count != 0) {
+      throw ArgumentError("Cannot slice $input in $count slices.");
+    }
+    // final slices = List<String>(count);
+    var slices = List<String>.filled(count, '');
+
+    int len = input.length;
+    int sliceSize = len ~/ count;
+
+    for (var i = 0; i < count; i++) {
+      var start = i * sliceSize;
+      slices[i] = input.substring(start, start + sliceSize);
+    }
+
+    return List.unmodifiable(slices);
+  }
+
+  Future<DateFormat> getBlockchainStart() async {
+    ////// Manu indexer
+    //// Extract block date. Ugly, I can't find a better way to get the date of the block ?
+    //// The only polkadot issue for that : https://github.com/polkadot-js/api/issues/2603
+    // const created_at = new Date(
+    //   signedBlock.block.extrinsics
+    //     .filter(
+    //       ({ method: { section, method } }) =>
+    //         section === 'timestamp' && method === 'set'
+    //     )[0]
+    //     .args[0].toNumber()
+    // )
+    //// manu rpc
+    // genesis: api.genesisHash.toHex(),
+    // chain: await api.rpc.chain.getHeader(),
+    // chainInfo: await api.registry.getChainProperties(),
+    // test: await api.rpc.state.getPairs('0x')
+    // query block finalisé qui ne change jamais.
+    // api.rpc.chain.subscribeFinalizedHeads
+    // events: await api.rpc.state.getStorage('0x26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7'),
+    // lastFinalizedBlock: await api.rpc.chain.getFinalizedHead()
+    // get block
+    // api.rpc.chain.getFinalizedHead
+
+    // shit
+    // final blockHash =
+    //     await sdk.webView!.evalJavascript('api.rpc.chain.getBlockHash(1)');
+    // final Map blockContent = await sdk.webView!
+    //     .evalJavascript('api.rpc.chain.getBlock("$blockHash")');
+    // final String dateBrut = blockContent['block']['extrinsics'][0];
+
+    // final dateTextByte = hex.decode(dateBrut.substring(2));
+
+    // final dateText = await sdk.webView!
+    //     .evalJavascript('api.tx($dateTextByte)', wrapPromise: false);
+
+    // log.d('aaaaaaaaaaaaaaaaaaaaa: $dateText');
+    return DateFormat();
+  }
+
   /////////////////////////////////////
   ////// 3: SUBSTRATE CONNECTION //////
   /////////////////////////////////////
@@ -400,9 +497,8 @@ class SubstrateSdk with ChangeNotifier {
   }
 
   Future<void> connectNode(BuildContext ctx) async {
-    HomeProvider homeProvider = Provider.of<HomeProvider>(ctx, listen: false);
+    final homeProvider = Provider.of<HomeProvider>(ctx, listen: false);
-    MyWalletsProvider myWalletProvider =
+    final myWalletProvider = Provider.of<MyWalletsProvider>(ctx, listen: false);
-        Provider.of<MyWalletsProvider>(ctx, listen: false);
 
     homeProvider.changeMessage("connectionPending".tr(), 0);
 
@@ -442,8 +538,8 @@ class SubstrateSdk with ChangeNotifier {
         }
         notifyListeners();
       });
-
+      currentUdIndex =
-      await initCurrencyParameters();
+          int.parse(await _getStorage('universalDividend.currentUdIndex()'));
       await getBalanceRatio();
 
       notifyListeners();
@@ -568,7 +664,7 @@ class SubstrateSdk with ChangeNotifier {
   Future<KeyPairData?> changePassword(BuildContext context, String address,
       String passOld, String passNew) async {
     final account = getKeypair(address);
-    MyWalletsProvider myWalletProvider =
+    final myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
     keyring.setCurrent(account);
     myWalletProvider.resetPinCode();
@@ -604,7 +700,7 @@ class SubstrateSdk with ChangeNotifier {
     await chestBox.put(currentChestNumber, newChestData);
 
     try {
-      final acc = getKeypair(wallet.address!);
+      final acc = getKeypair(wallet.address);
       keyring.setCurrent(acc);
       return acc.address!;
     } catch (e) {
@@ -680,6 +776,9 @@ class SubstrateSdk with ChangeNotifier {
         cryptoType: CryptoType.ed25519,
         rawSeed: rawSeedHex);
 
+    SigningKey rootKey = SigningKey(seed: rawSeed);
+    g1V1OldPubkey = Base58Encode(rootKey.publicKey);
+
     g1V1NewAddress = newAddress.address!;
     notifyListeners();
     return g1V1NewAddress;
@@ -695,8 +794,15 @@ class SubstrateSdk with ChangeNotifier {
     final fromHasConsumer =
         fromAddress == '' ? false : await hasAccountConsumers(fromAddress);
     final toIdtyStatus = await idtyStatus(toAddress);
+    final isSmithData = await isSmith(fromAddress);
 
-    return [fromBalance, fromIdtyStatus, toIdtyStatus, fromHasConsumer];
+    return [
+      fromBalance,
+      fromIdtyStatus,
+      toIdtyStatus,
+      fromHasConsumer,
+      isSmithData
+    ];
   }
 
   //////////////////////////////////////
@@ -779,7 +885,7 @@ class SubstrateSdk with ChangeNotifier {
     List txOptions = [];
     String? rawParams;
 
-    final toCerts = await getCerts(destAddress);
+    final toCerts = await getCertsCounter(destAddress);
 
     // log.d('debug: ${currencyParameters['minCertForMembership']}');
 
@@ -1007,7 +1113,7 @@ void snackNode(BuildContext context, bool isConnected) {
   if (!isConnected) {
     message = "noDuniterNodeAvailableTryLater".tr();
   } else {
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
 
     message =
         "${"youAreConnectedToNode".tr()}\n${sub.getConnectedEndpoint()!.split('//')[1]}";

lib/providers/wallet_options.dart

@@ -11,14 +11,12 @@ import 'package:gecko/providers/duniter_indexer.dart';
 import 'package:gecko/providers/my_wallets.dart';
 import 'package:gecko/models/wallet_data.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
-import 'package:gecko/screens/animated_text.dart';
 import 'package:gecko/screens/common_elements.dart';
 import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
 import 'package:gecko/screens/transaction_in_progress.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:provider/provider.dart';
 import 'package:image_cropper/image_cropper.dart';
-import 'package:truncate/truncate.dart';
 
 class WalletOptionsProvider with ChangeNotifier {
   TextEditingController address = TextEditingController();
@@ -28,12 +26,11 @@ class WalletOptionsProvider with ChangeNotifier {
   TextEditingController newPin = TextEditingController();
   bool isEditing = false;
   bool isBalanceBlur = false;
-  FocusNode walletNameFocus = FocusNode();
   TextEditingController nameController = TextEditingController();
   late bool isDefaultWallet;
   bool canValidateNameBool = false;
-  Map<String, String> idtyStatusCache = {};
   Future<NewWallet>? get badWallet => null;
+  Map<String, double> balanceCache = {};
 
   int getPinLenght(walletNbr) {
     return pinLength;
@@ -51,27 +48,27 @@ class WalletOptionsProvider with ChangeNotifier {
   }
 
   Future<int> deleteWallet(context, WalletData wallet) async {
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
     final bool? answer = await (confirmPopup(
         context, 'areYouSureToForgetWallet'.tr(args: [wallet.name!])));
 
     if (answer ?? false) {
       //Check if balance is null
-      final balance = await sub.getBalance(wallet.address!);
+      final balance = await sub.getBalance(wallet.address);
       if (balance != {}) {
-        MyWalletsProvider myWalletProvider =
+        final myWalletProvider =
             Provider.of<MyWalletsProvider>(context, listen: false);
         final defaultWallet = myWalletProvider.getDefaultWallet();
         log.d(defaultWallet.address);
         sub.pay(
-            fromAddress: wallet.address!,
+            fromAddress: wallet.address,
-            destAddress: defaultWallet.address!,
+            destAddress: defaultWallet.address,
             amount: -1,
             password: myWalletProvider.pinCode);
       }
 
       await walletBox.delete(wallet.key);
-      await sub.deleteAccounts([wallet.address!]);
+      await sub.deleteAccounts([wallet.address]);
 
       Navigator.pop(context);
     }
@@ -132,98 +129,17 @@ class WalletOptionsProvider with ChangeNotifier {
     }
   }
 
-  Widget idtyStatus(BuildContext context, String address,
-      {bool isOwner = false, Color color = Colors.black}) {
-    DuniterIndexer duniterIndexer =
-        Provider.of<DuniterIndexer>(context, listen: false);
-
-    showText(String text,
-        [double size = 18, bool bold = false, bool smooth = true]) {
-      log.d('$address $text');
-      return AnimatedFadeOutIn<String>(
-        data: text,
-        duration: Duration(milliseconds: smooth ? 200 : 0),
-        builder: (value) => Text(
-          value,
-          textAlign: TextAlign.center,
-          style: TextStyle(
-              fontSize: size,
-              color: bold ? color : Colors.black,
-              fontWeight: bold ? FontWeight.w500 : FontWeight.w400),
-        ),
-      );
-    }
-
-    return Consumer<SubstrateSdk>(builder: (context, sub, _) {
-      return FutureBuilder(
-          future: sub.idtyStatus(address),
-          initialData: '',
-          builder: (context, snapshot) {
-            idtyStatusCache[address] = snapshot.data.toString();
-            switch (snapshot.data.toString()) {
-              case 'noid':
-                {
-                  return showText('noIdentity'.tr());
-                }
-              case 'Created':
-                {
-                  return showText('identityCreated'.tr());
-                }
-              case 'ConfirmedByOwner':
-                {
-                  return isOwner
-                      ? showText('identityConfirmed'.tr())
-                      : duniterIndexer.getNameByAddress(
-                          context,
-                          address,
-                          null,
-                          20,
-                          true,
-                          Colors.grey[700]!,
-                          FontWeight.w500,
-                          FontStyle.italic);
-                }
-
-              case 'Validated':
-                {
-                  return isOwner
-                      ? showText('memberValidated'.tr(), 18, true)
-                      : duniterIndexer.getNameByAddress(
-                          context,
-                          address,
-                          null,
-                          20,
-                          true,
-                          Colors.black,
-                          FontWeight.w600,
-                          FontStyle.normal);
-                }
-
-              case 'expired':
-                {
-                  return showText('identityExpired'.tr());
-                }
-            }
-            return SizedBox(
-              child: showText('', 18, false, false),
-            );
-          });
-    });
-  }
-
-  Future<bool> isMember(BuildContext context, String address) async {
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
-    return await sub.idtyStatus(address) == 'Validated';
-  }
-
   Future<String?> confirmIdentityPopup(BuildContext context) async {
     TextEditingController idtyName = TextEditingController();
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
-    WalletOptionsProvider walletOptions =
+    final walletOptions =
         Provider.of<WalletOptionsProvider>(context, listen: false);
-    MyWalletsProvider myWalletProvider =
+    final myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
 
+    bool canValidate = false;
+    bool idtyExist = false;
+
     return showDialog<String>(
       context: context,
       barrierDismissible: true, // user must tap button!
@@ -240,7 +156,16 @@ class WalletOptionsProvider with ChangeNotifier {
               const SizedBox(height: 20),
               TextField(
                 key: keyEnterIdentityUsername,
-                onChanged: (_) => notifyListeners(),
+                onChanged: (_) async {
+                  idtyExist = await isIdtyExist(idtyName.text);
+                  canValidate = !idtyExist &&
+                      !await isIdtyExist(idtyName.text) &&
+                      idtyName.text.length >= 2 &&
+                      idtyName.text.length <= 32;
+                  log.d('aaaaaaaaaa: $canValidate');
+
+                  notifyListeners();
+                },
                 inputFormatters: <TextInputFormatter>[
                   // FilteringTextInputFormatter.allow(RegExp("[0-9a-zA-Z]")),
                   FilteringTextInputFormatter.deny(RegExp(r'^ ')),
@@ -250,7 +175,12 @@ class WalletOptionsProvider with ChangeNotifier {
                 autofocus: true,
                 controller: idtyName,
                 style: const TextStyle(fontSize: 19),
-              )
+              ),
+              const SizedBox(height: 10),
+              Consumer<WalletOptionsProvider>(builder: (context, wOptions, _) {
+                return Text(idtyExist ? 'Cette identité existe déjà' : '',
+                    style: TextStyle(color: Colors.red[500]));
+              })
             ]),
           ),
           actions: <Widget>[
@@ -261,61 +191,65 @@ class WalletOptionsProvider with ChangeNotifier {
                     builder: (context, wOptions, _) {
                   return TextButton(
                     key: keyConfirm,
+                    onPressed: canValidate
+                        ? () async {
+                            idtyName.text =
+                                idtyName.text.trim().replaceAll('  ', '');
+
+                            if (idtyName.text.length.clamp(3, 32) ==
+                                idtyName.text.length) {
+                              WalletData? defaultWallet =
+                                  myWalletProvider.getDefaultWallet();
+
+                              String? pin;
+                              if (myWalletProvider.pinCode == '') {
+                                pin = await Navigator.push(
+                                  context,
+                                  MaterialPageRoute(
+                                    builder: (homeContext) {
+                                      return UnlockingWallet(
+                                          wallet: defaultWallet);
+                                    },
+                                  ),
+                                );
+                              }
+                              if (pin != null ||
+                                  myWalletProvider.pinCode != '') {
+                                final wallet = myWalletProvider
+                                    .getWalletDataByAddress(address.text);
+                                await sub.setCurrentWallet(wallet!);
+                                sub.confirmIdentity(walletOptions.address.text,
+                                    idtyName.text, myWalletProvider.pinCode);
+                                Navigator.pop(context);
+
+                                Navigator.push(
+                                  context,
+                                  MaterialPageRoute(builder: (context) {
+                                    return TransactionInProgress(
+                                      transType: 'comfirmIdty',
+                                      fromAddress:
+                                          getShortPubkey(wallet.address),
+                                      toAddress: getShortPubkey(wallet.address),
+                                    );
+                                  }),
+                                );
+                              }
+                            }
+                          }
+                        : null,
                     child: Text(
                       "validate".tr(),
                       style: TextStyle(
-                        fontSize: 21,
+                          fontSize: 21,
-                        color: idtyName.text.length.clamp(3, 64) ==
+                          color: canValidate
-                                idtyName.text.length
+                              ? const Color(0xffD80000)
-                            ? const Color(0xffD80000)
+                              : Colors.grey[500]),
-                            : Colors.grey,
-                      ),
                     ),
-                    onPressed: () async {
-                      idtyName.text = idtyName.text.trim().replaceAll('  ', '');
-
-                      if (idtyName.text.length.clamp(3, 64) ==
-                          idtyName.text.length) {
-                        WalletData? defaultWallet =
-                            myWalletProvider.getDefaultWallet();
-
-                        String? pin;
-                        if (myWalletProvider.pinCode == '') {
-                          pin = await Navigator.push(
-                            context,
-                            MaterialPageRoute(
-                              builder: (homeContext) {
-                                return UnlockingWallet(wallet: defaultWallet);
-                              },
-                            ),
-                          );
-                        }
-                        if (pin != null || myWalletProvider.pinCode != '') {
-                          final wallet = myWalletProvider
-                              .getWalletDataByAddress(address.text);
-                          await sub.setCurrentWallet(wallet!);
-                          sub.confirmIdentity(walletOptions.address.text,
-                              idtyName.text, myWalletProvider.pinCode);
-                          Navigator.pop(context);
-
-                          Navigator.push(
-                            context,
-                            MaterialPageRoute(builder: (context) {
-                              return TransactionInProgress(
-                                transType: 'comfirmIdty',
-                                fromAddress: getShortPubkey(wallet.address!),
-                                toAddress: getShortPubkey(wallet.address!),
-                              );
-                            }),
-                          );
-                        }
-                      }
-                    },
                   );
                 })
               ],
             ),
-            const SizedBox(height: 20)
+            const SizedBox(height: 5)
           ],
         );
       },
@@ -371,7 +305,7 @@ class WalletOptionsProvider with ChangeNotifier {
                       if (canValidateNameBool) {
                         nameController.text = walletName.text;
                         _renameWallet(wID, walletName.text, isCesium: false);
-                        // notifyListeners();
+                        notifyListeners();
                         Navigator.pop(context);
                       }
                     },
@@ -405,7 +339,7 @@ class WalletOptionsProvider with ChangeNotifier {
   }
 
   bool canValidateName(BuildContext context, TextEditingController walletName) {
-    MyWalletsProvider myWalletProvider =
+    final myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
 
     bool isNameValid = walletName.text.length >= 2 &&
@@ -441,7 +375,7 @@ class WalletOptionsProvider with ChangeNotifier {
     String? addressGet;
     walletBox.toMap().forEach((key, value) {
       if (value.chest == chest && value.derivation == derivation) {
-        addressGet = value.address!;
+        addressGet = value.address;
         return;
       }
     });
@@ -450,190 +384,4 @@ class WalletOptionsProvider with ChangeNotifier {
 
     return addressGet;
   }
-
-  Widget walletNameController(BuildContext context, WalletData wallet,
-      [double size = 20]) {
-    nameController.text = wallet.name!;
-
-    return SizedBox(
-      width: 260,
-      child: Stack(children: <Widget>[
-        TextField(
-          key: keyWalletName,
-          autofocus: false,
-          focusNode: walletNameFocus,
-          enabled: isEditing,
-          controller: nameController,
-          minLines: 1,
-          maxLines: 3,
-          textAlign: TextAlign.center,
-          decoration: const InputDecoration(
-            border: InputBorder.none,
-            focusedBorder: InputBorder.none,
-            enabledBorder: InputBorder.none,
-            disabledBorder: InputBorder.none,
-            contentPadding: EdgeInsets.all(15.0),
-          ),
-          style: TextStyle(
-            fontSize: isTall ? size : size * 0.9,
-            color: Colors.black,
-            fontWeight: FontWeight.w400,
-          ),
-        ),
-        Positioned(
-          right: 0,
-          child: InkWell(
-            key: keyRenameWallet,
-            onTap: () async {
-              // _isNewNameValid =
-              // walletProvider.editWalletName(wallet.id(), isCesium: false);
-              await editWalletName(context, wallet.id());
-              await Future.delayed(const Duration(milliseconds: 30));
-              walletNameFocus.requestFocus();
-            },
-            child: ClipRRect(
-              child: Image.asset(
-                  isEditing
-                      ? 'assets/walletOptions/android-checkmark.png'
-                      : 'assets/walletOptions/edit.png',
-                  width: 25,
-                  height: 25),
-            ),
-          ),
-        ),
-      ]),
-    );
-  }
-
-  Widget walletName(BuildContext context, WalletData wallet,
-      [double size = 20, Color color = Colors.black]) {
-    double newSize = wallet.name!.length <= 15 ? size : size - 2;
-
-    return Row(mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
-      Text(
-        truncate(wallet.name!, 20),
-        textAlign: TextAlign.center,
-        style: TextStyle(
-          fontSize: isTall ? newSize : newSize * 0.9,
-          color: color,
-          fontWeight: FontWeight.w400,
-          fontStyle: FontStyle.italic,
-        ),
-        softWrap: false,
-        overflow: TextOverflow.ellipsis,
-      ),
-    ]);
-  }
-}
-
-Map<String, double> balanceCache = {};
-
-Widget balance(BuildContext context, String address, double size,
-    [Color color = Colors.black,
-    Color loadingColor = const Color(0xffd07316)]) {
-  return Column(children: <Widget>[
-    Consumer<SubstrateSdk>(builder: (context, sdk, _) {
-      return FutureBuilder(
-          future: sdk.getBalance(address),
-          builder: (BuildContext context,
-              AsyncSnapshot<Map<String, double>> globalBalance) {
-            if (globalBalance.connectionState != ConnectionState.done ||
-                globalBalance.hasError) {
-              if (balanceCache[address] != null &&
-                  balanceCache[address] != -1) {
-                return Row(children: [
-                  Text(balanceCache[address]!.toString(),
-                      style: TextStyle(
-                          fontSize: isTall ? size : size * 0.9, color: color)),
-                  const SizedBox(width: 5),
-                  udUnitDisplay(size, color),
-                ]);
-              } else {
-                return SizedBox(
-                  height: 15,
-                  width: 15,
-                  child: CircularProgressIndicator(
-                    color: loadingColor,
-                    strokeWidth: 2,
-                  ),
-                );
-              }
-            }
-            balanceCache[address] = globalBalance.data!['transferableBalance']!;
-            if (balanceCache[address] != -1) {
-              return Row(children: [
-                Text(
-                  balanceCache[address]!.toString(),
-                  style: TextStyle(
-                    fontSize: isTall ? size : size * 0.9,
-                    color: color,
-                  ),
-                ),
-                const SizedBox(width: 5),
-                udUnitDisplay(size, color),
-              ]);
-            } else {
-              return const Text('');
-            }
-          });
-    }),
-  ]);
-}
-
-Widget getCerts(BuildContext context, String address, double size,
-    [Color color = Colors.black]) {
-  return Column(children: <Widget>[
-    Consumer<SubstrateSdk>(builder: (context, sdk, _) {
-      return FutureBuilder(
-          future: sdk.getCerts(address),
-          builder: (BuildContext context, AsyncSnapshot<List<int>> certs) {
-            // log.d(_certs.data);
-
-            return certs.data?[0] != 0 && certs.data != null
-                ? Row(
-                    children: [
-                      Image.asset('assets/medal.png', height: 20),
-                      const SizedBox(width: 1),
-                      Text(certs.data?[0].toString() ?? '0',
-                          style: const TextStyle(fontSize: 20)),
-                      const SizedBox(width: 5),
-                      Text(
-                        "(${certs.data?[1].toString() ?? '0'})",
-                        style: const TextStyle(fontSize: 14),
-                      )
-                    ],
-                  )
-                : const Text('');
-          });
-    }),
-  ]);
-}
-
-Widget udUnitDisplay(double size, [Color color = Colors.black]) {
-  final bool isUdUnit = configBox.get('isUdUnit') ?? false;
-  return isUdUnit
-      ? Row(
-          mainAxisAlignment: MainAxisAlignment.end,
-          children: [
-            Text(
-              'ud'.tr(args: ['']),
-              style:
-                  TextStyle(fontSize: isTall ? size : size * 0.9, color: color),
-            ),
-            Column(
-              children: [
-                Text(
-                  currencyName,
-                  style: TextStyle(
-                      fontSize: (isTall ? size : size * 0.9) * 0.7,
-                      fontWeight: FontWeight.w500,
-                      color: color),
-                ),
-                const SizedBox(height: 15)
-              ],
-            )
-          ],
-        )
-      : Text(currencyName,
-          style: TextStyle(fontSize: isTall ? size : size * 0.9, color: color));
 }

lib/providers/wallets_profiles.dart

@@ -1,20 +1,13 @@
 import 'dart:io';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
 import 'package:gecko/globals.dart';
 import 'package:gecko/models/g1_wallets_list.dart';
-import 'package:gecko/models/widgets_keys.dart';
-import 'package:gecko/providers/cesium_plus.dart';
-import 'package:gecko/providers/substrate_sdk.dart';
-import 'package:gecko/providers/wallet_options.dart';
-import 'package:gecko/screens/common_elements.dart';
 import 'package:gecko/screens/wallet_view.dart';
 import 'package:jdenticon_dart/jdenticon_dart.dart';
 import 'package:permission_handler/permission_handler.dart';
 // import 'package:qrscan/qrscan.dart' as scanner;
 import 'package:barcode_scan2/barcode_scan2.dart';
-import 'package:provider/provider.dart';
 
 class WalletsProfilesProvider with ChangeNotifier {
   WalletsProfilesProvider(this.address);
@@ -44,7 +37,10 @@ class WalletsProfilesProvider with ChangeNotifier {
       Navigator.push(
         context,
         MaterialPageRoute(builder: (context) {
-          return WalletViewScreen(address: barcode!.rawContent);
+          return WalletViewScreen(
+            address: barcode!.rawContent,
+            username: '',
+          );
         }),
       );
     } else {
@@ -129,102 +125,6 @@ class WalletsProfilesProvider with ChangeNotifier {
     return _balance;
   }
 
-  Widget headerProfileView(
-      BuildContext context, String address, String? username) {
-    const double avatarSize = 140;
-
-    WalletOptionsProvider walletOptions =
-        Provider.of<WalletOptionsProvider>(context, listen: false);
-    CesiumPlusProvider cesiumPlusProvider =
-        Provider.of<CesiumPlusProvider>(context, listen: false);
-    // SubstrateSdk _sub = Provider.of<SubstrateSdk>(context, listen: false);
-
-    return Stack(children: <Widget>[
-      Consumer<SubstrateSdk>(builder: (context, sub, _) {
-        bool isAccountExist = balanceCache[address] != 0;
-        return Container(
-            height: 180,
-            decoration: BoxDecoration(
-              gradient: LinearGradient(
-                begin: Alignment.topCenter,
-                end: Alignment.bottomCenter,
-                colors: [
-                  isAccountExist ? yellowC : Colors.grey[400]!,
-                  isAccountExist ? const Color(0xFFE7811A) : Colors.grey[600]!,
-                ],
-              ),
-            ));
-      }),
-      Padding(
-        padding: const EdgeInsets.only(left: 30, right: 40),
-        child: Row(children: <Widget>[
-          Column(
-              crossAxisAlignment: CrossAxisAlignment.start,
-              children: <Widget>[
-                Container(
-                  height: 10,
-                  color: yellowC, // Colors.grey[400],
-                ),
-                Row(children: [
-                  GestureDetector(
-                    key: keyCopyAddress,
-                    onTap: () {
-                      Clipboard.setData(ClipboardData(text: address));
-                      snackCopyKey(context);
-                    },
-                    child: Text(
-                      getShortPubkey(address),
-                      style: const TextStyle(
-                        fontSize: 30,
-                        fontWeight: FontWeight.w800,
-                      ),
-                    ),
-                  ),
-                ]),
-                const SizedBox(height: 25),
-                balance(context, address, 22),
-                const SizedBox(height: 10),
-                walletOptions.idtyStatus(context, address,
-                    isOwner: false, color: Colors.black),
-                getCerts(context, address, 14),
-                // if (username == null &&
-                //     g1WalletsBox.get(address)?.username != null)
-                //   SizedBox(
-                //     width: 230,
-                //     child: Text(
-                //       g1WalletsBox.get(address)?.username ?? '',
-                //       style: const TextStyle(
-                //         fontSize: 27,
-                //         color: Color(0xff814C00),
-                //       ),
-                //     ),
-                //   ),
-                // if (username != null)
-                //   SizedBox(
-                //     width: 230,
-                //     child: Text(
-                //       username,
-                //       style: const TextStyle(
-                //         fontSize: 27,
-                //         color: Color(0xff814C00),
-                //       ),
-                //     ),
-                //   ),
-                const SizedBox(height: 55),
-              ]),
-          const Spacer(),
-          Column(children: <Widget>[
-            ClipOval(
-              child: cesiumPlusProvider.defaultAvatar(avatarSize),
-            ),
-            const SizedBox(height: 25),
-          ]),
-        ]),
-      ),
-      CommonElements().offlineInfo(context),
-    ]);
-  }
-
   bool isContact(String address) {
     return contactsBox.containsKey(address);
   }
@@ -252,3 +152,12 @@ snackCopyKey(context) {
       duration: const Duration(seconds: 2));
   ScaffoldMessenger.of(context).showSnackBar(snackBar);
 }
+
+snackCopySeed(context) {
+  final snackBar = SnackBar(
+      padding: const EdgeInsets.all(20),
+      content: Text("thisMnemonicHasBeenCopiedToClipboard".tr(),
+          style: const TextStyle(fontSize: 17)),
+      duration: const Duration(seconds: 4));
+  ScaffoldMessenger.of(context).showSnackBar(snackBar);
+}

lib/screens/activity.dart

@@ -1,17 +1,18 @@
 // ignore_for_file: must_be_immutable
 
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/services.dart';
+
 import 'package:gecko/globals.dart';
 import 'package:gecko/models/queries_indexer.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/cesium_plus.dart';
 import 'package:gecko/providers/duniter_indexer.dart';
-import 'package:gecko/providers/home.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
-import 'package:gecko/providers/wallets_profiles.dart';
 import 'package:flutter/material.dart';
 import 'package:gecko/screens/wallet_view.dart';
+import 'package:gecko/widgets/bottom_app_bar.dart';
+import 'package:gecko/widgets/header_profile.dart';
+import 'package:gecko/widgets/page_route_no_transition.dart';
 import 'package:graphql_flutter/graphql_flutter.dart';
 import 'package:provider/provider.dart';
 
@@ -31,12 +32,6 @@ class ActivityScreen extends StatelessWidget with ChangeNotifier {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
-    WalletsProfilesProvider walletProfile =
-        Provider.of<WalletsProfilesProvider>(context, listen: false);
-    HomeProvider homeProvider =
-        Provider.of<HomeProvider>(context, listen: false);
-
     return Scaffold(
         key: _scaffoldKey,
         appBar: AppBar(
@@ -47,19 +42,18 @@ class ActivityScreen extends StatelessWidget with ChangeNotifier {
             child: Text('accountActivity'.tr()),
           ),
         ),
-        bottomNavigationBar: homeProvider.bottomAppBar(context),
+        bottomNavigationBar: const GeckoBottomAppBar(),
         body: Column(children: <Widget>[
-          walletProfile.headerProfileView(context, address, username),
+          HeaderProfile(address: address, username: username),
           historyQuery(context),
         ]));
   }
 
   Widget historyQuery(context) {
-    DuniterIndexer duniterIndexer =
+    final duniterIndexer = Provider.of<DuniterIndexer>(context, listen: false);
-        Provider.of<DuniterIndexer>(context, listen: false);
 
     if (indexerEndpoint == '') {
-      Column(children: <Widget>[
+      return Column(children: <Widget>[
         const SizedBox(height: 50),
         Text(
           "noNetworkNoHistory".tr(),
@@ -158,8 +152,7 @@ class ActivityScreen extends StatelessWidget with ChangeNotifier {
   }
 
   Widget historyView(context, result) {
-    DuniterIndexer duniterIndexer =
+    final duniterIndexer = Provider.of<DuniterIndexer>(context, listen: false);
-        Provider.of<DuniterIndexer>(context, listen: false);
 
     return duniterIndexer.transBC == null
         ? Column(children: <Widget>[
@@ -193,9 +186,6 @@ class ActivityScreen extends StatelessWidget with ChangeNotifier {
 
   Widget getTransactionTile(
       BuildContext context, DuniterIndexer duniterIndexer) {
-    CesiumPlusProvider cesiumPlusProvider =
-        Provider.of<CesiumPlusProvider>(context, listen: false);
-
     int keyID = 0;
     String? dateDelimiter;
     String? lastDateDelimiter;
@@ -204,6 +194,8 @@ class ActivityScreen extends StatelessWidget with ChangeNotifier {
     bool isTody = false;
     bool isYesterday = false;
     bool isThisWeek = false;
+    bool isMigrationTime = false;
+    bool isMigrationTimePassed = false;
 
     final Map<int, String> monthsInYear = {
       1: "month1".tr(),
@@ -286,7 +278,25 @@ class ActivityScreen extends StatelessWidget with ChangeNotifier {
         finalAmount = '$amount $currencyName';
       }
 
+      if (!isMigrationTimePassed && date.compareTo(startBlockchainTime) < 0) {
+        isMigrationTimePassed = true;
+        isMigrationTime = true;
+      } else {
+        isMigrationTime = false;
+      }
+
       return Column(children: <Widget>[
+        if (isMigrationTime)
+          const Padding(
+            padding: EdgeInsets.symmetric(vertical: 30),
+            child: Text(
+              'Début de la ĞDev',
+              style: TextStyle(
+                  fontSize: 25,
+                  color: Colors.blueAccent,
+                  fontWeight: FontWeight.w500),
+            ),
+          ),
         if (dateDelimiter != null)
           Padding(
             padding: const EdgeInsets.symmetric(vertical: 30),
@@ -305,7 +315,7 @@ class ActivityScreen extends StatelessWidget with ChangeNotifier {
                   contentPadding: const EdgeInsets.only(
                       left: 20, right: 30, top: 15, bottom: 15),
                   leading: ClipOval(
-                    child: cesiumPlusProvider.defaultAvatar(avatarSize),
+                    child: defaultAvatar(avatarSize),
                   ),
                   title: Padding(
                     padding: const EdgeInsets.only(bottom: 5),
@@ -352,8 +362,11 @@ class ActivityScreen extends StatelessWidget with ChangeNotifier {
                     // _cesiumPlusProvider.avatarCancelToken.cancel('cancelled');
                     Navigator.push(
                       context,
-                      MaterialPageRoute(builder: (context) {
+                      PageNoTransit(builder: (context) {
-                        return WalletViewScreen(address: repository[1]);
+                        return WalletViewScreen(
+                          address: repository[1],
+                          username: username ?? '',
+                        );
                       }),
                     );
                     // Navigator.pop(context);

lib/screens/certifications.dart

@@ -0,0 +1,76 @@
+import 'package:accordion/controllers.dart';
+import 'package:easy_localization/easy_localization.dart';
+import 'package:gecko/globals.dart';
+import 'package:flutter/material.dart';
+import 'package:gecko/widgets/certs_received.dart';
+import 'package:gecko/widgets/certs_counter.dart';
+import 'package:gecko/widgets/certs_sent.dart';
+import 'package:accordion/accordion.dart';
+
+class CertificationsScreen extends StatelessWidget {
+  const CertificationsScreen(
+      {Key? key, required this.address, required this.username})
+      : super(key: key);
+  final String address;
+  final String username;
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+        backgroundColor: backgroundColor,
+        appBar: AppBar(
+            elevation: 0,
+            toolbarHeight: 60 * ratio,
+            title: SizedBox(
+              height: 22,
+              child: Text('Certifications de $username'),
+            )),
+        body: SafeArea(
+          child: Accordion(
+              paddingListTop: 10,
+              paddingListBottom: 10,
+              maxOpenSections: 1,
+              headerBackgroundColorOpened: orangeC,
+              scaleWhenAnimating: true,
+              openAndCloseAnimation: true,
+              headerPadding:
+                  const EdgeInsets.symmetric(vertical: 7, horizontal: 15),
+              sectionOpeningHapticFeedback: SectionHapticFeedback.heavy,
+              sectionClosingHapticFeedback: SectionHapticFeedback.light,
+              children: [
+                AccordionSection(
+                  isOpen: true,
+                  leftIcon:
+                      const Icon(Icons.insights_rounded, color: Colors.black),
+                  headerBackgroundColor: yellowC,
+                  headerBackgroundColorOpened: orangeC,
+                  header: Row(children: [
+                    Text('received'.tr()),
+                    const SizedBox(width: 5),
+                    CertsCounter(address: address)
+                  ]),
+                  content: CertsReceived(address: address),
+                  contentHorizontalPadding: 0,
+                  contentBorderWidth: 1,
+                ),
+                AccordionSection(
+                  isOpen: false,
+                  leftIcon:
+                      const Icon(Icons.insights_rounded, color: Colors.black),
+                  headerBackgroundColor: yellowC,
+                  headerBackgroundColorOpened: orangeC,
+                  header: Row(children: [
+                    Text('sent'.tr()),
+                    const SizedBox(width: 5),
+                    CertsCounter(address: address, isSent: true)
+                  ]),
+                  content: CertsSent(address: address),
+                  contentHorizontalPadding: 20,
+                  contentBorderWidth: 1,
+                  // onOpenSection: () => print('onOpenSection ...'),
+                  // onCloseSection: () => print('onCloseSection ...'),
+                ),
+              ]),
+        ));
+  }
+}

lib/screens/common_elements.dart

@@ -160,7 +160,7 @@ class CommonElements {
   }
 
   Widget offlineInfo(BuildContext context) {
-    final double screenWidth = MediaQuery.of(homeContext).size.width;
+    final screenWidth = MediaQuery.of(homeContext).size.width;
     return Consumer<SubstrateSdk>(builder: (context, sub, _) {
       return Visibility(
         visible: !sub.nodeConnected,
@@ -279,6 +279,92 @@ Future<bool?> confirmPopup(BuildContext context, String title) async {
   );
 }
 
+Future<bool?> confirmPopupCertification(BuildContext context, String question1,
+    String username, String question2, String address) async {
+  return showDialog<bool>(
+    context: context,
+    barrierDismissible: true,
+    builder: (BuildContext context) {
+      return AlertDialog(
+        // actionsPadding: const EdgeInsets.all(0.0),
+        backgroundColor: backgroundColor,
+        content: SizedBox(
+          height: 240,
+          child: Column(
+            children: [
+              const SizedBox(height: 15),
+              Text(
+                question1,
+                textAlign: TextAlign.center,
+                style:
+                    const TextStyle(fontSize: 20, fontWeight: FontWeight.w400),
+              ),
+              const SizedBox(height: 20),
+              Text(
+                username,
+                textAlign: TextAlign.center,
+                style:
+                    const TextStyle(fontSize: 24, fontWeight: FontWeight.w500),
+              ),
+              const SizedBox(height: 20),
+              Text(
+                question2,
+                textAlign: TextAlign.center,
+                style:
+                    const TextStyle(fontSize: 20, fontWeight: FontWeight.w400),
+              ),
+              const SizedBox(height: 20),
+              Text(
+                address,
+                textAlign: TextAlign.center,
+                style:
+                    const TextStyle(fontSize: 20, fontWeight: FontWeight.w500),
+              ),
+              const SizedBox(height: 20),
+              const Text(
+                '?',
+                textAlign: TextAlign.center,
+                style: TextStyle(fontSize: 20, fontWeight: FontWeight.w400),
+              ),
+            ],
+          ),
+        ),
+        actions: <Widget>[
+          Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              TextButton(
+                key: keyConfirm,
+                child: Text(
+                  "yes".tr(),
+                  style: const TextStyle(
+                    fontSize: 25,
+                    color: Color(0xffD80000),
+                  ),
+                ),
+                onPressed: () {
+                  Navigator.pop(context, true);
+                },
+              ),
+              const SizedBox(width: 35),
+              TextButton(
+                child: Text(
+                  "no".tr(),
+                  style: const TextStyle(fontSize: 25),
+                ),
+                onPressed: () {
+                  Navigator.pop(context, false);
+                },
+              ),
+              const SizedBox(height: 120)
+            ],
+          )
+        ],
+      );
+    },
+  );
+}
+
 Future<void> infoPopup(BuildContext context, String title) async {
   return showDialog<void>(
     context: context,

lib/screens/home.dart

@@ -4,7 +4,8 @@ import 'package:bubble/bubble.dart';
 import 'package:connectivity_plus/connectivity_plus.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:gecko/globals.dart';
-import 'package:gecko/models/stateful_wrapper.dart';
+import 'package:gecko/models/chest_data.dart';
+import 'package:gecko/models/g1_wallets_list.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/chest_provider.dart';
 import 'package:gecko/providers/duniter_indexer.dart';
@@ -14,7 +15,7 @@ import 'package:gecko/providers/wallets_profiles.dart';
 import 'package:flutter/material.dart';
 import 'package:gecko/providers/my_wallets.dart';
 import 'package:gecko/models/wallet_data.dart';
-import 'package:gecko/screens/animated_text.dart';
+import 'package:gecko/widgets/animated_text.dart';
 import 'package:gecko/screens/common_elements.dart';
 import 'package:gecko/screens/myWallets/restore_chest.dart';
 import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
@@ -22,22 +23,109 @@ import 'package:gecko/screens/myWallets/wallets_home.dart';
 import 'package:gecko/screens/onBoarding/1.dart';
 import 'package:gecko/screens/search.dart';
 import 'package:gecko/screens/settings.dart';
-import 'package:flutter/services.dart';
+import 'package:hive_flutter/hive_flutter.dart';
+
 import 'package:provider/provider.dart';
 import 'package:gecko/screens/my_contacts.dart';
 
-class HomeScreen extends StatelessWidget {
+class HomeScreen extends StatefulWidget {
   const HomeScreen({Key? key}) : super(key: key);
 
+  @override
+  State<HomeScreen> createState() => _HomeScreenState();
+}
+
+class _HomeScreenState extends State<HomeScreen> {
+  @override
+  void initState() {
+    WidgetsBinding.instance.addPostFrameCallback((_) async {
+      final homeProviderInit =
+          Provider.of<HomeProvider>(context, listen: false);
+      final sub = Provider.of<SubstrateSdk>(context, listen: false);
+      final duniterIndexer =
+          Provider.of<DuniterIndexer>(context, listen: false);
+      final myWalletProvider =
+          Provider.of<MyWalletsProvider>(context, listen: false);
+
+      configBox = await Hive.openBox("configBox");
+      final bool isWalletsExists = myWalletProvider.checkIfWalletExist();
+
+      if (!sub.sdkReady && !sub.sdkLoading) await sub.initApi();
+      if (sub.sdkReady && !sub.nodeConnected) {
+        // Check if versionData non compatible, drop everything
+        if (isWalletsExists &&
+            (configBox.get('dataVersion') ?? 0) < dataVersion) {
+          await infoPopup(context, "chestNotCompatibleMustReinstallGecko".tr());
+          await Hive.deleteBoxFromDisk('walletBox');
+          await Hive.deleteBoxFromDisk('chestBox');
+          chestBox = await Hive.openBox<ChestData>("chestBox");
+          await configBox.delete('defaultWallet');
+          await sub.deleteAllAccounts();
+          configBox.put('dataVersion', dataVersion);
+          myWalletProvider.reload();
+        }
+
+        walletBox = await Hive.openBox<WalletData>("walletBox");
+        await Hive.deleteBoxFromDisk('g1WalletsBox');
+        g1WalletsBox = await Hive.openBox<G1WalletsList>("g1WalletsBox");
+        contactsBox = await Hive.openBox<G1WalletsList>("contactsBox");
+
+        homeProviderInit.isWalletBoxInit = true;
+        myWalletProvider.reload();
+
+        duniterIndexer.getValidIndexerEndpoint();
+
+        await homeProviderInit.getValidEndpoints();
+        // await configBox.delete('isCacheChecked');
+        if (configBox.get('isCacheChecked') == null) {
+          configBox.put('isCacheChecked', false);
+        }
+        // log.d(await configBox.get('endpoint'));
+
+        // var connectivityResult =
+        //     await (Connectivity().checkConnectivity());
+
+        // if (connectivityResult != ConnectivityResult.mobile &&
+        //     connectivityResult != ConnectivityResult.wifi) {
+        //   homeProvider.changeMessage(
+        //       "notConnectedToInternet".tr(), 0);
+        //   sub.nodeConnected = false;
+        // }
+
+        // TODO: fix random bad network status on startup
+        HomeProvider homeProvider =
+            Provider.of<HomeProvider>(context, listen: false);
+        Connectivity()
+            .onConnectivityChanged
+            .listen((ConnectivityResult result) async {
+          log.d('Network changed: $result');
+          if (result == ConnectivityResult.none) {
+            sub.nodeConnected = false;
+            await sub.sdk.api.setting.unsubscribeBestNumber();
+            homeProvider.changeMessage("notConnectedToInternet".tr(), 0);
+            sub.reload();
+          } else {
+            await sub.connectNode(context);
+            // Currency parameters
+            sub.initCurrencyParameters();
+          }
+
+          // Indexer Blockchain start
+          getBlockStart();
+        });
+        // await sub.connectNode(ctx);
+      }
+      // _duniterIndexer.checkIndexerEndpointBackground();
+    });
+    super.initState();
+  }
+
   @override
   Widget build(BuildContext context) {
     homeContext = context;
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
-    MyWalletsProvider myWalletProvider =
-        Provider.of<MyWalletsProvider>(context);
-    Provider.of<ChestProvider>(context);
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
 
+    final myWalletProvider = Provider.of<MyWalletsProvider>(context);
+    Provider.of<ChestProvider>(context);
     final bool isWalletsExists = myWalletProvider.checkIfWalletExist();
 
     isTall = false;
@@ -47,148 +135,70 @@ class HomeScreen extends StatelessWidget {
       ratio = 1.125;
     }
     return Scaffold(
-      resizeToAvoidBottomInset: false,
+        resizeToAvoidBottomInset: false,
-      drawer: Drawer(
+        drawer: Drawer(
-        child: Column(
+          child: Column(
-          children: <Widget>[
+            children: <Widget>[
-            Expanded(
+              Expanded(
-                child: ListView(padding: EdgeInsets.zero, children: <Widget>[
+                  child: ListView(padding: EdgeInsets.zero, children: <Widget>[
-              DrawerHeader(
+                DrawerHeader(
-                decoration: const BoxDecoration(
+                  decoration: const BoxDecoration(
-                  color: orangeC,
+                    color: orangeC,
+                  ),
+                  child: Column(children: const <Widget>[
+                    SizedBox(height: 0),
+                    Image(
+                        image: AssetImage('assets/icon/gecko_final.png'),
+                        height: 130),
+                  ]),
                 ),
-                child: Column(children: const <Widget>[
+                ListTile(
-                  SizedBox(height: 0),
+                  key: keyParameters,
-                  Image(
+                  title: Text('parameters'.tr()),
-                      image: AssetImage('assets/icon/gecko_final.png'),
+                  onTap: () {
-                      height: 130),
+                    Navigator.pop(context);
-                ]),
+                    Navigator.push(
-              ),
+                      context,
-              ListTile(
+                      MaterialPageRoute(builder: (context) {
-                key: keyParameters,
+                        return SettingsScreen();
-                title: Text('parameters'.tr()),
+                      }),
-                onTap: () {
+                    );
-                  Navigator.pop(context);
+                  },
-                  Navigator.push(
+                ),
-                    context,
+                ListTile(
-                    MaterialPageRoute(builder: (context) {
+                  key: keyContacts,
-                      return SettingsScreen();
+                  title: Text('contactsManagement'.tr()),
-                    }),
+                  onTap: () {
-                  );
+                    Navigator.pop(context);
-                },
+                    Navigator.push(
-              ),
+                      context,
-              ListTile(
+                      MaterialPageRoute(builder: (context) {
-                key: keyContacts,
+                        return const ContactsScreen();
-                title: Text('contactsManagement'.tr()),
+                      }),
-                onTap: () {
+                    );
-                  Navigator.pop(context);
+                  },
-                  Navigator.push(
+                ),
-                    context,
+              ])),
-                    MaterialPageRoute(builder: (context) {
+              Align(
-                      return const ContactsScreen();
+                  alignment: FractionalOffset.bottomCenter,
-                    }),
+                  child: Text('Ğecko v$appVersion')),
-                  );
+              const SizedBox(height: 20)
-                },
+            ],
-              ),
+          ),
-            ])),
-            Align(
-                alignment: FractionalOffset.bottomCenter,
-                child: Text('Ğecko v$appVersion')),
-            const SizedBox(height: 20)
-          ],
         ),
-      ),
+        backgroundColor: const Color(0xffF9F9F1),
-      // bottomNavigationBar: _homeProvider.bottomBar(context, 1),
+        body: isWalletsExists ? geckHome(context) : welcomeHome(context));
-      backgroundColor: const Color(0xffF9F9F1),
-      body: Builder(
-        builder: (ctx) => StatefulWrapper(
-            onInit: () {
-              WidgetsBinding.instance.addPostFrameCallback((_) async {
-                DuniterIndexer duniterIndexer =
-                    Provider.of<DuniterIndexer>(ctx, listen: false);
-                duniterIndexer.getValidIndexerEndpoint();
-
-                if (!sub.sdkReady && !sub.sdkLoading) await sub.initApi();
-                if (sub.sdkReady && !sub.nodeConnected) {
-                  // Check if versionData non compatible, drop everything
-                  if (walletBox.isNotEmpty &&
-                      walletBox.getAt(0)!.version! < dataVersion) {
-                    await infoPopup(
-                        context, "chestNotCompatibleMustReinstallGecko".tr());
-                    await walletBox.clear();
-                    await chestBox.clear();
-                    await configBox.delete('defaultWallet');
-                    await sub.deleteAllAccounts();
-                    myWalletProvider.reload();
-                  }
-
-                  // var connectivityResult =
-                  //     await (Connectivity().checkConnectivity());
-
-                  // if (connectivityResult != ConnectivityResult.mobile &&
-                  //     connectivityResult != ConnectivityResult.wifi) {
-                  //   homeProvider.changeMessage(
-                  //       "notConnectedToInternet".tr(), 0);
-                  //   sub.nodeConnected = false;
-                  // }
-
-                  // TODO: fix random bad network status on startup
-                  HomeProvider homeProvider =
-                      Provider.of<HomeProvider>(ctx, listen: false);
-                  Connectivity()
-                      .onConnectivityChanged
-                      .listen((ConnectivityResult result) async {
-                    log.d('Network changed: $result');
-                    if (result == ConnectivityResult.none) {
-                      sub.nodeConnected = false;
-                      await sub.sdk.api.setting.unsubscribeBestNumber();
-                      homeProvider.changeMessage(
-                          "notConnectedToInternet".tr(), 0);
-                      sub.reload();
-                    } else {
-                      await sub.connectNode(ctx);
-                    }
-                  });
-                  // await sub.connectNode(ctx);
-                }
-                // _duniterIndexer.checkIndexerEndpointBackground();
-              });
-            },
-            child: isWalletsExists ? geckHome(context) : welcomeHome(context)
-            // bottomNavigationBar: BottomNavigationBar(
-            //   backgroundColor: backgroundColor,
-            //   fixedColor: Colors.grey[850],
-            //   unselectedItemColor: const Color(0xffBD935C),
-            //   type: BottomNavigationBarType.fixed,
-            //   onTap: (index) {
-            //     _homeProvider.currentIndex = index;
-            //   },
-            //   currentIndex: _homeProvider.currentIndex,
-            //   items: [
-            //     BottomNavigationBarItem(
-            //       icon: Image.asset('assets/block-space-disabled.png', height: 26),
-            //       activeIcon: Image.asset('assets/blockchain.png', height: 26),
-            //       label: 'Explorateur',
-            //     ),
-            //     const BottomNavigationBarItem(
-            //       icon: Icon(Icons.lock),
-            //       label: 'Mes portefeuilles',
-            //     ),
-            //   ],
-            // ),
-            ),
-      ),
-    );
   }
 }
 
 Widget geckHome(context) {
-  MyWalletsProvider myWalletProvider = Provider.of<MyWalletsProvider>(context);
+  final myWalletProvider = Provider.of<MyWalletsProvider>(context);
+  final homeProvider = Provider.of<HomeProvider>(context, listen: false);
   Provider.of<ChestProvider>(context);
 
   WalletsProfilesProvider historyProvider =
       Provider.of<WalletsProfilesProvider>(context);
-  final double statusBarHeight = MediaQuery.of(context).padding.top;
+  final statusBarHeight = MediaQuery.of(context).padding.top;
   return Container(
     decoration: const BoxDecoration(
       image: DecorationImage(
@@ -330,42 +340,47 @@ Widget geckHome(context) {
                   child: ClipOval(
                     key: keyOpenWalletsHomme,
                     child: Material(
-                      color: orangeC, // button color
+                      color: homeProvider.isWalletBoxInit
+                          ? orangeC
+                          : Colors.grey[500], // button color
                       child: InkWell(
+                          onTap: !homeProvider.isWalletBoxInit
+                              ? null
+                              : () async {
+                                  WalletData? defaultWallet =
+                                      myWalletProvider.getDefaultWallet();
+                                  String? pin;
+                                  if (myWalletProvider.pinCode == '') {
+                                    pin = await Navigator.push(
+                                      context,
+                                      MaterialPageRoute(
+                                        builder: (homeContext) {
+                                          return UnlockingWallet(
+                                              wallet: defaultWallet);
+                                        },
+                                      ),
+                                    );
+                                  }
+                                  if (pin != null ||
+                                      myWalletProvider.pinCode != '') {
+                                    Navigator.push(
+                                      context,
+                                      MaterialPageRoute(builder: (context) {
+                                        return const WalletsHome();
+                                      }),
+                                    );
+                                  }
+                                  // log.d(_myWalletProvider.pinCode);
+
+                                  // Navigator.pushNamed(
+                                  //     context, '/mywallets')));
+                                },
                           child: Padding(
                               padding: const EdgeInsets.all(18),
                               child: Image(
                                   image: const AssetImage(
                                       'assets/home/wallet.png'),
-                                  height: 68 * ratio)),
+                                  height: 68 * ratio))),
-                          onTap: () async {
-                            WalletData? defaultWallet =
-                                myWalletProvider.getDefaultWallet();
-                            String? pin;
-                            if (myWalletProvider.pinCode == '') {
-                              pin = await Navigator.push(
-                                context,
-                                MaterialPageRoute(
-                                  builder: (homeContext) {
-                                    return UnlockingWallet(
-                                        wallet: defaultWallet);
-                                  },
-                                ),
-                              );
-                            }
-                            if (pin != null || myWalletProvider.pinCode != '') {
-                              Navigator.push(
-                                context,
-                                MaterialPageRoute(builder: (context) {
-                                  return const WalletsHome();
-                                }),
-                              );
-                            }
-                            // log.d(_myWalletProvider.pinCode);
-
-                            // Navigator.pushNamed(
-                            //     context, '/mywallets')));
-                          }),
                     ),
                   ),
                 ),
@@ -434,7 +449,7 @@ Widget geckHome(context) {
 }
 
 Widget welcomeHome(context) {
-  final double statusBarHeight = MediaQuery.of(context).padding.top;
+  final statusBarHeight = MediaQuery.of(context).padding.top;
 
   return Container(
     decoration: const BoxDecoration(

lib/screens/myWallets/change_pin.dart

@@ -3,7 +3,7 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:durt/durt.dart';
-import 'package:flutter/services.dart';
+
 import 'package:gecko/globals.dart';
 import 'package:gecko/models/stateful_wrapper.dart';
 import 'package:gecko/models/wallet_data.dart';
@@ -26,9 +26,8 @@ class ChangePinScreen extends StatelessWidget with ChangeNotifier {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final myWalletProvider =
-    MyWalletsProvider myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
 
     return WillPopScope(
@@ -118,7 +117,7 @@ class ChangePinScreen extends StatelessWidget with ChangeNotifier {
                       );
                     }
                     if (pin != null || myWalletProvider.pinCode != '') {
-                      await sub.changePassword(context, defaultWallet.address!,
+                      await sub.changePassword(context, defaultWallet.address,
                           walletProvider.pinCode, newPin.text);
                       walletProvider.pinCode = newPin.text;
                       newPin.text = '';

lib/screens/myWallets/chest_options.dart

@@ -4,11 +4,10 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:gecko/globals.dart';
 import 'package:gecko/models/chest_data.dart';
-import 'package:flutter/services.dart';
+
 import 'package:gecko/models/wallet_data.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/chest_provider.dart';
-import 'package:gecko/providers/home.dart';
 import 'package:gecko/providers/my_wallets.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
 import 'package:gecko/screens/common_elements.dart';
@@ -16,6 +15,7 @@ import 'package:gecko/screens/myWallets/change_pin.dart';
 import 'package:gecko/screens/myWallets/custom_derivations.dart';
 import 'package:gecko/screens/myWallets/show_seed.dart';
 import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
+import 'package:gecko/widgets/bottom_app_bar.dart';
 import 'package:provider/provider.dart';
 
 class ChestOptions extends StatelessWidget {
@@ -25,11 +25,7 @@ class ChestOptions extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+    final chestProvider = Provider.of<ChestProvider>(context, listen: false);
-    ChestProvider chestProvider =
-        Provider.of<ChestProvider>(context, listen: false);
-    HomeProvider homeProvider =
-        Provider.of<HomeProvider>(context, listen: false);
 
     ChestData currentChest = chestBox.get(configBox.get('currentChest'))!;
 
@@ -52,7 +48,7 @@ class ChestOptions extends StatelessWidget {
             height: 22,
             child: Text(currentChest.name!),
           )),
-      bottomNavigationBar: homeProvider.bottomAppBar(context),
+      bottomNavigationBar: const GeckoBottomAppBar(),
       body: Stack(children: [
         Builder(
           builder: (ctx) => SafeArea(
@@ -61,7 +57,7 @@ class ChestOptions extends StatelessWidget {
               InkWell(
                 key: keyShowSeed,
                 onTap: () async {
-                  MyWalletsProvider myWalletProvider =
+                  final myWalletProvider =
                       Provider.of<MyWalletsProvider>(context, listen: false);
                   WalletData? defaultWallet =
                       myWalletProvider.getDefaultWallet();

lib/screens/myWallets/choose_chest.dart

@@ -1,7 +1,7 @@
 // ignore_for_file: use_build_context_synchronously
 
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/services.dart';
+
 import 'package:gecko/globals.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/my_wallets.dart';
@@ -30,9 +30,7 @@ class _ChooseChestState extends State<ChooseChest> {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+    final myWalletProvider = Provider.of<MyWalletsProvider>(context);
-    MyWalletsProvider myWalletProvider =
-        Provider.of<MyWalletsProvider>(context);
 
     return Scaffold(
         backgroundColor: backgroundColor,

lib/screens/myWallets/choose_wallet.dart

@@ -3,15 +3,15 @@
 import 'dart:io';
 
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/services.dart';
+
 import 'package:gecko/globals.dart';
 import 'package:flutter/material.dart';
 import 'package:gecko/models/wallet_data.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/my_wallets.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
-import 'package:gecko/providers/wallet_options.dart';
 import 'package:gecko/screens/myWallets/wallets_home.dart';
+import 'package:gecko/widgets/balance.dart';
 import 'package:provider/provider.dart';
 // import 'package:gecko/models/home.dart';
 // import 'package:provider/provider.dart';
@@ -23,8 +23,7 @@ class ChooseWalletScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
     final int chest = configBox.get('currentChest');
 
     return Scaffold(
@@ -73,9 +72,7 @@ class ChooseWalletScreen extends StatelessWidget {
   }
 
   Widget myWalletsTiles(BuildContext context, int currentChest) {
-    MyWalletsProvider myWalletProvider =
+    final myWalletProvider = Provider.of<MyWalletsProvider>(context);
-        Provider.of<MyWalletsProvider>(context);
-    // SubstrateSdk _sub = Provider.of<SubstrateSdk>(context, listen: false);
 
     final bool isWalletsExists = myWalletProvider.checkIfWalletExist();
     WalletData? defaultWallet = myWalletProvider.getDefaultWallet();
@@ -97,8 +94,11 @@ class ChooseWalletScreen extends StatelessWidget {
       ]);
     }
 
-    List listWallets = myWalletProvider.listWallets;
+    List<WalletData> listWallets = myWalletProvider.listWallets;
-    final double screenWidth = MediaQuery.of(context).size.width;
+    listWallets.sort((p1, p2) {
+      return Comparable.compare(p1.number!, p2.number!);
+    });
+    final screenWidth = MediaQuery.of(context).size.width;
     int nTule = 2;
 
     if (screenWidth >= 900) {
@@ -116,11 +116,11 @@ class ChooseWalletScreen extends StatelessWidget {
           crossAxisSpacing: 0,
           mainAxisSpacing: 0,
           children: <Widget>[
-            for (WalletData repository in listWallets as Iterable<WalletData>)
+            for (WalletData repository in listWallets)
               Padding(
                   padding: const EdgeInsets.all(16),
                   child: GestureDetector(
-                    key: keySelectThisWallet(repository.address!),
+                    key: keySelectThisWallet(repository.address),
                     onTap: () {
                       selectedWallet = repository;
                       myWalletProvider.reload();
@@ -169,8 +169,8 @@ class ChooseWalletScreen extends StatelessWidget {
                                     ),
                                   ),
                           )),
-                          balanceBuilder(context, repository.address!,
+                          balanceBuilder(context, repository.address,
-                              selectedWallet!.address == repository.address!),
+                              selectedWallet!.address == repository.address),
                           ListTile(
                             shape: const RoundedRectangleBorder(
                               borderRadius: BorderRadius.vertical(
@@ -225,8 +225,10 @@ class ChooseWalletScreen extends StatelessWidget {
           //   style: TextStyle(color: isDefault ? Colors.white : Colors.black),
           // ),
           Row(mainAxisAlignment: MainAxisAlignment.center, children: [
-            balance(
+            Balance(
-                context, address, 16, isDefault ? Colors.white : Colors.black),
+                address: address,
+                size: 16,
+                color: isDefault ? Colors.white : Colors.black),
           ])
         ]),
       ),

lib/screens/myWallets/custom_derivations.dart

@@ -1,7 +1,7 @@
 // ignore_for_file: use_build_context_synchronously
 
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/services.dart';
+
 import 'package:gecko/globals.dart';
 import 'package:flutter/material.dart';
 import 'package:gecko/models/wallet_data.dart';
@@ -27,8 +27,7 @@ class _CustomDerivationState extends State<CustomDerivation> {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+    final myWalletProvider =
-    MyWalletsProvider myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
 
     final derivationList = <String>[

lib/screens/myWallets/import_g1_v1.dart

@@ -4,16 +4,18 @@ import 'dart:async';
 
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/services.dart';
+
 import 'package:gecko/globals.dart';
 import 'package:flutter/material.dart';
 import 'package:gecko/models/wallet_data.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/my_wallets.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
-import 'package:gecko/providers/wallet_options.dart';
 import 'package:gecko/providers/wallets_profiles.dart';
 import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
 import 'package:gecko/screens/transaction_in_progress.dart';
+import 'package:gecko/widgets/certifications.dart';
+import 'package:gecko/widgets/idty_status.dart';
 import 'package:provider/provider.dart';
 
 class ImportG1v1 extends StatelessWidget {
@@ -21,10 +23,7 @@ class ImportG1v1 extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+    final myWalletProvider =
-    WalletOptionsProvider walletOptions =
-        Provider.of<WalletOptionsProvider>(context, listen: false);
-    MyWalletsProvider myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
 
     Timer? debounce;
@@ -57,7 +56,7 @@ class ImportG1v1 extends StatelessWidget {
           child: Consumer<SubstrateSdk>(builder: (context, sub, _) {
             return FutureBuilder(
                 future: sub.getBalanceAndIdtyStatus(
-                    sub.g1V1NewAddress, selectedWallet.address!),
+                    sub.g1V1NewAddress, selectedWallet.address),
                 builder: (BuildContext context, AsyncSnapshot<List> status) {
                   // log.d(_certs.data);
 
@@ -83,6 +82,7 @@ class ImportG1v1 extends StatelessWidget {
                   final String idtyStatus = status.data?[1];
                   final String myIdtyStatus = status.data?[2];
                   final bool hasConsumer = status.data?[3] ?? false;
+                  final bool isSmith = status.data?[4] ?? false;
 
                   // log.d('hasconsumer: $hasConsumer');
 
@@ -92,7 +92,7 @@ class ImportG1v1 extends StatelessWidget {
                   } else {
                     canValidate = false;
                     validationStatus = hasConsumer
-                        ? 'youMustWaitBeforeCashoutThisAccount'.tr(args: ['X'])
+                        ? 'youMustWaitBeforeCashoutThisAccount'.tr()
                         : 'thisAccountIsEmpty'.tr();
                   }
 
@@ -102,6 +102,11 @@ class ImportG1v1 extends StatelessWidget {
                         'youCannotMigrateIdentityToExistingIdentity'.tr();
                   }
 
+                  if (isSmith) {
+                    canValidate = false;
+                    validationStatus = 'smithCantMigrateIdentity'.tr();
+                  }
+
                   if (sub.g1V1NewAddress == '') {
                     validationStatus = '';
                   }
@@ -185,13 +190,13 @@ class ImportG1v1 extends StatelessWidget {
                       key: keyCopyAddress,
                       onTap: () {
                         Clipboard.setData(
-                            ClipboardData(text: sub.g1V1NewAddress));
+                            ClipboardData(text: sub.g1V1OldPubkey));
                         snackCopyKey(context);
                       },
                       child: Text(
-                        getShortPubkey(sub.g1V1NewAddress),
+                        sub.g1V1OldPubkey,
                         style: const TextStyle(
-                          fontSize: 20,
+                          fontSize: 16,
                           fontWeight: FontWeight.w600,
                         ),
                       ),
@@ -204,10 +209,12 @@ class ImportG1v1 extends StatelessWidget {
                     Row(
                       mainAxisAlignment: MainAxisAlignment.center,
                       children: [
-                        walletOptions.idtyStatus(context, sub.g1V1NewAddress,
+                        IdentityStatus(
-                            isOwner: false, color: Colors.black),
+                            address: sub.g1V1NewAddress,
+                            isOwner: false,
+                            color: Colors.black),
                         const SizedBox(width: 10),
-                        getCerts(context, sub.g1V1NewAddress, 14)
+                        Certifications(address: sub.g1V1NewAddress, size: 14)
                       ],
                     ),
                     const SizedBox(height: 30),
@@ -221,7 +228,7 @@ class ImportG1v1 extends StatelessWidget {
                         icon: const Icon(Icons.keyboard_arrow_down),
                         items: myWalletProvider.listWallets.map((wallet) {
                           return DropdownMenuItem(
-                            key: keySelectThisWallet(wallet.address!),
+                            key: keySelectThisWallet(wallet.address),
                             value: wallet,
                             child: Text(
                               wallet.name!,
@@ -263,10 +270,8 @@ class ImportG1v1 extends StatelessWidget {
                                   );
                                 }
 
-                                sub.migrateCsToV2(
+                                sub.migrateCsToV2(sub.csSalt.text,
-                                    sub.csSalt.text,
+                                    sub.csPassword.text, selectedWallet.address,
-                                    sub.csPassword.text,
-                                    selectedWallet.address!,
                                     destPassword:
                                         pin ?? myWalletProvider.pinCode,
                                     balance: balance,
@@ -279,7 +284,7 @@ class ImportG1v1 extends StatelessWidget {
                                         fromAddress:
                                             getShortPubkey(sub.g1V1NewAddress),
                                         toAddress: getShortPubkey(
-                                            selectedWallet.address!));
+                                            selectedWallet.address));
                                   }),
                                 );
                                 resetScreen(context);
@@ -308,7 +313,7 @@ class ImportG1v1 extends StatelessWidget {
   }
 
   void resetScreen(BuildContext context) {
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
 
     sub.csSalt.text = '';
     sub.csPassword.text = '';

lib/screens/myWallets/manage_membership.dart

@@ -1,7 +1,7 @@
 // ignore_for_file: use_build_context_synchronously
 
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/services.dart';
+
 import 'package:gecko/globals.dart';
 import 'package:flutter/material.dart';
 import 'package:gecko/models/wallet_data.dart';
@@ -27,7 +27,6 @@ class ManageMembership extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
     final sub = Provider.of<SubstrateSdk>(context);
 
     return Scaffold(
@@ -116,9 +115,9 @@ class ManageMembership extends StatelessWidget {
             false;
 
         if (answer) {
-          MyWalletsProvider myWalletProvider =
+          final myWalletProvider =
               Provider.of<MyWalletsProvider>(context, listen: false);
-          SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+          final sub = Provider.of<SubstrateSdk>(context, listen: false);
 
           // MyWalletsProvider mw = MyWalletsProvider();
           // final wallet = mw.getWalletDataByAddress(address);

lib/screens/myWallets/migrate_identity.dart

@@ -1,7 +1,7 @@
 // ignore_for_file: use_build_context_synchronously
 
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/services.dart';
+
 import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:gecko/globals.dart';
 import 'package:flutter/material.dart';
@@ -20,14 +20,12 @@ class MigrateIdentityScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+    // final _homeProvider = Provider.of<HomeProvider>(context);
-    // HomeProvider _homeProvider = Provider.of<HomeProvider>(context);
+    final walletOptions =
-    WalletOptionsProvider walletOptions =
         Provider.of<WalletOptionsProvider>(context, listen: false);
-    MyWalletsProvider myWalletProvider =
+    final myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
-    DuniterIndexer duniterIndexer =
+    final duniterIndexer = Provider.of<DuniterIndexer>(context, listen: false);
-        Provider.of<DuniterIndexer>(context, listen: false);
 
     final fromAddress = walletOptions.address.text;
     final defaultWallet = myWalletProvider.getDefaultWallet();
@@ -77,7 +75,7 @@ class MigrateIdentityScreen extends StatelessWidget {
         child: Consumer<SubstrateSdk>(builder: (context, sub, _) {
           return FutureBuilder(
               future: sub.getBalanceAndIdtyStatus(
-                  fromAddress, selectedWallet.address!),
+                  fromAddress, selectedWallet.address),
               builder: (BuildContext context, AsyncSnapshot<List> status) {
                 if (status.data == null) {
                   return Column(children: [
@@ -103,12 +101,21 @@ class MigrateIdentityScreen extends StatelessWidget {
                 final String idtyStatus = status.data?[1];
                 final String myIdtyStatus = status.data?[2];
                 final bool hasConsumer = status.data?[3] ?? false;
+                final bool isSmith = status.data?[4] ?? false;
 
                 // log.d('hasconsumer: $hasConsumer');
 
-                if (balance['transferableBalance'] != 0 && !hasConsumer) {
+                if (isSmith) {
+                  canValidate = false;
+                  validationStatus = 'smithCantMigrateIdentity'.tr();
+                } else if (balance['transferableBalance'] != 0 &&
+                    !hasConsumer) {
                   canValidate = true;
                   validationStatus = '';
+                } else if (idtyStatus != 'noid' && myIdtyStatus != 'noid') {
+                  canValidate = false;
+                  validationStatus =
+                      'youCannotMigrateIdentityToExistingIdentity'.tr();
                 } else {
                   canValidate = false;
                   validationStatus = hasConsumer
@@ -116,14 +123,8 @@ class MigrateIdentityScreen extends StatelessWidget {
                       : 'thisAccountIsEmpty'.tr();
                 }
 
-                if (idtyStatus != 'noid' && myIdtyStatus != 'noid') {
-                  canValidate = false;
-                  validationStatus =
-                      'youCannotMigrateIdentityToExistingIdentity'.tr();
-                }
-
                 log.d(
-                    'tatatata: ${sub.g1V1NewAddress}, ${selectedWallet.address!}, $balance, $idtyStatus, $myIdtyStatus');
+                    'tatatata: ${sub.g1V1NewAddress}, ${selectedWallet.address}, $balance, $idtyStatus, $myIdtyStatus');
 
                 final walletsList = myWalletProvider.listWallets.toList();
 
@@ -176,7 +177,7 @@ class MigrateIdentityScreen extends StatelessWidget {
                       icon: const Icon(Icons.keyboard_arrow_down),
                       items: walletsList.map((wallet) {
                         return DropdownMenuItem(
-                          key: keySelectThisWallet(wallet.address!),
+                          key: keySelectThisWallet(wallet.address),
                           value: wallet,
                           child: Text(
                             wallet.name!,
@@ -221,7 +222,7 @@ class MigrateIdentityScreen extends StatelessWidget {
 
                               sub.migrateIdentity(
                                   fromAddress: fromAddress,
-                                  destAddress: selectedWallet.address!,
+                                  destAddress: selectedWallet.address,
                                   fromPassword: pin ?? myWalletProvider.pinCode,
                                   destPassword: pin ?? myWalletProvider.pinCode,
                                   withBalance: true,
@@ -233,7 +234,7 @@ class MigrateIdentityScreen extends StatelessWidget {
                                       transType: 'identityMigration',
                                       fromAddress: getShortPubkey(fromAddress),
                                       toAddress: getShortPubkey(
-                                          selectedWallet.address!));
+                                          selectedWallet.address));
                                 }),
                               );
                             }

lib/screens/myWallets/restore_chest.dart

@@ -1,6 +1,6 @@
 import 'package:bubble/bubble.dart';
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/services.dart';
+
 import 'package:gecko/globals.dart';
 import 'package:flutter/material.dart';
 import 'package:gecko/models/widgets_keys.dart';
@@ -19,10 +19,8 @@ class RestoreChest extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+    final genW = Provider.of<GenerateWalletsProvider>(context, listen: false);
-    GenerateWalletsProvider genW =
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
-        Provider.of<GenerateWalletsProvider>(context, listen: false);
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
 
     genW.actualWallet = null;
     if (genW.isSentenceComplete(context)) {
@@ -183,7 +181,7 @@ class RestoreChest extends StatelessWidget {
   }
 
   Widget arrayCell(BuildContext context, TextEditingController cellCtl) {
-    GenerateWalletsProvider generateWalletProvider =
+    final generateWalletProvider =
         Provider.of<GenerateWalletsProvider>(context);
 
     return Container(

lib/screens/myWallets/show_seed.dart

@@ -1,11 +1,13 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/services.dart';
+
 import 'package:gecko/globals.dart';
 import 'package:flutter/material.dart';
 import 'package:gecko/models/wallet_data.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/my_wallets.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
+import 'package:gecko/providers/wallets_profiles.dart';
 import 'package:gecko/screens/common_elements.dart';
 import 'package:pdf/pdf.dart';
 import 'package:printing/printing.dart';
@@ -23,12 +25,11 @@ class ShowSeed extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+    final myWalletProvider =
-    MyWalletsProvider myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
     CommonElements common = CommonElements();
 
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
 
     WalletData defaultWallet = myWalletProvider.getDefaultWallet();
 
@@ -45,7 +46,7 @@ class ShowSeed extends StatelessWidget {
             const Spacer(flex: 1),
             FutureBuilder(
                 future:
-                    sub.getSeed(defaultWallet.address!, walletProvider.pinCode),
+                    sub.getSeed(defaultWallet.address, walletProvider.pinCode),
                 builder: (BuildContext context, AsyncSnapshot<String?> seed) {
                   if (seed.connectionState != ConnectionState.done ||
                       seed.hasError) {
@@ -83,7 +84,7 @@ class ShowSeed extends StatelessWidget {
                               onPressed: () {
                                 Clipboard.setData(
                                     ClipboardData(text: seed.data));
-                                snackCopyKey(context);
+                                snackCopySeed(context);
                               },
                               child: Row(children: <Widget>[
                                 Image.asset(
@@ -141,16 +142,6 @@ class ShowSeed extends StatelessWidget {
         ));
   }
 
-  snackCopyKey(context) {
-    const snackBar = SnackBar(
-        padding: EdgeInsets.all(20),
-        content: Text(
-            "Votre phrase de restauration a été copié dans votre presse-papier.",
-            style: TextStyle(fontSize: 16)),
-        duration: Duration(seconds: 2));
-    ScaffoldMessenger.of(context).showSnackBar(snackBar);
-  }
-
   Widget sentanceArray(BuildContext context, List mnemonic) {
     return Padding(
       padding: const EdgeInsets.symmetric(horizontal: 3),

lib/screens/myWallets/unlocking_wallet.dart

@@ -3,7 +3,7 @@
 import 'dart:async';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/services.dart';
+
 import 'package:gecko/models/chest_data.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
@@ -22,6 +22,8 @@ class UnlockingWallet extends StatelessWidget {
   late int currentChestNumber;
   late ChestData currentChest;
   bool canUnlock = true;
+  TextEditingController enterPin = TextEditingController();
+  FocusNode pinFocus = FocusNode(debugLabel: 'pinFocusNode');
 
   // ignore: close_sinks
   StreamController<ErrorAnimationType>? errorController;
@@ -30,10 +32,10 @@ class UnlockingWallet extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+    final walletOptions =
-    WalletOptionsProvider walletOptions =
+        Provider.of<WalletOptionsProvider>(context, listen: false);
-        Provider.of<WalletOptionsProvider>(context);
+    final myWalletProvider =
-    // final double statusBarHeight = MediaQuery.of(context).padding.top;
+        Provider.of<MyWalletsProvider>(context, listen: false);
 
     currentChestNumber = configBox.get('currentChest');
     currentChest = chestBox.get(currentChestNumber)!;
@@ -41,154 +43,168 @@ class UnlockingWallet extends StatelessWidget {
     int pinLenght = walletOptions.getPinLenght(wallet.number);
     errorController = StreamController<ErrorAnimationType>();
 
-    return Scaffold(
+    // if (enterPin.text == '') myWalletProvider.isPinLoading = true;
-        backgroundColor: backgroundColor,
+
-        body: SafeArea(
+    return WillPopScope(
-          child: Column(
+      onWillPop: () {
-              crossAxisAlignment: CrossAxisAlignment.start,
+        myWalletProvider.isPinValid = false;
-              children: <Widget>[
+        myWalletProvider.isPinLoading = true;
-                Stack(children: <Widget>[
+        return Future<bool>.value(true);
-                  Positioned(
+      },
-                    top: 10, //statusBarHeight + 10,
+      child: Scaffold(
-                    left: 15,
+          backgroundColor: backgroundColor,
-                    child: Builder(
+          body: SafeArea(
-                      builder: (context) => IconButton(
+            child: Column(
-                        key: keyPopButton,
+                crossAxisAlignment: CrossAxisAlignment.start,
-                        icon: const Icon(
+                children: <Widget>[
-                          Icons.arrow_back,
+                  Stack(children: <Widget>[
-                          color: Colors.black,
+                    Positioned(
-                          size: 30,
+                      top: 10, //statusBarHeight + 10,
+                      left: 15,
+                      child: Builder(
+                        builder: (context) => IconButton(
+                          key: keyPopButton,
+                          icon: const Icon(
+                            Icons.arrow_back,
+                            color: Colors.black,
+                            size: 30,
+                          ),
+                          onPressed: () {
+                            myWalletProvider.isPinValid = false;
+                            myWalletProvider.isPinLoading = true;
+                            Navigator.pop(context);
+                          },
                         ),
-                        onPressed: () => Navigator.pop(context),
                       ),
                     ),
-                  ),
+                    Column(children: <Widget>[
-                  Column(children: <Widget>[
+                      SizedBox(height: isTall ? 100 : 20),
-                    SizedBox(height: isTall ? 100 : 20),
+                      Row(
-                    Row(
+                          mainAxisAlignment: MainAxisAlignment.center,
-                        mainAxisAlignment: MainAxisAlignment.center,
+                          children: <Widget>[
-                        children: <Widget>[
+                            currentChest.imageFile == null
-                          currentChest.imageFile == null
+                                ? Image.asset(
-                              ? Image.asset(
+                                    'assets/chests/${currentChest.imageName}',
-                                  'assets/chests/${currentChest.imageName}',
+                                    width: isTall ? 130 : 100,
-                                  width: isTall ? 130 : 100,
+                                  )
-                                )
+                                : Image.file(
-                              : Image.file(
+                                    currentChest.imageFile!,
-                                  currentChest.imageFile!,
+                                    width: isTall ? 130 : 100,
-                                  width: isTall ? 130 : 100,
+                                  ),
-                                ),
+                            const SizedBox(width: 5),
-                          const SizedBox(width: 5),
+                            SizedBox(
-                          SizedBox(
+                                width: 250,
-                              width: 250,
+                                child: Text(
-                              child: Text(
+                                  currentChest.name!,
-                                currentChest.name!,
+                                  textAlign: TextAlign.center,
-                                textAlign: TextAlign.center,
+                                  style: const TextStyle(
-                                style: const TextStyle(
+                                      fontSize: 25,
-                                    fontSize: 25,
+                                      color: Colors.black,
-                                    color: Colors.black,
+                                      fontWeight: FontWeight.w700),
-                                    fontWeight: FontWeight.w700),
+                                )),
-                              )),
+                          ]),
-                        ]),
+                      SizedBox(height: 30 * ratio),
-                    SizedBox(height: 30 * ratio),
+                      SizedBox(
-                    SizedBox(
-                        width: 400,
-                        child: Text(
-                          'toUnlockEnterPassword'.tr(),
-                          style: const TextStyle(
-                              fontSize: 19,
-                              color: Colors.black,
-                              fontWeight: FontWeight.w400),
-                        )),
-                    SizedBox(height: 40 * ratio),
-                    pinForm(context, pinLenght),
-                    SizedBox(height: 3 * ratio),
-                    if (canUnlock)
-                      InkWell(
-                        key: keyCachePassword,
-                        onTap: () {
-                          walletOptions.changePinCacheChoice();
-                        },
-                        child: Row(children: [
-                          const SizedBox(height: 30),
-                          const Spacer(),
-                          Icon(
-                            configBox.get('isCacheChecked')
-                                ? Icons.check_box
-                                : Icons.check_box_outline_blank,
-                            color: orangeC,
-                          ),
-                          const SizedBox(width: 8),
-                          Text(
-                            'rememberPassword'.tr(),
-                            style: TextStyle(
-                                fontSize: 16, color: Colors.grey[700]),
-                          ),
-                          const Spacer()
-                        ]),
-                      ),
-                    const SizedBox(height: 10),
-                    // if (canUnlock)
-                    InkWell(
-                        key: keyChangeChest,
-                        onTap: () {
-                          Navigator.push(
-                            context,
-                            MaterialPageRoute(builder: (context) {
-                              return const ChooseChest();
-                            }),
-                          );
-                        },
-                        child: SizedBox(
                           width: 400,
-                          height: 50,
+                          child: Text(
-                          child: Center(
+                            'toUnlockEnterPassword'.tr(),
-                            child: Text(
+                            style: const TextStyle(
-                              'changeChest'.tr(),
+                                fontSize: 19,
-                              style: const TextStyle(
+                                color: Colors.black,
-                                  fontSize: 22,
+                                fontWeight: FontWeight.w400),
-                                  color: orangeC,
+                          )),
-                                  fontWeight: FontWeight.w600),
+                      SizedBox(height: 30 * ratio),
+                      if (!myWalletProvider.isPinValid &&
+                          !myWalletProvider.isPinLoading)
+                        Text(
+                          "Ce n'est pas le bon code".tr(),
+                          style: const TextStyle(
+                              color: Colors.red, fontWeight: FontWeight.w500),
+                        ),
+                      SizedBox(height: 10 * ratio),
+                      pinForm(context, pinLenght),
+                      SizedBox(height: 3 * ratio),
+                      if (canUnlock)
+                        Consumer<WalletOptionsProvider>(
+                            builder: (context, sub, _) {
+                          return InkWell(
+                            key: keyCachePassword,
+                            onTap: () {
+                              walletOptions.changePinCacheChoice();
+                            },
+                            child: Row(children: [
+                              const SizedBox(height: 30),
+                              const Spacer(),
+                              Icon(
+                                configBox.get('isCacheChecked')
+                                    ? Icons.check_box
+                                    : Icons.check_box_outline_blank,
+                                color: orangeC,
+                              ),
+                              const SizedBox(width: 8),
+                              Text(
+                                'rememberPassword'.tr(),
+                                style: TextStyle(
+                                    fontSize: 16, color: Colors.grey[700]),
+                              ),
+                              const Spacer()
+                            ]),
+                          );
+                        }),
+                      const SizedBox(height: 10),
+                      // if (canUnlock)
+                      InkWell(
+                          key: keyChangeChest,
+                          onTap: () {
+                            Navigator.push(
+                              context,
+                              MaterialPageRoute(builder: (context) {
+                                return const ChooseChest();
+                              }),
+                            );
+                          },
+                          child: SizedBox(
+                            width: 400,
+                            height: 50,
+                            child: Center(
+                              child: Text(
+                                'changeChest'.tr(),
+                                style: const TextStyle(
+                                    fontSize: 22,
+                                    color: orangeC,
+                                    fontWeight: FontWeight.w600),
+                              ),
                             ),
-                          ),
+                          )),
-                        )),
+                    ]),
                   ]),
                 ]),
-              ]),
+          )),
-        ));
+    );
   }
 
   Widget pinForm(context, pinLenght) {
-    // var _walletPin = '';
+    final myWalletProvider = Provider.of<MyWalletsProvider>(context);
-// ignore: close_sinks
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
-    StreamController<ErrorAnimationType> errorController =
-        StreamController<ErrorAnimationType>();
-    TextEditingController enterPin = TextEditingController();
-    WalletOptionsProvider walletOptions =
-        Provider.of<WalletOptionsProvider>(context);
-    MyWalletsProvider myWalletProvider =
-        Provider.of<MyWalletsProvider>(context);
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
-    FocusNode pinFocus = FocusNode();
 
     WalletData defaultWallet = myWalletProvider.getDefaultWallet();
 
-    // defaultWallet.address = null;
+    // if (defaultWallet.address == null) {
-    if (defaultWallet.address == null) {
+    //   canUnlock = false;
-      canUnlock = false;
+    //   return Text(
-      return Text(
+    //     'Impossible de retrouver votre\nportefeuille par défaut.\nID: ${defaultWallet.id()}',
-        'Impossible de retrouver votre\nportefeuille par défaut.\nID: ${defaultWallet.id()}',
+    //     textAlign: TextAlign.center,
-        textAlign: TextAlign.center,
+    //     style: const TextStyle(
-        style: const TextStyle(
+    //         color: Colors.redAccent, fontWeight: FontWeight.w500),
-            color: Colors.redAccent, fontWeight: FontWeight.w500),
+    //   );
-      );
+    // }
-    }
 
     return Form(
-      // key: keyPinForm,
       child: Padding(
           padding: EdgeInsets.symmetric(vertical: 5 * ratio, horizontal: 30),
           child: PinCodeTextField(
             key: keyPinForm,
+            textCapitalization: TextCapitalization.characters,
             focusNode: pinFocus,
             autoFocus: true,
             appContext: context,
@@ -199,7 +215,8 @@ class UnlockingWallet extends StatelessWidget {
             length: pinLenght,
             obscureText: true,
             obscuringCharacter: '*',
-            animationType: AnimationType.fade,
+            animationType: AnimationType.slide,
+            animationDuration: const Duration(milliseconds: 40),
             validator: (v) {
               if (v!.length < pinLenght) {
                 return "yourPasswordLengthIsX".tr(args: [pinLenght.toString()]);
@@ -218,11 +235,9 @@ class UnlockingWallet extends StatelessWidget {
             ),
             showCursor: kDebugMode ? false : true,
             cursorColor: Colors.black,
-            animationDuration: const Duration(milliseconds: 300),
+            textStyle: const TextStyle(fontSize: 27, height: 1.6),
-            textStyle: const TextStyle(fontSize: 20, height: 1.6),
             backgroundColor: const Color(0xffF9F9F1),
             enableActiveFill: false,
-            errorAnimationController: errorController,
             controller: enterPin,
             keyboardType: TextInputType.visiblePassword,
             boxShadows: const [
@@ -233,28 +248,32 @@ class UnlockingWallet extends StatelessWidget {
               )
             ],
             onCompleted: (pin) async {
+              myWalletProvider.isPinLoading = true;
               myWalletProvider.pinCode = pin.toUpperCase();
               final isValid = await sub.checkPassword(
-                  defaultWallet.address!, pin.toUpperCase());
+                  defaultWallet.address, pin.toUpperCase());
-
               if (!isValid) {
-                await Future.delayed(const Duration(milliseconds: 50));
+                await Future.delayed(const Duration(milliseconds: 20));
-                errorController.add(ErrorAnimationType
-                    .shake); // Triggering error shake animation
                 pinColor = Colors.red[600];
+                myWalletProvider.isPinLoading = false;
+                myWalletProvider.isPinValid = false;
                 myWalletProvider.pinCode = myWalletProvider.mnemonic = '';
-                walletOptions.reload();
+                enterPin.text = '';
                 pinFocus.requestFocus();
               } else {
+                myWalletProvider.isPinValid = true;
+                myWalletProvider.isPinLoading = false;
                 pinColor = Colors.green[400];
                 myWalletProvider.resetPinCode();
                 Navigator.pop(context, pin.toUpperCase());
               }
             },
             onChanged: (value) {
+              if (enterPin.text != '') myWalletProvider.isPinLoading = true;
               if (pinColor != const Color(0xFFA4B600)) {
                 pinColor = const Color(0xFFA4B600);
               }
+              myWalletProvider.reload();
             },
           )),
     );

lib/screens/myWallets/wallet_options.dart

@@ -2,21 +2,28 @@ import 'dart:async';
 import 'dart:io';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:gecko/globals.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/duniter_indexer.dart';
-import 'package:gecko/providers/home.dart';
 import 'package:gecko/providers/my_wallets.dart';
 import 'package:gecko/models/wallet_data.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
 import 'package:gecko/providers/wallet_options.dart';
 import 'package:gecko/providers/wallets_profiles.dart';
+import 'package:gecko/screens/certifications.dart';
 import 'package:gecko/screens/common_elements.dart';
 import 'package:gecko/screens/activity.dart';
 import 'package:gecko/screens/myWallets/manage_membership.dart';
 import 'package:gecko/screens/qrcode_fullscreen.dart';
+import 'package:gecko/widgets/balance.dart';
+import 'package:gecko/widgets/bottom_app_bar.dart';
+import 'package:gecko/widgets/certifications.dart';
+import 'package:gecko/widgets/idty_status.dart';
+import 'package:gecko/widgets/name_by_address.dart';
+import 'package:gecko/widgets/page_route_no_transition.dart';
 import 'package:provider/provider.dart';
-import 'package:flutter/services.dart';
+
 import 'package:qr_flutter/qr_flutter.dart';
 
 class WalletOptions extends StatelessWidget {
@@ -26,25 +33,24 @@ class WalletOptions extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+    final walletOptions =
-    WalletOptionsProvider walletOptions =
         Provider.of<WalletOptionsProvider>(context, listen: false);
     WalletsProfilesProvider historyProvider =
         Provider.of<WalletsProfilesProvider>(context, listen: false);
-    MyWalletsProvider myWalletProvider =
+    final myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
-    HomeProvider homeProvider =
+    final duniterIndexer = Provider.of<DuniterIndexer>(context, listen: false);
-        Provider.of<HomeProvider>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
-    DuniterIndexer duniterIndexer =
-        Provider.of<DuniterIndexer>(context, listen: false);
 
-    // SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    // final sub = Provider.of<SubstrateSdk>(context, listen: false);
     // sub.spawnBlock();
     // sub.spawnBlock(0, 20);
 
     log.d(walletOptions.address.text);
 
-    final int currentChest = myWalletProvider.getCurrentChest();
+    final currentChest = myWalletProvider.getCurrentChest();
+    bool isWalletNameIndexed =
+        duniterIndexer.walletNameIndexer[walletOptions.address.text] != null;
 
     // final currentWallet = _myWalletProvider.getDefaultWallet();
     // log.d(_walletOptions.getAddress(_currentChest, 3));
@@ -76,7 +82,10 @@ class WalletOptions extends StatelessWidget {
             height: 22,
             child: Consumer<WalletOptionsProvider>(
                 builder: (context, walletProvider, _) {
-              return Text(wallet.name!);
+              return Text(isWalletNameIndexed
+                  ? duniterIndexer
+                      .walletNameIndexer[walletOptions.address.text]!
+                  : wallet.name!);
             }),
           ),
           actions: [
@@ -99,7 +108,7 @@ class WalletOptions extends StatelessWidget {
             ),
           ],
         ),
-        bottomNavigationBar: homeProvider.bottomAppBar(context),
+        bottomNavigationBar: const GeckoBottomAppBar(),
         body: Stack(children: [
           Builder(
             builder: (ctx) => SafeArea(
@@ -120,44 +129,95 @@ class WalletOptions extends StatelessWidget {
                         backgroundColor,
                       ],
                     )),
-                    child: Row(
+                    child: Row(children: <Widget>[
-                        // mainAxisAlignment: MainAxisAlignment.end,
+                      const Spacer(flex: 1),
-                        children: <Widget>[
+                      avatar(walletProvider),
-                          const Spacer(flex: 1),
+                      const Spacer(flex: 1),
-                          avatar(walletProvider),
+                      Column(
-                          const Spacer(flex: 1),
+                          crossAxisAlignment: CrossAxisAlignment.center,
-                          Column(
+                          children: <Widget>[
-                              crossAxisAlignment: CrossAxisAlignment.center,
+                            Stack(children: [
-                              children: <Widget>[
+                              SizedBox(
-                                duniterIndexer.getNameByAddress(
+                                width: 250,
-                                    context,
+                                child: Row(
-                                    walletProvider.address.text,
+                                  mainAxisAlignment: MainAxisAlignment.center,
-                                    wallet,
+                                  children: [
-                                    27,
+                                    Consumer<WalletOptionsProvider>(
-                                    false,
+                                        builder: (context, walletProvider, _) {
-                                    Colors.black,
+                                      return NameByAddress(
-                                    FontWeight.w400,
+                                          wallet: wallet,
-                                    FontStyle.normal),
+                                          size: 27,
-                                // SizedBox(height: isTall ? 5 : 0),
+                                          color: Colors.black,
-
+                                          fontWeight: wallet.isMember
-                                SizedBox(height: isTall ? 5 : 0),
+                                              ? FontWeight.w500
-                                balance(
+                                              : FontWeight.w400,
-                                    context, walletProvider.address.text, 21),
+                                          fontStyle: FontStyle.normal);
-                                const SizedBox(width: 30),
+                                    })
-                                Column(
+                                  ],
-                                    crossAxisAlignment:
+                                ),
-                                        CrossAxisAlignment.center,
+                              ),
-                                    children: [
+                              const SizedBox(width: 10),
-                                      walletOptions.idtyStatus(
+                              if (duniterIndexer
-                                          context, walletOptions.address.text,
+                                      .walletNameIndexer[wallet.address] ==
-                                          isOwner: true, color: orangeC),
+                                  null)
-                                      getCerts(context,
+                                Positioned(
-                                          walletProvider.address.text, 15),
+                                  right: 0,
-                                    ]),
+                                  child: InkWell(
-                                SizedBox(height: 10 * ratio),
+                                    key: keyRenameWallet,
-                              ]),
+                                    onTap: () async {
-                          const Spacer(flex: 2),
+                                      await walletOptions.editWalletName(
-                        ]),
+                                          context, wallet.id());
+                                      await Future.delayed(
+                                          const Duration(milliseconds: 30));
+                                    },
+                                    child: ClipRRect(
+                                      child: Image.asset(
+                                          walletOptions.isEditing
+                                              ? 'assets/walletOptions/android-checkmark.png'
+                                              : 'assets/walletOptions/edit.png',
+                                          width: 25,
+                                          height: 25),
+                                    ),
+                                  ),
+                                ),
+                            ]),
+                            SizedBox(height: isTall ? 5 : 0),
+                            Balance(
+                                address: walletProvider.address.text, size: 21),
+                            const SizedBox(width: 30),
+                            InkWell(
+                              onTap: () => isWalletNameIndexed
+                                  ? {
+                                      Navigator.push(
+                                        context,
+                                        PageNoTransit(builder: (context) {
+                                          return CertificationsScreen(
+                                              address:
+                                                  walletProvider.address.text,
+                                              username: duniterIndexer
+                                                      .walletNameIndexer[
+                                                  walletProvider
+                                                      .address.text]!);
+                                        }),
+                                      ),
+                                    }
+                                  : null,
+                              child: Column(
+                                  crossAxisAlignment: CrossAxisAlignment.center,
+                                  children: [
+                                    IdentityStatus(
+                                        address: walletOptions.address.text,
+                                        isOwner: true,
+                                        color: orangeC),
+                                    Certifications(
+                                        address: walletProvider.address.text,
+                                        size: 15)
+                                  ]),
+                            ),
+                            SizedBox(height: 10 * ratio),
+                          ]),
+                      const Spacer(flex: 2),
+                    ]),
                   );
                 }),
                 Expanded(
@@ -201,8 +261,8 @@ class WalletOptions extends StatelessWidget {
                               SizedBox(height: 17 * ratio),
                               // walletProvider.isMember(context, _walletOptions.address.text)
                               FutureBuilder(
-                                  future: walletProvider.isMember(
+                                  future:
-                                      context, walletOptions.address.text),
+                                      sub.isMember(walletOptions.address.text),
                                   builder: (BuildContext context,
                                       AsyncSnapshot<bool> isMember) {
                                     if (isMember.connectionState !=
@@ -302,7 +362,7 @@ class WalletOptions extends StatelessWidget {
                       foregroundColor: Colors.white, elevation: 4,
                       backgroundColor: orangeC, // foreground
                     ),
-                    onPressed: () {
+                    onPressed: () async {
                       walletProvider.confirmIdentityPopup(context);
                       // Navigator.push(
                       //   context,
@@ -337,7 +397,7 @@ class WalletOptions extends StatelessWidget {
   }
 
   Widget pubkeyWidget(WalletOptionsProvider walletProvider, BuildContext ctx) {
-    final String shortPubkey = getShortPubkey(walletProvider.address.text);
+    final shortPubkey = getShortPubkey(walletProvider.address.text);
     return GestureDetector(
       key: keyCopyAddress,
       onTap: () {
@@ -404,7 +464,7 @@ class WalletOptions extends StatelessWidget {
         // _historyProvider.nPage = 1;
         Navigator.push(
           context,
-          MaterialPageRoute(builder: (context) {
+          PageNoTransit(builder: (context) {
             return ActivityScreen(
                 address: walletProvider.address.text,
                 avatar: wallet.imageCustomPath == null
@@ -437,7 +497,7 @@ class WalletOptions extends StatelessWidget {
   }
 
   Widget manageMembership(BuildContext context) {
-    WalletOptionsProvider walletOptions =
+    final walletOptions =
         Provider.of<WalletOptionsProvider>(context, listen: false);
     return InkWell(
       key: keyManageMembership,
@@ -469,8 +529,8 @@ class WalletOptions extends StatelessWidget {
   Widget setDefaultWalletWidget(
       BuildContext context,
       WalletOptionsProvider walletProvider,
-      MyWalletsProvider myWalletProvider,
+      final myWalletProvider,
-      WalletOptionsProvider walletOptions,
+      final walletOptions,
       int currentChest) {
     return Consumer<MyWalletsProvider>(builder: (context, myWalletProvider, _) {
       WalletData defaultWallet = myWalletProvider.getDefaultWallet();
@@ -511,10 +571,10 @@ class WalletOptions extends StatelessWidget {
   }
 
   Future setDefaultWallet(BuildContext context, int currentChest) async {
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
-    MyWalletsProvider myWalletProvider =
+    final myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
-    WalletOptionsProvider walletOptions =
+    final walletOptions =
         Provider.of<WalletOptionsProvider>(context, listen: false);
 
     // WalletData defaultWallet = _myWalletProvider.getDefaultWallet()!;
@@ -525,26 +585,26 @@ class WalletOptions extends StatelessWidget {
     walletOptions.reload();
   }
 
-  Widget deleteWallet(BuildContext context,
+  Widget deleteWallet(BuildContext context, WalletOptionsProvider walletOptions,
-      WalletOptionsProvider walletProvider, int currentChest) {
+      int currentChest) {
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
-    MyWalletsProvider myWalletProvider =
+    final myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
 
     final defaultWallet = myWalletProvider.getDefaultWallet();
     final bool isDefaultWallet =
-        walletProvider.address.text == defaultWallet.address;
+        walletOptions.address.text == defaultWallet.address;
     // return Consumer<MyWalletsProvider>(
     //     builder: (context, _myWalletProvider, _) {
     return FutureBuilder(
-        future: sub.hasAccountConsumers(wallet.address!),
+        future: sub.hasAccountConsumers(wallet.address),
         builder: (BuildContext context, AsyncSnapshot<bool> hasConsumers) {
           if (hasConsumers.connectionState != ConnectionState.done ||
               hasConsumers.hasError) {
             return const Text('');
           }
           final double balance =
-              balanceCache[walletProvider.address.text] ?? -1;
+              walletOptions.balanceCache[walletOptions.address.text] ?? -1;
           final bool canDelete = !isDefaultWallet &&
               !hasConsumers.data! &&
               (balance > 2 || balance == 0);
@@ -552,7 +612,7 @@ class WalletOptions extends StatelessWidget {
             key: keyDeleteWallet,
             onTap: canDelete
                 ? () async {
-                    await walletProvider.deleteWallet(context, wallet);
+                    await walletOptions.deleteWallet(context, wallet);
                     WidgetsBinding.instance.addPostFrameCallback((_) {
                       myWalletProvider.listWallets =
                           myWalletProvider.readAllWallets(currentChest);

lib/screens/myWallets/wallets_home.dart

@@ -1,15 +1,12 @@
 // ignore_for_file: use_build_context_synchronously
 
 import 'dart:io';
-
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/services.dart';
 import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:gecko/globals.dart';
 import 'package:gecko/models/chest_data.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/duniter_indexer.dart';
-import 'package:gecko/providers/home.dart';
 import 'package:gecko/providers/my_wallets.dart';
 import 'package:gecko/models/wallet_data.dart';
 import 'package:flutter/material.dart';
@@ -22,20 +19,20 @@ import 'package:gecko/screens/myWallets/import_g1_v1.dart';
 import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
 import 'package:gecko/screens/myWallets/wallet_options.dart';
 import 'package:gecko/screens/wallet_view.dart';
+import 'package:gecko/widgets/balance.dart';
+import 'package:gecko/widgets/bottom_app_bar.dart';
 import 'package:provider/provider.dart';
+import 'package:flutter_svg/flutter_svg.dart';
+import 'package:truncate/truncate.dart';
 
 class WalletsHome extends StatelessWidget {
   const WalletsHome({Key? key}) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+    final myWalletProvider = Provider.of<MyWalletsProvider>(context);
-    MyWalletsProvider myWalletProvider =
-        Provider.of<MyWalletsProvider>(context);
-    HomeProvider homeProvider =
-        Provider.of<HomeProvider>(context, listen: false);
 
-    final int currentChestNumber = myWalletProvider.getCurrentChest();
+    final currentChestNumber = myWalletProvider.getCurrentChest();
     final ChestData currentChest = chestBox.get(currentChestNumber)!;
     myWalletProvider.listWallets =
         myWalletProvider.readAllWallets(currentChestNumber);
@@ -66,7 +63,9 @@ class WalletsHome extends StatelessWidget {
           backgroundColor: const Color(0xffFFD58D),
         ),
         bottomNavigationBar: myWalletProvider.lastFlyBy == ''
-            ? homeProvider.bottomAppBar(context)
+            ? const GeckoBottomAppBar(
+                actualRoute: 'safeHome',
+              )
             : dragInfo(context),
         body: SafeArea(
           child: Stack(children: [
@@ -90,7 +89,7 @@ class WalletsHome extends StatelessWidget {
     final bool isSameAddress =
         myWalletProvider.dragAddress == myWalletProvider.lastFlyBy;
 
-    final double screenWidth = MediaQuery.of(homeContext).size.width;
+    final screenWidth = MediaQuery.of(homeContext).size.width;
     return Container(
       color: yellowC,
       width: screenWidth,
@@ -109,8 +108,7 @@ class WalletsHome extends StatelessWidget {
     );
   }
 
-  Widget chestOptions(
+  Widget chestOptions(BuildContext context, final myWalletProvider) {
-      BuildContext context, MyWalletsProvider myWalletProvider) {
     return Column(children: [
       const SizedBox(height: 50),
       SizedBox(
@@ -141,28 +139,39 @@ class WalletsHome extends StatelessWidget {
             ),
           )),
       const SizedBox(height: 30),
-      InkWell(
+      Row(
-        key: keyImportG1v1,
+        mainAxisAlignment: MainAxisAlignment.center,
-        onTap: () {
+        children: [
-          Navigator.push(
+          SvgPicture.asset(
-            context,
+            'assets/cesium_bw2.svg',
-            MaterialPageRoute(builder: (context) {
+            semanticsLabel: 'CS',
-              return const ImportG1v1();
+            height: 50,
-            }),
+          ),
-          );
+          const SizedBox(width: 5),
-        },
+          InkWell(
-        child: SizedBox(
+            key: keyImportG1v1,
-          width: 400,
+            onTap: () {
-          height: 60,
+              Navigator.push(
-          child: Center(
+                context,
-              child: Text('importG1v1'.tr(),
+                MaterialPageRoute(builder: (context) {
-                  style: TextStyle(
+                  return const ImportG1v1();
-                      fontSize: 22,
+                }),
-                      color: Colors.blue[900],
+              );
-                      fontWeight: FontWeight.w500))),
+            },
-        ),
+            child: SizedBox(
+              width: 350,
+              height: 60,
+              child: Center(
+                  child: Text('importG1v1'.tr(),
+                      style: TextStyle(
+                          fontSize: 22,
+                          color: Colors.blue[900],
+                          fontWeight: FontWeight.w500))),
+            ),
+          ),
+        ],
       ),
-      const SizedBox(height: 5),
+      const SizedBox(height: 20),
       InkWell(
         key: keyChangeChest,
         onTap: () {
@@ -189,12 +198,12 @@ class WalletsHome extends StatelessWidget {
   }
 
   Widget myWalletsTiles(BuildContext context, int currentChestNumber) {
-    MyWalletsProvider myWalletProvider =
+    final myWalletProvider = Provider.of<MyWalletsProvider>(context);
-        Provider.of<MyWalletsProvider>(context);
+    final walletOptions =
-    WalletOptionsProvider walletOptions =
         Provider.of<WalletOptionsProvider>(context, listen: false);
     final bool isWalletsExists = myWalletProvider.checkIfWalletExist();
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final duniterIndexer = Provider.of<DuniterIndexer>(context, listen: false);
 
     if (!isWalletsExists) {
       return const Text('');
@@ -211,9 +220,14 @@ class WalletsHome extends StatelessWidget {
       ]));
     }
 
-    List listWallets = myWalletProvider.listWallets;
+    // Get wallet list and sort by derivation number
+    List<WalletData> listWallets = myWalletProvider.listWallets;
+    listWallets.sort((p1, p2) {
+      return Comparable.compare(p1.number!, p2.number!);
+    });
+
     WalletData? defaultWallet = myWalletProvider.getDefaultWallet();
-    final double screenWidth = MediaQuery.of(context).size.width;
+    final screenWidth = MediaQuery.of(context).size.width;
     int nTule = 2;
 
     if (screenWidth >= 900) {
@@ -235,17 +249,17 @@ class WalletsHome extends StatelessWidget {
           crossAxisSpacing: 0,
           mainAxisSpacing: 0,
           children: <Widget>[
-            for (WalletData repository in listWallets as Iterable<WalletData>)
+            for (WalletData repository in listWallets)
               LongPressDraggable<String>(
                 delay: const Duration(milliseconds: 200),
-                data: repository.address!,
+                data: repository.address,
                 dragAnchorStrategy:
                     (Draggable<Object> _, BuildContext __, Offset ___) =>
                         const Offset(0, 0),
                 // feedbackOffset: const Offset(-500, -500),
                 // dragAnchorStrategy: childDragAnchorStrategy,
                 onDragStarted: () =>
-                    myWalletProvider.dragAddress = repository.address!,
+                    myWalletProvider.dragAddress = repository.address,
                 onDragEnd: (_) {
                   myWalletProvider.lastFlyBy = '';
                   myWalletProvider.dragAddress = '';
@@ -266,21 +280,21 @@ class WalletsHome extends StatelessWidget {
                 child: DragTarget<String>(
                     onAccept: (senderAddress) async {
                       log.d(
-                          'INTERPAY: sender: $senderAddress --- receiver: ${repository.address!}');
+                          'INTERPAY: sender: $senderAddress --- receiver: ${repository.address}');
                       final walletData = myWalletProvider
                           .getWalletDataByAddress(senderAddress);
                       await sub.setCurrentWallet(walletData!);
                       sub.reload();
-                      paymentPopup(context, repository.address!);
+                      paymentPopup(context, repository.address);
                     },
                     onMove: (details) {
-                      if (repository.address! != myWalletProvider.lastFlyBy) {
+                      if (repository.address != myWalletProvider.lastFlyBy) {
-                        myWalletProvider.lastFlyBy = repository.address!;
+                        myWalletProvider.lastFlyBy = repository.address;
                         myWalletProvider.reload();
                       }
                     },
                     onWillAccept: (senderAddress) =>
-                        senderAddress != repository.address!,
+                        senderAddress != repository.address,
                     builder: (
                       BuildContext context,
                       List<dynamic> accepted,
@@ -289,7 +303,7 @@ class WalletsHome extends StatelessWidget {
                       return Padding(
                         padding: const EdgeInsets.all(16),
                         child: GestureDetector(
-                          key: keyOpenWallet(repository.address!),
+                          key: keyOpenWallet(repository.address),
                           onTap: () {
                             walletOptions.getAddress(
                                 currentChestNumber, repository.derivation!);
@@ -317,14 +331,15 @@ class WalletsHome extends StatelessWidget {
                                     child: Container(
                                   width: double.infinity,
                                   height: double.infinity,
-                                  decoration: BoxDecoration(
+                                  decoration: const BoxDecoration(
-                                      gradient: RadialGradient(
+                                    gradient: RadialGradient(
-                                    radius: 0.6,
+                                      radius: 0.8,
-                                    colors: [
+                                      colors: [
-                                      Colors.green[400]!,
+                                        Color.fromARGB(255, 255, 255, 211),
-                                      const Color(0xFFE7E7A6),
+                                        yellowC,
-                                    ],
+                                      ],
-                                  )),
+                                    ),
+                                  ),
                                   child:
                                       // SvgPicture.asset('assets/chopp-gecko2.png',
                                       //         semanticsLabel: 'Gecko', height: 48),
@@ -352,11 +367,45 @@ class WalletsHome extends StatelessWidget {
                                 Stack(children: <Widget>[
                                   balanceBuilder(
                                       context,
-                                      repository.address!,
+                                      repository.address,
                                       repository.address ==
                                           defaultWallet.address),
-                                  nameBuilder(context, repository,
+                                  Row(
-                                      defaultWallet, currentChestNumber),
+                                    mainAxisAlignment: MainAxisAlignment.center,
+                                    children: [
+                                      Column(
+                                        children: [
+                                          const SizedBox(height: 7),
+                                          Opacity(
+                                            opacity: 0.7,
+                                            child: Text(
+                                              duniterIndexer.walletNameIndexer[
+                                                      repository.address] ??
+                                                  truncate(
+                                                      repository.name!, 20),
+                                              style: TextStyle(
+                                                  fontSize: 20,
+                                                  color:
+                                                      defaultWallet.address ==
+                                                              repository.address
+                                                          ? Colors.white
+                                                          : Colors.black,
+                                                  fontWeight: FontWeight.w500),
+                                            ),
+                                          )
+                                          // NameByAddress(
+                                          //   wallet: repository,
+                                          //   address: repository.address,
+                                          //   size: 20,
+                                          // color: defaultWallet.address ==
+                                          //         repository.address
+                                          //     ? Colors.white
+                                          //     : Colors.black,
+                                          // ),
+                                        ],
+                                      ),
+                                    ],
+                                  ),
                                 ]),
                               ]),
                             ),
@@ -380,64 +429,26 @@ class WalletsHome extends StatelessWidget {
       width: double.infinity,
       color: isDefault ? orangeC : yellowC,
       child: Padding(
-          padding: const EdgeInsets.only(left: 5, right: 5, top: 38),
+          padding:
+              const EdgeInsets.only(left: 5, right: 5, top: 38, bottom: 10),
           child: Row(
             mainAxisAlignment: MainAxisAlignment.center,
             children: [
-              balance(
+              Opacity(
-                  context,
+                opacity: 0.7,
-                  address,
+                child: Balance(
-                  15,
+                    address: address,
-                  isDefault ? Colors.white : Colors.black,
+                    size: 16,
-                  isDefault ? yellowC : orangeC)
+                    color: isDefault ? Colors.white : Colors.black,
+                    loadingColor: isDefault ? yellowC : orangeC),
+              )
             ],
           )),
     );
   }
 
-  Widget nameBuilder(BuildContext context, WalletData repository,
-      WalletData defaultWallet, int currentChestNumber) {
-    WalletOptionsProvider walletOptions =
-        Provider.of<WalletOptionsProvider>(context, listen: false);
-    DuniterIndexer duniterIndexer =
-        Provider.of<DuniterIndexer>(context, listen: false);
-    return ListTile(
-      shape: const RoundedRectangleBorder(
-          borderRadius: BorderRadius.vertical(bottom: Radius.circular(12))),
-      tileColor: repository.address == defaultWallet.address
-          ? orangeC
-          : const Color(0xffFFD58D),
-      title: Center(
-        child: Padding(
-          padding: const EdgeInsets.only(left: 5, right: 5, bottom: 35, top: 5),
-          child: duniterIndexer.getNameByAddress(
-              context,
-              repository.address!,
-              repository,
-              20,
-              true,
-              repository.id()[1] == defaultWallet.id()[1]
-                  ? const Color(0xffF9F9F1)
-                  : Colors.black),
-        ),
-      ),
-      onTap: () {
-        walletOptions.getAddress(currentChestNumber, repository.derivation!);
-        Navigator.push(
-          context,
-          SmoothTransition(
-            page: WalletOptions(
-              wallet: repository,
-            ),
-          ),
-        );
-      },
-    );
-  }
-
   Widget addNewDerivation(context) {
-    MyWalletsProvider myWalletProvider =
+    final myWalletProvider = Provider.of<MyWalletsProvider>(context);
-        Provider.of<MyWalletsProvider>(context);
 
     String newDerivationName =
         '${'wallet'.tr()} ${myWalletProvider.listWallets.last.number! + 2}';

lib/screens/my_contacts.dart

@@ -1,17 +1,19 @@
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/services.dart';
+
 import 'package:gecko/globals.dart';
 import 'package:flutter/material.dart';
+import 'package:gecko/models/wallet_data.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/cesium_plus.dart';
 import 'package:gecko/models/g1_wallets_list.dart';
 import 'package:gecko/providers/duniter_indexer.dart';
-import 'package:gecko/providers/home.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
-import 'package:gecko/providers/wallet_options.dart';
 import 'package:gecko/providers/wallets_profiles.dart';
 import 'package:gecko/screens/common_elements.dart';
 import 'package:gecko/screens/wallet_view.dart';
+import 'package:gecko/widgets/balance.dart';
+import 'package:gecko/widgets/bottom_app_bar.dart';
+import 'package:gecko/widgets/name_by_address.dart';
 import 'package:provider/provider.dart';
 
 class ContactsScreen extends StatelessWidget {
@@ -19,15 +21,9 @@ class ContactsScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
-    CesiumPlusProvider cesiumPlusProvider =
-        Provider.of<CesiumPlusProvider>(context, listen: false);
     WalletsProfilesProvider walletsProfilesClass =
         Provider.of<WalletsProfilesProvider>(context, listen: true);
-    HomeProvider homeProvider =
+    final duniterIndexer = Provider.of<DuniterIndexer>(context, listen: false);
-        Provider.of<HomeProvider>(context, listen: false);
-    DuniterIndexer duniterIndexer =
-        Provider.of<DuniterIndexer>(context, listen: false);
 
     double avatarSize = 55;
 
@@ -53,7 +49,7 @@ class ContactsScreen extends StatelessWidget {
               'contactsManagementWithNbr'.tr(args: ['${myContacts.length}'])),
         ),
       ),
-      bottomNavigationBar: homeProvider.bottomAppBar(context),
+      bottomNavigationBar: const GeckoBottomAppBar(),
       body: SafeArea(
         child: Stack(children: [
           Padding(
@@ -74,8 +70,7 @@ class ContactsScreen extends StatelessWidget {
                                 key: keySearchResult('keyID++'),
                                 horizontalTitleGap: 40,
                                 contentPadding: const EdgeInsets.all(5),
-                                leading: cesiumPlusProvider
+                                leading: defaultAvatar(avatarSize),
-                                    .defaultAvatar(avatarSize),
                                 title: Row(children: <Widget>[
                                   Text(getShortPubkey(g1Wallet.address),
                                       style: const TextStyle(
@@ -97,15 +92,18 @@ class ContactsScreen extends StatelessWidget {
                                                   mainAxisAlignment:
                                                       MainAxisAlignment.center,
                                                   children: [
-                                                    balance(context,
+                                                    Balance(
-                                                        g1Wallet.address, 16),
+                                                        address:
+                                                            g1Wallet.address,
+                                                        size: 16),
                                                   ]),
                                             ]),
                                       ),
                                     ]),
                                 subtitle: Row(children: <Widget>[
-                                  duniterIndexer.getNameByAddress(
+                                  NameByAddress(
-                                      context, g1Wallet.address)
+                                      wallet:
+                                          WalletData(address: g1Wallet.address))
                                 ]),
                                 dense: false,
                                 isThreeLine: false,
@@ -117,10 +115,10 @@ class ContactsScreen extends StatelessWidget {
                                           g1Wallet.address;
                                       return WalletViewScreen(
                                         address: g1Wallet.address,
-                                        username: g1WalletsBox
+                                        username:
-                                            .get(g1Wallet.address)
+                                            duniterIndexer.walletNameIndexer[
-                                            ?.id
+                                                    g1Wallet.address] ??
-                                            ?.username,
+                                                '',
                                         avatar: g1WalletsBox
                                             .get(g1Wallet.address)
                                             ?.avatar,

lib/screens/onBoarding/1.dart

@@ -1,6 +1,6 @@
 // ignore_for_file: file_names
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/services.dart';
+
 import 'package:flutter/material.dart';
 import 'package:gecko/globals.dart';
 import 'package:gecko/screens/common_elements.dart';
@@ -11,7 +11,6 @@ class OnboardingStepOne extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
     CommonElements common = CommonElements();
     return Scaffold(
       backgroundColor: backgroundColor,

lib/screens/onBoarding/10.dart

@@ -4,7 +4,7 @@
 import 'dart:async';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/foundation.dart';
-import 'package:flutter/services.dart';
+
 import 'package:flutter/material.dart';
 import 'package:gecko/globals.dart';
 import 'package:gecko/models/wallet_data.dart';
@@ -26,126 +26,150 @@ class OnboardingStepTen extends StatelessWidget {
   final formKey = GlobalKey<FormState>();
   Color? pinColor = const Color(0xFFA4B600);
   bool hasError = false;
+  TextEditingController enterPin = TextEditingController();
+  FocusNode pinFocus = FocusNode(debugLabel: 'pinFocusNode');
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+    final generateWalletProvider =
-    GenerateWalletsProvider generateWalletProvider =
         Provider.of<GenerateWalletsProvider>(context);
-    WalletOptionsProvider walletOptions =
+    final walletOptions = Provider.of<WalletOptionsProvider>(context);
-        Provider.of<WalletOptionsProvider>(context);
+    final sub = Provider.of<SubstrateSdk>(context);
+    final myWalletProvider =
+        Provider.of<MyWalletsProvider>(context, listen: false);
     CommonElements common = CommonElements();
-    final int pinLenght = generateWalletProvider.pin.text.length;
+    final pinLenght = generateWalletProvider.pin.text.length;
 
-    return Scaffold(
+    return WillPopScope(
-        backgroundColor: backgroundColor,
+      onWillPop: () {
-        appBar: AppBar(
+        myWalletProvider.isPinValid = false;
-          toolbarHeight: 60 * ratio,
+        myWalletProvider.isPinLoading = true;
-          title: SizedBox(
+        return Future<bool>.value(true);
-            height: 22,
+      },
-            child: Text(
+      child: Scaffold(
-              'myPassword'.tr(),
+          backgroundColor: backgroundColor,
-              style: const TextStyle(fontWeight: FontWeight.w600),
+          appBar: AppBar(
+            toolbarHeight: 60 * ratio,
+            title: SizedBox(
+              height: 22,
+              child: Text(
+                'myPassword'.tr(),
+                style: const TextStyle(fontWeight: FontWeight.w600),
+              ),
             ),
+            leading: IconButton(
+                icon: const Icon(Icons.arrow_back, color: Colors.black),
+                onPressed: () {
+                  myWalletProvider.isPinValid = false;
+                  myWalletProvider.isPinLoading = true;
+                  Navigator.of(context).pop();
+                }),
           ),
-        ),
+          extendBodyBehindAppBar: true,
-        extendBodyBehindAppBar: true,
+          body: SafeArea(
-        body: SafeArea(
+            child: Stack(children: [
-          child: Stack(children: [
+              Column(children: <Widget>[
-            Column(children: <Widget>[
+                SizedBox(height: isTall ? 40 : 20),
-              SizedBox(height: isTall ? 40 : 20),
+                common.buildProgressBar(9),
-              common.buildProgressBar(9),
+                SizedBox(height: isTall ? 40 : 20),
-              SizedBox(height: isTall ? 40 : 20),
+                common.buildText("geckoWillCheckPassword".tr()),
-              common.buildText("geckoWillCheckPassword".tr()),
+                SizedBox(height: isTall ? 60 : 10),
-              SizedBox(height: isTall ? 80 : 20),
+                Visibility(
-              Visibility(
+                  visible: generateWalletProvider.scanedValidWalletNumber != -1,
-                visible: generateWalletProvider.scanedValidWalletNumber != -1,
+                  child: Padding(
-                child: Padding(
+                    padding: const EdgeInsets.only(bottom: 15),
-                  padding: const EdgeInsets.only(bottom: 15),
+                    child: Row(
-                  child: Row(
+                      mainAxisAlignment: MainAxisAlignment.center,
-                    mainAxisAlignment: MainAxisAlignment.center,
+                      children: [
-                    children: [
+                        Text("derivationsScanProgress".tr(args: [
-                      Text("derivationsScanProgress".tr(args: [
+                          '${generateWalletProvider.scanedWalletNumber}',
-                        '${generateWalletProvider.scanedWalletNumber}',
+                          '${generateWalletProvider.numberScan + 1}'
-                        '${generateWalletProvider.numberScan + 1}'
+                        ])),
-                      ])),
+                        const SizedBox(width: 10),
-                      const SizedBox(width: 10),
+                        const SizedBox(
-                      const SizedBox(
+                          height: 22,
-                        height: 22,
+                          width: 22,
-                        width: 22,
+                          child: CircularProgressIndicator(
-                        child: CircularProgressIndicator(
+                            color: orangeC,
-                          color: orangeC,
+                            strokeWidth: 3,
-                          strokeWidth: 3,
+                          ),
                         ),
-                      ),
+                      ],
-                    ],
+                    ),
                   ),
                 ),
-              ),
+                Consumer<MyWalletsProvider>(builder: (context, mw, _) {
-              Consumer<SubstrateSdk>(builder: (context, sub, _) {
+                  return Visibility(
-                return sub.nodeConnected
+                    visible: !myWalletProvider.isPinValid &&
-                    ? pinForm(context, walletOptions, pinLenght, 1, 2)
+                        !myWalletProvider.isPinLoading,
-                    : Row(
+                    child: Text(
-                        mainAxisAlignment: MainAxisAlignment.center,
+                      "Ce n'est pas le bon code".tr(),
-                        children: const [
+                      style: const TextStyle(
-                            Text(
+                          color: Colors.red, fontWeight: FontWeight.w500),
-                              'Vous devez vous connecter à internet\npour valider votre coffre',
+                    ),
-                              style: TextStyle(
+                  );
-                                fontSize: 20,
+                }),
-                                color: Colors.redAccent,
+                SizedBox(height: isTall ? 20 : 10),
-                                fontWeight: FontWeight.w500,
+                Consumer<SubstrateSdk>(builder: (context, sub, _) {
+                  return sub.nodeConnected
+                      ? pinForm(context, walletOptions, pinLenght, 1, 2)
+                      : Row(
+                          mainAxisAlignment: MainAxisAlignment.center,
+                          children: const [
+                              Text(
+                                'Vous devez vous connecter à internet\npour valider votre coffre',
+                                style: TextStyle(
+                                  fontSize: 20,
+                                  color: Colors.redAccent,
+                                  fontWeight: FontWeight.w500,
+                                ),
+                                textAlign: TextAlign.center,
                               ),
-                              textAlign: TextAlign.center,
+                            ]);
+                }),
+                Consumer<WalletOptionsProvider>(
+                    builder: (context, walletOptions, _) {
+                  return sub.nodeConnected
+                      ? InkWell(
+                          key: keyCachePassword,
+                          onTap: () {
+                            walletOptions.changePinCacheChoice();
+                          },
+                          child: Row(children: [
+                            const SizedBox(height: 30),
+                            const Spacer(),
+                            Icon(
+                              configBox.get('isCacheChecked') ?? false
+                                  ? Icons.check_box
+                                  : Icons.check_box_outline_blank,
+                              color: orangeC,
                             ),
-                          ]);
+                            const SizedBox(width: 8),
-              }),
+                            Text(
-              Consumer<SubstrateSdk>(builder: (context, sub, _) {
+                              'rememberPassword'.tr(),
-                return sub.nodeConnected
+                              style: TextStyle(
-                    ? InkWell(
+                                  fontSize: 16, color: Colors.grey[700]),
-                        key: keyCachePassword,
+                            ),
-                        onTap: () {
+                            const Spacer()
-                          walletOptions.changePinCacheChoice();
+                          ]))
-                        },
+                      : const Text('');
-                        child: Row(children: [
+                }),
-                          const SizedBox(height: 30),
+                const SizedBox(height: 10),
-                          const Spacer(),
+              ]),
-                          Icon(
+              CommonElements().offlineInfo(context),
-                            configBox.get('isCacheChecked') ?? false
-                                ? Icons.check_box
-                                : Icons.check_box_outline_blank,
-                            color: orangeC,
-                          ),
-                          const SizedBox(width: 8),
-                          Text(
-                            'rememberPassword'.tr(),
-                            style: TextStyle(
-                                fontSize: 16, color: Colors.grey[700]),
-                          ),
-                          const Spacer()
-                        ]))
-                    : const Text('');
-              }),
-              const SizedBox(height: 10),
             ]),
-            CommonElements().offlineInfo(context),
+          )),
-          ]),
+    );
-        ));
   }
 
-  Widget pinForm(context, WalletOptionsProvider walletOptions, pinLenght,
+  Widget pinForm(
-      int walletNbr, int derivation) {
+      context, final walletOptions, pinLenght, int walletNbr, int derivation) {
-    // var _walletPin = '';
+    final myWalletProvider = Provider.of<MyWalletsProvider>(context);
-// ignore: close_sinks
+    final generateWalletProvider =
-    StreamController<ErrorAnimationType> errorController =
-        StreamController<ErrorAnimationType>();
-    TextEditingController enterPin = TextEditingController();
-    MyWalletsProvider myWalletProvider =
-        Provider.of<MyWalletsProvider>(context);
-    GenerateWalletsProvider generateWalletProvider =
         Provider.of<GenerateWalletsProvider>(context);
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
 
-    final int currentChest = myWalletProvider.getCurrentChest();
+    final currentChest = myWalletProvider.getCurrentChest();
 
     return Form(
       key: formKey,
@@ -153,6 +177,9 @@ class OnboardingStepTen extends StatelessWidget {
           padding: const EdgeInsets.symmetric(vertical: 8.0, horizontal: 30),
           child: PinCodeTextField(
             key: keyPinForm,
+            textCapitalization: TextCapitalization.characters,
+            // autoDisposeControllers: false,
+            focusNode: pinFocus,
             autoFocus: true,
             appContext: context,
             pastedTextStyle: TextStyle(
@@ -162,7 +189,8 @@ class OnboardingStepTen extends StatelessWidget {
             length: pinLenght,
             obscureText: true,
             obscuringCharacter: '*',
-            animationType: AnimationType.fade,
+            animationType: AnimationType.slide,
+            animationDuration: const Duration(milliseconds: 40),
             validator: (v) {
               if (v!.length < pinLenght) {
                 return "yourPasswordLengthIsX".tr(args: [pinLenght.toString()]);
@@ -175,17 +203,15 @@ class OnboardingStepTen extends StatelessWidget {
               borderWidth: 4,
               shape: PinCodeFieldShape.box,
               borderRadius: BorderRadius.circular(5),
-              fieldHeight: 60,
+              fieldHeight: 50 * ratio,
               fieldWidth: 50,
-              activeFillColor: hasError ? Colors.blueAccent : Colors.black,
+              activeFillColor: Colors.black,
             ),
             showCursor: kDebugMode ? false : true,
             cursorColor: Colors.black,
-            animationDuration: const Duration(milliseconds: 300),
+            textStyle: const TextStyle(fontSize: 27, height: 1.6),
-            textStyle: const TextStyle(fontSize: 20, height: 1.6),
             backgroundColor: const Color(0xffF9F9F1),
             enableActiveFill: false,
-            errorAnimationController: errorController,
             controller: enterPin,
             keyboardType: TextInputType.visiblePassword,
             boxShadows: const [
@@ -201,6 +227,8 @@ class OnboardingStepTen extends StatelessWidget {
               log.d('$pin || ${generateWalletProvider.pin.text}');
               if (pin.toUpperCase() == generateWalletProvider.pin.text) {
                 pinColor = Colors.green[500];
+                myWalletProvider.isPinLoading = false;
+                myWalletProvider.isPinValid = true;
 
                 await generateWalletProvider.storeHDWChest(context);
                 bool isAlive = false;
@@ -214,14 +242,14 @@ class OnboardingStepTen extends StatelessWidget {
                       derivePath: '//2',
                       password: generateWalletProvider.pin.text);
                   WalletData myWallet = WalletData(
-                      version: dataVersion,
                       chest: configBox.get('currentChest'),
                       address: address,
                       number: 0,
                       name: 'currentWallet'.tr(),
                       derivation: 2,
-                      imageDefaultPath: '0.png');
+                      imageDefaultPath: '0.png',
-                  await walletBox.add(myWallet);
+                      isOwned: true);
+                  await walletBox.put(myWallet.address, myWallet);
                 }
                 myWalletProvider.readAllWallets(currentChest);
                 myWalletProvider.reload();
@@ -235,17 +263,21 @@ class OnboardingStepTen extends StatelessWidget {
                       page: const OnboardingStepEleven(), isFast: false),
                 );
               } else {
-                errorController.add(ErrorAnimationType
-                    .shake); // Triggering error shake animation
                 hasError = true;
+                myWalletProvider.isPinLoading = false;
+                myWalletProvider.isPinValid = false;
                 pinColor = Colors.red[600];
-                walletOptions.reload();
+                enterPin.text = '';
+                // myWalletProvider.reload();
+                pinFocus.requestFocus();
               }
             },
             onChanged: (value) {
+              if (enterPin.text != '') myWalletProvider.isPinLoading = true;
               if (pinColor != const Color(0xFFA4B600)) {
                 pinColor = const Color(0xFFA4B600);
               }
+              myWalletProvider.reload();
             },
           )),
     );

lib/screens/onBoarding/11_congratulations.dart

@@ -1,7 +1,7 @@
 // ignore_for_file: file_names
 
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/services.dart';
+
 import 'package:flutter/material.dart';
 import 'package:gecko/globals.dart';
 import 'package:gecko/models/widgets_keys.dart';
@@ -12,7 +12,6 @@ class OnboardingStepEleven extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
     CommonElements common = CommonElements();
 
     return Scaffold(
@@ -59,22 +58,8 @@ Widget finishButton(BuildContext context) {
           backgroundColor: orangeC, // foreground
         ),
         onPressed: () {
-          //TODO: fix bad widget ancestor when pupUntil (multi_chest test failed)
-
-          // Navigator.popUntil(homeContext, ModalRoute.withName('/'));
-          // Navigator.of(homeContext, rootNavigator: true)
-          //     .popUntil(ModalRoute.withName('/'));
-          // while (Navigator.of(homeContext).canPop()) {
-          //   Navigator.of(homeContext).pop();
-          // }
-
-          // Navigator.pushNamed(homeContext, '/mywallets');
-
           Navigator.pushNamedAndRemoveUntil(
-              context, '/mywallets', (route) => route.isFirst);
+              context, '/mywallets', ModalRoute.withName('/'));
-
-          // Navigator.pushNamedAndRemoveUntil(
-          //     homeContext, '/mywallets', ModalRoute.withName('/'));
         },
         child: Text("accessMyChest".tr(),
             style:

lib/screens/onBoarding/2.dart

@@ -1,7 +1,7 @@
 // ignore_for_file: file_names
 
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/services.dart';
+
 import 'package:flutter/material.dart';
 import 'package:gecko/globals.dart';
 import 'package:gecko/screens/common_elements.dart';
@@ -12,7 +12,6 @@ class OnboardingStepTwo extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
     CommonElements common = CommonElements();
 
     return Scaffold(

lib/screens/onBoarding/3.dart

@@ -1,7 +1,7 @@
 // ignore_for_file: file_names
 
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/services.dart';
+
 import 'package:flutter/material.dart';
 import 'package:gecko/globals.dart';
 import 'package:gecko/screens/common_elements.dart';
@@ -12,7 +12,6 @@ class OnboardingStepThree extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
     CommonElements common = CommonElements();
 
     return Scaffold(

lib/screens/onBoarding/4.dart

@@ -1,7 +1,7 @@
 // ignore_for_file: file_names
 
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/services.dart';
+
 import 'package:flutter/material.dart';
 import 'package:gecko/globals.dart';
 import 'package:gecko/screens/common_elements.dart';
@@ -12,7 +12,6 @@ class OnboardingStepFor extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
     CommonElements common = CommonElements();
 
     return Scaffold(

lib/screens/onBoarding/5.dart

@@ -1,12 +1,14 @@
 // ignore_for_file: file_names
 
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/services.dart';
+
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:gecko/globals.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/generate_wallets.dart';
 import 'package:gecko/providers/my_wallets.dart';
+import 'package:gecko/providers/wallets_profiles.dart';
 import 'package:gecko/screens/common_elements.dart';
 import 'package:gecko/screens/onBoarding/6.dart';
 import 'package:printing/printing.dart';
@@ -29,8 +31,7 @@ class OnboardingStepFive extends StatefulWidget {
 class _ChooseChestState extends State<OnboardingStepFive> {
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+    final generateWalletProvider =
-    GenerateWalletsProvider generateWalletProvider =
         Provider.of<GenerateWalletsProvider>(context, listen: false);
 
     final CommonElements common = CommonElements();
@@ -58,20 +59,57 @@ class _ChooseChestState extends State<OnboardingStepFive> {
             SizedBox(height: 35 * ratio),
             sentanceArray(context),
             SizedBox(height: 17 * ratio),
-            GestureDetector(
+            Row(
-              onTap: () {
+              mainAxisAlignment: MainAxisAlignment.spaceEvenly,
-                Navigator.push(
+              children: [
-                  context,
+                // const SizedBox(height: 10),
-                  MaterialPageRoute(builder: (context) {
+                GestureDetector(
-                    return PrintWallet(
+                  onTap: () {
-                        generateWalletProvider.generatedMnemonic);
+                    Navigator.push(
-                  }),
+                      context,
-                );
+                      MaterialPageRoute(builder: (context) {
-              },
+                        return PrintWallet(
-              child: Image.asset(
+                            generateWalletProvider.generatedMnemonic);
-                'assets/printer.png',
+                      }),
-                height: 42 * ratio,
+                    );
-              ),
+                  },
+                  child: Image.asset(
+                    'assets/printer.png',
+                    height: 42 * ratio,
+                  ),
+                ),
+
+                SizedBox(
+                  height: 40,
+                  width: 120,
+                  child: ElevatedButton(
+                    style: ElevatedButton.styleFrom(
+                      foregroundColor: Colors.black,
+                      shape: RoundedRectangleBorder(
+                        borderRadius: BorderRadius.circular(8),
+                      ),
+                      backgroundColor: orangeC,
+                      elevation: 1, // foreground
+                    ),
+                    onPressed: () {
+                      Clipboard.setData(ClipboardData(
+                          text: generateWalletProvider.generatedMnemonic));
+                      snackCopySeed(context);
+                    },
+                    child: Row(children: <Widget>[
+                      Image.asset(
+                        'assets/walletOptions/copy-white.png',
+                        height: 25,
+                      ),
+                      const SizedBox(width: 7),
+                      Text(
+                        'copy'.tr(),
+                        style: TextStyle(fontSize: 15, color: Colors.grey[50]),
+                      )
+                    ]),
+                  ),
+                ),
+              ],
             ),
             const SizedBox(height: 40),
             Expanded(
@@ -112,7 +150,7 @@ class _ChooseChestState extends State<OnboardingStepFive> {
 }
 
 Widget sentanceArray(BuildContext context) {
-  GenerateWalletsProvider generateWalletProvider =
+  final generateWalletProvider =
       Provider.of<GenerateWalletsProvider>(context, listen: false);
 
   return Padding(
@@ -189,7 +227,7 @@ class PrintWallet extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    GenerateWalletsProvider generateWalletProvider =
+    final generateWalletProvider =
         Provider.of<GenerateWalletsProvider>(context, listen: false);
     return MaterialApp(
       home: Scaffold(
@@ -222,9 +260,9 @@ class PrintWallet extends StatelessWidget {
 
 Widget nextButton(
     BuildContext context, String text, bool isFast, bool skipIntro) {
-  GenerateWalletsProvider generateWalletProvider =
+  final generateWalletProvider =
       Provider.of<GenerateWalletsProvider>(context, listen: false);
-  MyWalletsProvider myWalletProvider =
+  final myWalletProvider =
       Provider.of<MyWalletsProvider>(context, listen: false);
   return SizedBox(
     width: 380 * ratio,

lib/screens/onBoarding/6.dart

@@ -2,7 +2,7 @@
 // ignore_for_file: must_be_immutable
 
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/services.dart';
+
 import 'package:flutter/material.dart';
 import 'package:gecko/globals.dart';
 import 'package:gecko/models/widgets_keys.dart';
@@ -24,8 +24,7 @@ class OnboardingStepSix extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+    final generateWalletProvider =
-    GenerateWalletsProvider generateWalletProvider =
         Provider.of<GenerateWalletsProvider>(context, listen: true);
 
     CommonElements common = CommonElements();
@@ -145,7 +144,7 @@ class OnboardingStepSix extends StatelessWidget {
 }
 
 Widget nextButton(BuildContext context, String text, nextScreen, bool isFast) {
-  GenerateWalletsProvider generateWalletProvider =
+  final generateWalletProvider =
       Provider.of<GenerateWalletsProvider>(context, listen: false);
 
   generateWalletProvider.isAskedWordValid = false;

lib/screens/onBoarding/7.dart

@@ -1,6 +1,6 @@
 // ignore_for_file: file_names
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/services.dart';
+
 import 'package:flutter/material.dart';
 import 'package:gecko/globals.dart';
 import 'package:gecko/screens/common_elements.dart';
@@ -13,7 +13,6 @@ class OnboardingStepSeven extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
     CommonElements common = CommonElements();
     return Scaffold(
       backgroundColor: backgroundColor,

lib/screens/onBoarding/8.dart

@@ -1,6 +1,6 @@
 // ignore_for_file: file_names
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/services.dart';
+
 import 'package:flutter/material.dart';
 import 'package:gecko/globals.dart';
 import 'package:gecko/screens/common_elements.dart';
@@ -13,7 +13,6 @@ class OnboardingStepEight extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
     CommonElements common = CommonElements();
     return Scaffold(
       backgroundColor: backgroundColor,

lib/screens/onBoarding/9.dart

@@ -1,6 +1,6 @@
 // ignore_for_file: file_names
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/services.dart';
+
 import 'package:flutter/material.dart';
 import 'package:gecko/globals.dart';
 import 'package:gecko/models/widgets_keys.dart';
@@ -16,10 +16,9 @@ class OnboardingStepNine extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+    final generateWalletProvider =
-    GenerateWalletsProvider generateWalletProvider =
         Provider.of<GenerateWalletsProvider>(context);
-    // MyWalletsProvider myWalletProvider =
+    // final myWalletProvider =
     //     Provider.of<MyWalletsProvider>(context);
     CommonElements common = CommonElements();
 
@@ -53,6 +52,7 @@ class OnboardingStepNine extends StatelessWidget {
                 children: <Widget>[
                   TextField(
                       key: keyGeneratedPin,
+                      textCapitalization: TextCapitalization.characters,
                       enabled: false,
                       controller: generateWalletProvider.pin,
                       maxLines: 1,

lib/screens/qrcode_fullscreen.dart

@@ -1,6 +1,5 @@
 // ignore_for_file: must_be_immutable
 
-import 'package:flutter/services.dart';
 import 'package:gecko/globals.dart';
 import 'package:flutter/material.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
@@ -17,7 +16,6 @@ class QrCodeFullscreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
     return Scaffold(
       appBar: AppBar(
           elevation: 0,

lib/screens/search.dart

@@ -1,5 +1,5 @@
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/services.dart';
+
 import 'package:gecko/globals.dart';
 import 'package:flutter/material.dart';
 import 'package:gecko/models/widgets_keys.dart';
@@ -16,11 +16,8 @@ class SearchScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+    final searchProvider = Provider.of<SearchProvider>(context);
-    SearchProvider searchProvider = Provider.of<SearchProvider>(context);
+    final screenHeight = MediaQuery.of(context).size.height;
-    final double screenHeight = MediaQuery.of(context).size.height;
-    // HomeProvider _homeProvider =
-    //     Provider.of<HomeProvider>(context, listen: false);
 
     return WillPopScope(
       onWillPop: () {
@@ -29,7 +26,6 @@ class SearchScreen extends StatelessWidget {
       },
       child: Scaffold(
         backgroundColor: backgroundColor,
-
         appBar: AppBar(
           elevation: 1,
           toolbarHeight: 60 * ratio,
@@ -44,7 +40,6 @@ class SearchScreen extends StatelessWidget {
                 Navigator.of(context).pop();
               }),
         ),
-        // bottomNavigationBar: _homeProvider.bottomAppBar(context),
         body: SafeArea(
           child: Stack(children: [
             Column(children: <Widget>[
@@ -52,6 +47,17 @@ class SearchScreen extends StatelessWidget {
               Padding(
                 padding: const EdgeInsets.symmetric(horizontal: 17),
                 child: TextField(
+                  onSubmitted: searchProvider.searchController.text.length >= 2
+                      ? (_) {
+                          Navigator.push(
+                            context,
+                            MaterialPageRoute(builder: (context) {
+                              return const SearchResultScreen();
+                            }),
+                          );
+                        }
+                      : (value) {},
+                  textInputAction: TextInputAction.search,
                   key: keySearchField,
                   controller: searchProvider.searchController,
                   autofocus: true,
@@ -90,8 +96,8 @@ class SearchScreen extends StatelessWidget {
               ),
               const Spacer(flex: 1),
               SizedBox(
-                width: 410,
+                width: 320,
-                height: 70,
+                height: 90,
                 child: ElevatedButton(
                   key: keyConfirmSearch,
                   style: ElevatedButton.styleFrom(
@@ -110,8 +116,9 @@ class SearchScreen extends StatelessWidget {
                       : null,
                   child: Text(
                     'search'.tr(),
+                    textAlign: TextAlign.center,
                     style: const TextStyle(
-                        fontSize: 24, fontWeight: FontWeight.w600),
+                        fontSize: 21, fontWeight: FontWeight.w600),
                   ),
                 ),
               ),

lib/screens/search_result.dart

@@ -1,18 +1,20 @@
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/services.dart';
+
 import 'package:gecko/globals.dart';
 import 'package:flutter/material.dart';
+import 'package:gecko/models/wallet_data.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/cesium_plus.dart';
 import 'package:gecko/models/g1_wallets_list.dart';
 import 'package:gecko/providers/duniter_indexer.dart';
-import 'package:gecko/providers/home.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
-import 'package:gecko/providers/wallet_options.dart';
 import 'package:gecko/providers/wallets_profiles.dart';
 import 'package:gecko/providers/search.dart';
 import 'package:gecko/screens/common_elements.dart';
 import 'package:gecko/screens/wallet_view.dart';
+import 'package:gecko/widgets/balance.dart';
+import 'package:gecko/widgets/bottom_app_bar.dart';
+import 'package:gecko/widgets/name_by_address.dart';
 import 'package:provider/provider.dart';
 
 class SearchResultScreen extends StatelessWidget {
@@ -20,17 +22,10 @@ class SearchResultScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+    final searchProvider = Provider.of<SearchProvider>(context, listen: false);
-    SearchProvider searchProvider =
-        Provider.of<SearchProvider>(context, listen: false);
-    CesiumPlusProvider cesiumPlusProvider =
-        Provider.of<CesiumPlusProvider>(context, listen: false);
     WalletsProfilesProvider walletsProfilesClass =
         Provider.of<WalletsProfilesProvider>(context, listen: false);
-    HomeProvider homeProvider =
+    final duniterIndexer = Provider.of<DuniterIndexer>(context, listen: false);
-        Provider.of<HomeProvider>(context, listen: false);
-    DuniterIndexer duniterIndexer =
-        Provider.of<DuniterIndexer>(context, listen: false);
 
     double avatarSize = 55;
 
@@ -44,7 +39,7 @@ class SearchResultScreen extends StatelessWidget {
           child: Text('researchResults'.tr()),
         ),
       ),
-      bottomNavigationBar: homeProvider.bottomAppBar(context),
+      bottomNavigationBar: const GeckoBottomAppBar(),
       body: SafeArea(
         child: Stack(children: [
           Padding(
@@ -83,7 +78,6 @@ class SearchResultScreen extends StatelessWidget {
                         if (snapshot.data?.isEmpty ?? true) {
                           return duniterIndexer.searchIdentity(
                               context, searchProvider.searchController.text);
-
                           // const Text('Aucun résultat');
                         } else {
                           return Expanded(
@@ -97,8 +91,7 @@ class SearchResultScreen extends StatelessWidget {
                                       key: keySearchResult(g1Wallet.address),
                                       horizontalTitleGap: 40,
                                       contentPadding: const EdgeInsets.all(5),
-                                      leading: cesiumPlusProvider
+                                      leading: defaultAvatar(avatarSize),
-                                          .defaultAvatar(avatarSize),
                                       title: Row(children: <Widget>[
                                         Text(getShortPubkey(g1Wallet.address),
                                             style: const TextStyle(
@@ -122,17 +115,19 @@ class SearchResultScreen extends StatelessWidget {
                                                             MainAxisAlignment
                                                                 .center,
                                                         children: [
-                                                          balance(
+                                                          Balance(
-                                                              context,
+                                                              address: g1Wallet
-                                                              g1Wallet.address,
+                                                                  .address,
-                                                              16),
+                                                              size: 16),
                                                         ]),
                                                   ]),
                                             ),
                                           ]),
                                       subtitle: Row(children: <Widget>[
-                                        duniterIndexer.getNameByAddress(
+                                        NameByAddress(
-                                            context, g1Wallet.address)
+                                          wallet: WalletData(
+                                              address: g1Wallet.address),
+                                        ),
                                       ]),
                                       dense: false,
                                       isThreeLine: false,
@@ -144,10 +139,10 @@ class SearchResultScreen extends StatelessWidget {
                                                 g1Wallet.address;
                                             return WalletViewScreen(
                                               address: g1Wallet.address,
-                                              username: g1WalletsBox
+                                              username: duniterIndexer
-                                                  .get(g1Wallet.address)
+                                                          .walletNameIndexer[
-                                                  ?.id
+                                                      g1Wallet.address] ??
-                                                  ?.username,
+                                                  '',
                                               avatar: g1WalletsBox
                                                   .get(g1Wallet.address)
                                                   ?.avatar,

lib/screens/settings.dart

@@ -1,6 +1,6 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
+
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/duniter_indexer.dart';
 import 'package:gecko/providers/home.dart';
@@ -18,8 +18,6 @@ class SettingsScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
-
     const double buttonHigh = 50;
     const double buttonWidth = 240;
     const double fontSize = 16;
@@ -110,7 +108,7 @@ class SettingsScreen extends StatelessWidget {
   }
 
   Widget duniterEndpointSelection(BuildContext context) {
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
     String? selectedDuniterEndpoint;
 
     // List of items in our dropdown menu
@@ -271,8 +269,7 @@ class SettingsScreen extends StatelessWidget {
   }
 
   Widget indexerEndpointSelection(BuildContext context) {
-    DuniterIndexer indexer =
+    final duniterIndexer = Provider.of<DuniterIndexer>(context, listen: false);
-        Provider.of<DuniterIndexer>(context, listen: false);
 
     String? selectedIndexerEndpoint;
     if (configBox.containsKey('customIndexer')) {
@@ -282,7 +279,7 @@ class SettingsScreen extends StatelessWidget {
     }
 
     if (selectedIndexerEndpoint == '') {
-      selectedIndexerEndpoint = indexer.listIndexerEndpoints[0];
+      selectedIndexerEndpoint = duniterIndexer.listIndexerEndpoints[0];
     }
 
     TextEditingController indexerEndpointController = TextEditingController(

lib/screens/template_screen.dart

@@ -1,4 +1,3 @@
-import 'package:flutter/services.dart';
 import 'package:gecko/globals.dart';
 import 'package:flutter/material.dart';
 
@@ -7,8 +6,7 @@ class TemplateScreen extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+    // final _homeProvider = Provider.of<HomeProvider>(context);
-    // HomeProvider _homeProvider = Provider.of<HomeProvider>(context);
 
     return Scaffold(
         backgroundColor: backgroundColor,

lib/screens/transaction_in_progress.dart

@@ -1,5 +1,5 @@
 import 'package:easy_localization/easy_localization.dart';
-import 'package:flutter/services.dart';
+
 import 'package:gecko/globals.dart';
 import 'package:flutter/material.dart';
 import 'package:gecko/models/widgets_keys.dart';
@@ -20,11 +20,10 @@ class TransactionInProgress extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
+    final sub = Provider.of<SubstrateSdk>(context, listen: true);
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: true);
+    final walletProfiles =
-    WalletsProfilesProvider walletViewProvider =
         Provider.of<WalletsProfilesProvider>(context, listen: false);
-    MyWalletsProvider myWalletProvider =
+    final myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
     bool isValid = false;
 
@@ -35,11 +34,11 @@ class TransactionInProgress extends StatelessWidget {
 
     // sub.spawnBlock();
 
-    log.d(walletViewProvider.address);
+    log.d(walletProfiles.address);
 
     final from = fromAddress ?? myWalletProvider.getDefaultWallet().name!;
-    final to = toAddress ?? getShortPubkey(walletViewProvider.address);
+    final to = toAddress ?? getShortPubkey(walletProfiles.address);
-    final amount = walletViewProvider.payAmount.text;
+    final amount = walletProfiles.payAmount.text;
     String actionName = '';
     final bool isUdUnit = configBox.get('isUdUnit') ?? false;
 

lib/screens/wallet_view.dart

@@ -2,16 +2,17 @@
 
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/services.dart';
+
 import 'package:gecko/globals.dart';
 import 'package:flutter/material.dart';
 import 'package:gecko/models/g1_wallets_list.dart';
 import 'package:gecko/models/widgets_keys.dart';
 import 'package:gecko/providers/cesium_plus.dart';
-import 'package:gecko/providers/home.dart';
+import 'package:gecko/providers/duniter_indexer.dart';
 import 'package:gecko/providers/substrate_sdk.dart';
-import 'package:gecko/providers/wallet_options.dart';
 import 'package:gecko/providers/my_wallets.dart';
 import 'package:gecko/models/wallet_data.dart';
+import 'package:gecko/providers/wallet_options.dart';
 import 'package:gecko/providers/wallets_profiles.dart';
 import 'package:gecko/screens/activity.dart';
 import 'package:gecko/screens/common_elements.dart';
@@ -19,36 +20,38 @@ import 'package:gecko/screens/myWallets/choose_wallet.dart';
 import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
 import 'package:gecko/screens/qrcode_fullscreen.dart';
 import 'package:gecko/screens/transaction_in_progress.dart';
+import 'package:gecko/widgets/balance.dart';
+import 'package:gecko/widgets/bottom_app_bar.dart';
+import 'package:gecko/widgets/header_profile.dart';
+import 'package:gecko/widgets/page_route_no_transition.dart';
 import 'package:provider/provider.dart';
 import 'package:qr_flutter/qr_flutter.dart';
 
 class WalletViewScreen extends StatelessWidget {
   const WalletViewScreen(
-      {required this.address, this.username, this.avatar, Key? key})
+      {required this.address, required this.username, this.avatar, Key? key})
       : super(key: key);
   final String address;
-  final String? username;
+  final String username;
   final Image? avatar;
   final double buttonSize = 100;
   final double buttonFontSize = 18;
 
   @override
   Widget build(BuildContext context) {
-    SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
     WalletsProfilesProvider walletProfile =
         Provider.of<WalletsProfilesProvider>(context, listen: false);
-    CesiumPlusProvider cesiumPlusProvider =
+    final sub = Provider.of<SubstrateSdk>(context, listen: false);
-        Provider.of<CesiumPlusProvider>(context, listen: false);
+    final myWalletProvider =
-    walletProfile.address = address;
-    SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
-    HomeProvider homeProvider =
-        Provider.of<HomeProvider>(context, listen: false);
-    MyWalletsProvider myWalletProvider =
         Provider.of<MyWalletsProvider>(context, listen: false);
+    final duniterIndexer = Provider.of<DuniterIndexer>(context, listen: false);
     WalletData? defaultWallet = myWalletProvider.getDefaultWallet();
 
+    walletProfile.address = address;
     sub.setCurrentWallet(defaultWallet);
 
+    log.d('aaaaaaaaaaaaaaaaaaa:  $username');
+
     return Scaffold(
         backgroundColor: backgroundColor,
         resizeToAvoidBottomInset: true,
@@ -100,15 +103,21 @@ class WalletViewScreen extends StatelessWidget {
             )
           ],
           title: SizedBox(
-            height: 22,
+              height: 22,
-            child: Text('seeAWallet'.tr()),
+              child: Text(duniterIndexer
-          ),
+                          .walletNameIndexer[walletProfile.address] ==
+                      null
+                  ? 'seeAWallet'.tr()
+                  : 'memberAccountOf'.tr(args: [
+                      duniterIndexer.walletNameIndexer[walletProfile.address] ??
+                          '?'
+                    ]))),
         ),
-        bottomNavigationBar: homeProvider.bottomAppBar(context),
+        bottomNavigationBar: const GeckoBottomAppBar(),
         body: SafeArea(
           child: Column(children: <Widget>[
-            walletProfile.headerProfileView(context, address, username),
+            HeaderProfile(address: address, username: username),
-            SizedBox(height: isTall ? 10 : 0),
+            SizedBox(height: isTall ? 30 : 15),
             Row(mainAxisAlignment: MainAxisAlignment.spaceAround, children: [
               Column(children: <Widget>[
                 SizedBox(
@@ -128,11 +137,10 @@ class WalletViewScreen extends StatelessWidget {
                           onTap: () {
                             Navigator.push(
                               context,
-                              MaterialPageRoute(builder: (context) {
+                              PageNoTransit(builder: (context) {
                                 return ActivityScreen(
                                     address: address,
-                                    avatar:
+                                    avatar: defaultAvatar(50));
-                                        cesiumPlusProvider.defaultAvatar(50));
                               }),
                             );
                           }),
@@ -150,7 +158,7 @@ class WalletViewScreen extends StatelessWidget {
               Consumer<SubstrateSdk>(builder: (context, sub, _) {
                 WalletData? defaultWallet = myWalletProvider.getDefaultWallet();
                 return FutureBuilder(
-                  future: sub.certState(defaultWallet.address!, address),
+                  future: sub.certState(defaultWallet.address, address),
                   builder: (context, AsyncSnapshot<Map<String, int>> snapshot) {
                     if (snapshot.data == null) return const SizedBox();
                     String duration = '';
@@ -162,8 +170,8 @@ class WalletViewScreen extends StatelessWidget {
                       final Duration durationSeconds = Duration(
                           seconds: snapshot.data!['certDelay'] ??
                               snapshot.data!['certRenewable']!);
-                      final int seconds = durationSeconds.inSeconds;
+                      final seconds = durationSeconds.inSeconds;
-                      final int minutes = durationSeconds.inMinutes;
+                      final minutes = durationSeconds.inMinutes;
 
                       if (seconds <= 0) {
                         duration = 'seconds'.tr(args: ['0']);
@@ -172,8 +180,8 @@ class WalletViewScreen extends StatelessWidget {
                       } else if (seconds <= 3600) {
                         duration = 'minutes'.tr(args: [minutes.toString()]);
                       } else if (seconds <= 86400) {
-                        final int hours = durationSeconds.inHours;
+                        final hours = durationSeconds.inHours;
-                        final int minutesLeft = minutes - hours * 60;
+                        final minutesLeft = minutes - hours * 60;
                         String showMinutes = '';
                         if (minutesLeft < 60) {}
                         showMinutes =
@@ -181,11 +189,10 @@ class WalletViewScreen extends StatelessWidget {
                         duration =
                             'hours'.tr(args: [hours.toString(), showMinutes]);
                       } else if (seconds <= 2592000) {
-                        final int days = durationSeconds.inDays;
+                        final days = durationSeconds.inDays;
                         duration = 'days'.tr(args: [days.toString()]);
                       } else {
-                        final int months =
+                        final months = (durationSeconds.inDays / 30).round();
-                            (durationSeconds.inDays / 30).round();
                         duration = 'months'.tr(args: [months.toString()]);
                       }
                     }
@@ -213,12 +220,18 @@ class WalletViewScreen extends StatelessWidget {
                                                 'assets/gecko_certify.png')),
                                       ),
                                       onTap: () async {
-                                        final bool? result = await confirmPopup(
+                                        final bool? result =
-                                            context,
+                                            await confirmPopupCertification(
-                                            "areYouSureYouWantToCertify".tr(
+                                                context,
-                                                args: [
+                                                'areYouSureYouWantToCertify1'
-                                                  getShortPubkey(address)
+                                                    .tr(),
-                                                ]));
+                                                duniterIndexer
+                                                            .walletNameIndexer[
+                                                        address] ??
+                                                    "noIdentity".tr(),
+                                                'areYouSureYouWantToCertify2'
+                                                    .tr(),
+                                                getShortPubkey(address));
 
                                         if (result ?? false) {
                                           String? pin;
@@ -262,7 +275,9 @@ class WalletViewScreen extends StatelessWidget {
                             ),
                             const SizedBox(height: 9),
                             Text(
-                              "certify".tr(),
+                              toStatus == 0
+                                  ? "certify".tr()
+                                  : "createIdentity".tr(),
                               textAlign: TextAlign.center,
                               style: TextStyle(
                                   fontSize: buttonFontSize,
@@ -422,9 +437,7 @@ void paymentPopup(BuildContext context, String toAddress) {
     log.d(pin);
     if (pin != null || myWalletProvider.pinCode != '') {
       // Payment workflow !
-      WalletsProfilesProvider walletViewProvider =
+      final sub = Provider.of<SubstrateSdk>(context, listen: false);
-          Provider.of<WalletsProfilesProvider>(context, listen: false);
-      SubstrateSdk sub = Provider.of<SubstrateSdk>(context, listen: false);
       final acc = sub.getCurrentWallet();
       log.d(
           "fromAddress: ${acc.address!},destAddress: $toAddress, amount: ${double.parse(walletViewProvider.payAmount.text)},  password: $pin");
@@ -453,16 +466,19 @@ void paymentPopup(BuildContext context, String toAddress) {
       context: context,
       builder: (BuildContext context) {
         final sub = Provider.of<SubstrateSdk>(homeContext, listen: false);
+        final walletOptions =
+            Provider.of<WalletOptionsProvider>(context, listen: false);
+
         double fees = 0;
         return StatefulBuilder(
             builder: (BuildContext context, StateSetter setState) {
           if (walletViewProvider.payAmount.text != '' &&
               (double.parse(walletViewProvider.payAmount.text) +
                       2 / balanceRatio) <=
-                  (balanceCache[defaultWallet.address] ?? 0) &&
+                  (walletOptions.balanceCache[defaultWallet.address] ?? 0) &&
               toAddress != defaultWallet.address) {
-            if ((balanceCache[toAddress] == 0 ||
+            if ((walletOptions.balanceCache[toAddress] == 0 ||
-                    balanceCache[toAddress] == null) &&
+                    walletOptions.balanceCache[toAddress] == null) &&
                 double.parse(walletViewProvider.payAmount.text) <
                     5 / balanceRatio) {
               canValidate = false;
@@ -557,7 +573,7 @@ void paymentPopup(BuildContext context, String toAddress) {
                             child: Row(children: [
                               Text(defaultWallet.name!),
                               const Spacer(),
-                              balance(context, defaultWallet.address!, 20)
+                              Balance(address: defaultWallet.address, size: 20),
                             ]),
                           ),
                         );
@@ -624,7 +640,7 @@ void paymentPopup(BuildContext context, String toAddress) {
                         keyboardType: TextInputType.number,
                         onChanged: (_) async {
                           fees = await sub.txFees(
-                              defaultWallet.address!,
+                              defaultWallet.address,
                               toAddress,
                               double.parse(
                                   walletViewProvider.payAmount.text == ''

lib/widgets/balance.dart

@@ -0,0 +1,75 @@
+import 'package:flutter/material.dart';
+import 'package:gecko/globals.dart';
+import 'package:gecko/providers/substrate_sdk.dart';
+import 'package:gecko/providers/wallet_options.dart';
+import 'package:gecko/widgets/ud_unit_display.dart';
+import 'package:provider/provider.dart';
+
+class Balance extends StatelessWidget {
+  const Balance(
+      {Key? key,
+      required this.address,
+      required this.size,
+      this.color = Colors.black,
+      this.loadingColor = const Color(0xffd07316)})
+      : super(key: key);
+  final String address;
+  final double size;
+  final Color color;
+  final Color loadingColor;
+
+  @override
+  Widget build(BuildContext context) {
+    final walletOptions =
+        Provider.of<WalletOptionsProvider>(context, listen: false);
+    return Column(children: <Widget>[
+      Consumer<SubstrateSdk>(builder: (context, sdk, _) {
+        return FutureBuilder(
+            future: sdk.getBalance(address),
+            builder: (BuildContext context,
+                AsyncSnapshot<Map<String, double>> globalBalance) {
+              if (globalBalance.connectionState != ConnectionState.done ||
+                  globalBalance.hasError) {
+                if (walletOptions.balanceCache[address] != null &&
+                    walletOptions.balanceCache[address] != -1) {
+                  return Row(children: [
+                    Text(walletOptions.balanceCache[address]!.toString(),
+                        style: TextStyle(
+                            fontSize: isTall ? size : size * 0.9,
+                            color: color)),
+                    const SizedBox(width: 5),
+                    UdUnitDisplay(size: size, color: color),
+                  ]);
+                } else {
+                  return SizedBox(
+                    height: 15,
+                    width: 15,
+                    child: CircularProgressIndicator(
+                      color: loadingColor,
+                      strokeWidth: 2,
+                    ),
+                  );
+                }
+              }
+              walletOptions.balanceCache[address] =
+                  globalBalance.data!['transferableBalance']!;
+              if (walletOptions.balanceCache[address] != -1) {
+                return Row(children: [
+                  Text(
+                    walletOptions.balanceCache[address]!.toString(),
+                    style: TextStyle(
+                      fontSize: isTall ? size : size * 0.9,
+                      color: color,
+                    ),
+                  ),
+                  const SizedBox(width: 5),
+                  UdUnitDisplay(size: size, color: color),
+                ]);
+              } else {
+                return const Text('');
+              }
+            });
+      }),
+    ]);
+  }
+}

lib/widgets/bottom_app_bar.dart

@@ -0,0 +1,137 @@
+// ignore_for_file: use_build_context_synchronously
+
+import 'package:flutter/material.dart';
+import 'package:gecko/globals.dart';
+import 'package:gecko/models/wallet_data.dart';
+import 'package:gecko/models/widgets_keys.dart';
+import 'package:gecko/providers/my_wallets.dart';
+import 'package:gecko/providers/wallets_profiles.dart';
+import 'package:gecko/screens/myWallets/unlocking_wallet.dart';
+import 'package:gecko/screens/myWallets/wallets_home.dart';
+import 'package:gecko/screens/search.dart';
+import 'package:provider/provider.dart';
+
+class GeckoBottomAppBar extends StatelessWidget {
+  const GeckoBottomAppBar({Key? key, this.actualRoute = ''}) : super(key: key);
+  final String actualRoute;
+
+  @override
+  Widget build(BuildContext context) {
+    final myWalletProvider =
+        Provider.of<MyWalletsProvider>(context, listen: false);
+    WalletsProfilesProvider historyProvider =
+        Provider.of<WalletsProfilesProvider>(context, listen: false);
+
+    final size = MediaQuery.of(context).size;
+    const bool showBottomBar = true;
+    final lockAction = actualRoute == 'safeHome';
+
+    return Visibility(
+      visible: showBottomBar,
+      child: Container(
+        color: yellowC,
+        width: size.width,
+        height: 80,
+        child: Row(mainAxisAlignment: MainAxisAlignment.start, children: [
+          const Spacer(),
+          const SizedBox(width: 11),
+          IconButton(
+            key: keyAppBarSearch,
+            iconSize: 40,
+            icon: const Image(image: AssetImage('assets/loupe-noire.png')),
+            onPressed: () {
+              Navigator.popUntil(
+                context,
+                ModalRoute.withName('/'),
+              );
+              Navigator.push(
+                context,
+                MaterialPageRoute(builder: (homeContext) {
+                  return const SearchScreen();
+                }),
+              );
+            },
+          ),
+          const SizedBox(width: 22),
+          const Spacer(),
+          IconButton(
+            key: keyAppBarQrcode,
+            iconSize: 70,
+            icon: const Image(image: AssetImage('assets/qrcode-scan.png')),
+            onPressed: () async {
+              Navigator.popUntil(
+                context,
+                ModalRoute.withName('/'),
+              );
+              historyProvider.scan(homeContext);
+            },
+          ),
+          const Spacer(),
+          const SizedBox(width: 15),
+          Stack(
+            children: [
+              if (lockAction)
+                Center(
+                  child: Padding(
+                    padding: const EdgeInsets.only(left: 0),
+                    child: Container(
+                      width: 75,
+                      height: 75,
+                      decoration: BoxDecoration(
+                        shape: BoxShape.circle,
+                        border:
+                            Border.all(color: orangeC.withOpacity(0), width: 3),
+                        gradient: RadialGradient(
+                          radius: 0.5,
+                          colors: [
+                            yellowC,
+                            orangeC.withOpacity(0.1),
+                          ],
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
+              IconButton(
+                key: keyAppBarChest,
+                iconSize: 60,
+                icon: const Image(image: AssetImage('assets/wallet.png')),
+                onPressed: lockAction
+                    ? null
+                    : () async {
+                        WalletData? defaultWallet =
+                            myWalletProvider.getDefaultWallet();
+                        String? pin;
+                        if (myWalletProvider.pinCode == '') {
+                          pin = await Navigator.push(
+                            context,
+                            MaterialPageRoute(
+                              builder: (homeContext) {
+                                return UnlockingWallet(wallet: defaultWallet);
+                              },
+                            ),
+                          );
+                        }
+
+                        if (pin != null || myWalletProvider.pinCode != '') {
+                          Navigator.popUntil(
+                            context,
+                            ModalRoute.withName('/'),
+                          );
+                          Navigator.push(
+                            context,
+                            MaterialPageRoute(builder: (context) {
+                              return const WalletsHome();
+                            }),
+                          );
+                        }
+                      },
+              ),
+            ],
+          ),
+          const Spacer(),
+        ]),
+      ),
+    );
+  }
+}

lib/widgets/cert_tile.dart

@@ -0,0 +1,87 @@
+import 'package:flutter/material.dart';
+import 'package:gecko/globals.dart';
+import 'package:gecko/models/widgets_keys.dart';
+import 'package:gecko/providers/cesium_plus.dart';
+import 'package:gecko/providers/substrate_sdk.dart';
+import 'package:gecko/screens/wallet_view.dart';
+
+class CertTile extends StatelessWidget {
+  const CertTile({
+    Key? key,
+    required this.listCerts,
+  }) : super(key: key);
+
+  final List listCerts;
+
+  @override
+  Widget build(BuildContext context) {
+    int keyID = 0;
+    const double avatarSize = 200;
+
+    return Column(
+        children: listCerts.map((repository) {
+      // log.d('bbbbbbbbbbbbbbbbbbbbbb: ' + repository.toString());
+
+      return Column(children: <Widget>[
+        Padding(
+          padding: const EdgeInsets.only(right: 0),
+          child:
+              // Row(children: [Column(children: [],)],)
+              ListTile(
+                  key: keyTransaction(keyID++),
+                  contentPadding: const EdgeInsets.only(
+                      left: 20, right: 30, top: 15, bottom: 15),
+                  leading: ClipOval(
+                    child: defaultAvatar(avatarSize),
+                  ),
+                  title: Padding(
+                    padding: const EdgeInsets.only(bottom: 5),
+                    child: Text(repository['name'],
+                        style: const TextStyle(fontSize: 20)),
+                  ),
+                  subtitle: RichText(
+                    text: TextSpan(
+                      style: TextStyle(
+                        fontSize: 16,
+                        color: Colors.grey[700],
+                      ),
+                      children: <TextSpan>[
+                        TextSpan(
+                          text: repository['date'],
+                        ),
+                        if (repository[2] != '')
+                          TextSpan(
+                            text: '  ·  ',
+                            style: TextStyle(
+                              fontSize: 20,
+                              color: Colors.grey[550],
+                            ),
+                          ),
+                        TextSpan(
+                          text: getShortPubkey(repository['address']),
+                          style: TextStyle(
+                            fontStyle: FontStyle.italic,
+                            color: Colors.grey[600],
+                          ),
+                        ),
+                      ],
+                    ),
+                  ),
+                  dense: false,
+                  isThreeLine: false,
+                  onTap: () {
+                    Navigator.push(
+                      homeContext,
+                      MaterialPageRoute(builder: (context) {
+                        return WalletViewScreen(
+                          address: repository['address'],
+                          username: repository['name'],
+                        );
+                      }),
+                    );
+                  }),
+        ),
+      ]);
+    }).toList());
+  }
+}

lib/widgets/certifications.dart

@@ -0,0 +1,44 @@
+import 'package:flutter/material.dart';
+import 'package:gecko/providers/substrate_sdk.dart';
+import 'package:provider/provider.dart';
+
+class Certifications extends StatelessWidget {
+  const Certifications(
+      {Key? key,
+      required this.address,
+      required this.size,
+      this.color = Colors.black})
+      : super(key: key);
+  final String address;
+  final double size;
+  final Color color;
+
+  @override
+  Widget build(BuildContext context) {
+    return Column(children: <Widget>[
+      Consumer<SubstrateSdk>(builder: (context, sdk, _) {
+        return FutureBuilder(
+            future: sdk.getCertsCounter(address),
+            builder: (BuildContext context, AsyncSnapshot<List<int>> certs) {
+              // log.d(_certs.data);
+
+              return certs.data?[0] != 0 && certs.data != null
+                  ? Row(
+                      children: [
+                        Image.asset('assets/medal.png', height: 20),
+                        const SizedBox(width: 1),
+                        Text(certs.data?[0].toString() ?? '0',
+                            style: const TextStyle(fontSize: 20)),
+                        const SizedBox(width: 5),
+                        Text(
+                          "(${certs.data?[1].toString() ?? '0'})",
+                          style: const TextStyle(fontSize: 14),
+                        )
+                      ],
+                    )
+                  : const Text('');
+            });
+      }),
+    ]);
+  }
+}

lib/widgets/certs_counter.dart

@@ -0,0 +1,17 @@
+import 'package:flutter/material.dart';
+import 'package:gecko/providers/substrate_sdk.dart';
+import 'package:provider/provider.dart';
+
+class CertsCounter extends StatelessWidget {
+  const CertsCounter({Key? key, required this.address, this.isSent = false})
+      : super(key: key);
+  final String address;
+  final bool isSent;
+
+  @override
+  Widget build(BuildContext context) {
+    return Consumer<SubstrateSdk>(builder: (context, sub, _) {
+      return Text('(${sub.certsCounterCache[address]![isSent ? 1 : 0]})');
+    });
+  }
+}

lib/widgets/certs_received.dart

@@ -0,0 +1,104 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:gecko/globals.dart';
+import 'package:gecko/models/queries_indexer.dart';
+import 'package:gecko/models/widgets_keys.dart';
+import 'package:gecko/widgets/cert_tile.dart';
+import 'package:graphql_flutter/graphql_flutter.dart';
+
+class CertsReceived extends StatelessWidget {
+  const CertsReceived({Key? key, required this.address}) : super(key: key);
+  final String address;
+
+  @override
+  Widget build(BuildContext context) {
+    final screenHeight = MediaQuery.of(context).size.height;
+    final appBarHeight = AppBar().preferredSize.height;
+    log.d(appBarHeight);
+    final windowHeight = screenHeight - appBarHeight - 200;
+
+    final httpLink = HttpLink(
+      '$indexerEndpoint/v1/graphql',
+    );
+
+    final client = ValueNotifier(
+      GraphQLClient(
+        cache: GraphQLCache(store: HiveStore()),
+        link: httpLink,
+      ),
+    );
+    return GraphQLProvider(
+      client: client,
+      child: Query(
+        options: QueryOptions(
+          document: gql(getCertsReceived),
+          variables: <String, dynamic>{
+            'address': address,
+          },
+        ),
+        builder: (QueryResult result, {fetchMore, refetch}) {
+          if (result.isLoading && result.data == null) {
+            return const Center(
+              child: CircularProgressIndicator(),
+            );
+          }
+
+          if (result.hasException || result.data == null) {
+            log.e('Error Indexer: ${result.exception}');
+            return Column(children: <Widget>[
+              const SizedBox(height: 50),
+              Text(
+                "noNetworkNoHistory".tr(),
+                textAlign: TextAlign.center,
+                style: const TextStyle(fontSize: 18),
+              )
+            ]);
+          } else if (result.data?['certification']?.isEmpty) {
+            return Column(children: <Widget>[
+              const SizedBox(height: 50),
+              Text(
+                "noDataToDisplay".tr(),
+                style: const TextStyle(fontSize: 18),
+              )
+            ]);
+          }
+          // Build history list
+          return SizedBox(
+            height: windowHeight,
+            child: ListView(
+              key: keyListTransactions,
+              children: <Widget>[certsView(result)],
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  Widget certsView(QueryResult result) {
+    List listCerts = [];
+    final List certsData = result.data!['certification'];
+
+    for (final cert in certsData) {
+      final String issuerAddress = cert['issuer']['pubkey'];
+      final String issuerName = cert['issuer']['name'];
+      final date = DateTime.parse(cert['created_at']);
+      final dp = DateTime(date.year, date.month, date.day);
+      final dateForm = '${dp.day}-${dp.month}-${dp.year}';
+      listCerts.add(
+          {'address': issuerAddress, 'name': issuerName, 'date': dateForm});
+    }
+
+    return result.data == null
+        ? Column(children: <Widget>[
+            const SizedBox(height: 50),
+            Text(
+              "noTransactionToDisplay".tr(),
+              style: const TextStyle(fontSize: 18),
+            )
+          ])
+        : Column(children: <Widget>[
+            CertTile(listCerts: listCerts),
+          ]);
+  }
+}

lib/widgets/certs_sent.dart

@@ -0,0 +1,105 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:gecko/globals.dart';
+import 'package:gecko/models/queries_indexer.dart';
+import 'package:gecko/models/widgets_keys.dart';
+import 'package:gecko/widgets/cert_tile.dart';
+import 'package:graphql_flutter/graphql_flutter.dart';
+
+class CertsSent extends StatelessWidget {
+  const CertsSent({Key? key, required this.address}) : super(key: key);
+  final String address;
+
+  @override
+  Widget build(BuildContext context) {
+    final screenHeight = MediaQuery.of(context).size.height;
+    final appBarHeight = AppBar().preferredSize.height;
+    log.d(appBarHeight);
+    final windowHeight = screenHeight - appBarHeight - 200;
+
+    final httpLink = HttpLink(
+      '$indexerEndpoint/v1/graphql',
+    );
+
+    final client = ValueNotifier(
+      GraphQLClient(
+        cache: GraphQLCache(store: HiveStore()),
+        link: httpLink,
+      ),
+    );
+    return GraphQLProvider(
+      client: client,
+      child: Query(
+        options: QueryOptions(
+          document: gql(getCertsSent),
+          variables: <String, dynamic>{
+            'address': address,
+          },
+        ),
+        builder: (QueryResult result, {fetchMore, refetch}) {
+          if (result.isLoading && result.data == null) {
+            return const Center(
+              child: CircularProgressIndicator(),
+            );
+          }
+
+          if (result.hasException || result.data == null) {
+            log.e('Error Indexer: ${result.exception}');
+            return Column(children: <Widget>[
+              const SizedBox(height: 50),
+              Text(
+                "noNetworkNoHistory".tr(),
+                textAlign: TextAlign.center,
+                style: const TextStyle(fontSize: 18),
+              )
+            ]);
+          } else if (result.data?['certification']?.isEmpty) {
+            return Column(children: <Widget>[
+              const SizedBox(height: 50),
+              Text(
+                "noDataToDisplay".tr(),
+                style: const TextStyle(fontSize: 18),
+              )
+            ]);
+          }
+          // Build history list
+          return SizedBox(
+            height: windowHeight,
+            child: ListView(
+              key: keyListTransactions,
+              children: <Widget>[certsView(result)],
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  Widget certsView(QueryResult result) {
+    List listCerts = [];
+    final List certsData = result.data!['certification'];
+
+    for (final cert in certsData) {
+      final String issuerAddress = cert['receiver']['pubkey'];
+      final String issuerName = cert['receiver']['name'];
+      final date = DateTime.parse(cert['created_at']);
+      final dp = DateTime(date.year, date.month, date.day);
+      final dateForm = '${dp.day}-${dp.month}-${dp.year}';
+
+      listCerts.add(
+          {'address': issuerAddress, 'name': issuerName, 'date': dateForm});
+    }
+
+    return result.data == null
+        ? Column(children: <Widget>[
+            const SizedBox(height: 50),
+            Text(
+              "noTransactionToDisplay".tr(),
+              style: const TextStyle(fontSize: 18),
+            )
+          ])
+        : Column(children: <Widget>[
+            CertTile(listCerts: listCerts),
+          ]);
+  }
+}

lib/widgets/header_profile.dart

@@ -0,0 +1,117 @@
+import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
+import 'package:gecko/globals.dart';
+import 'package:gecko/models/widgets_keys.dart';
+import 'package:gecko/providers/cesium_plus.dart';
+import 'package:gecko/providers/duniter_indexer.dart';
+import 'package:gecko/providers/substrate_sdk.dart';
+import 'package:gecko/providers/wallet_options.dart';
+import 'package:gecko/providers/wallets_profiles.dart';
+import 'package:gecko/screens/certifications.dart';
+import 'package:gecko/screens/common_elements.dart';
+import 'package:gecko/widgets/balance.dart';
+import 'package:gecko/widgets/certifications.dart';
+import 'package:gecko/widgets/idty_status.dart';
+import 'package:gecko/widgets/page_route_no_transition.dart';
+import 'package:provider/provider.dart';
+
+class HeaderProfile extends StatelessWidget {
+  const HeaderProfile({
+    Key? key,
+    required this.address,
+    required this.username,
+  }) : super(key: key);
+
+  final String address;
+  final String? username;
+
+  @override
+  Widget build(BuildContext context) {
+    const double avatarSize = 140;
+    final duniterIndexer = Provider.of<DuniterIndexer>(context, listen: false);
+    final walletOptions =
+        Provider.of<WalletOptionsProvider>(context, listen: false);
+
+    return Stack(children: <Widget>[
+      Consumer<SubstrateSdk>(builder: (context, sub, _) {
+        bool isAccountExist = walletOptions.balanceCache[address] != 0;
+        return Container(
+            height: 180,
+            decoration: BoxDecoration(
+              gradient: LinearGradient(
+                begin: Alignment.topCenter,
+                end: Alignment.bottomCenter,
+                colors: [
+                  isAccountExist ? yellowC : Colors.grey[400]!,
+                  isAccountExist ? const Color(0xFFE7811A) : Colors.grey[600]!,
+                ],
+              ),
+            ));
+      }),
+      Padding(
+        padding: const EdgeInsets.only(left: 30, right: 40),
+        child: Row(children: <Widget>[
+          Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: <Widget>[
+                Container(
+                  height: 10,
+                  color: yellowC,
+                ),
+                Row(children: [
+                  GestureDetector(
+                    key: keyCopyAddress,
+                    onTap: () {
+                      Clipboard.setData(ClipboardData(text: address));
+                      snackCopyKey(context);
+                    },
+                    child: Text(
+                      getShortPubkey(address),
+                      style: const TextStyle(
+                        fontSize: 30,
+                        fontWeight: FontWeight.w800,
+                      ),
+                    ),
+                  ),
+                ]),
+                const SizedBox(height: 25),
+                Balance(address: address, size: 22),
+                const SizedBox(height: 10),
+                InkWell(
+                  onTap: () => duniterIndexer.walletNameIndexer[address] != null
+                      ? {
+                          Navigator.push(
+                            context,
+                            PageNoTransit(builder: (context) {
+                              return CertificationsScreen(
+                                  address: address,
+                                  username: duniterIndexer
+                                      .walletNameIndexer[address]!);
+                            }),
+                          ),
+                        }
+                      : null,
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      IdentityStatus(
+                          address: address,
+                          isOwner: false,
+                          color: Colors.black),
+                      Certifications(address: address, size: 14)
+                    ],
+                  ),
+                ),
+              ]),
+          const Spacer(),
+          Column(children: <Widget>[
+            ClipOval(
+              child: defaultAvatar(avatarSize),
+            ),
+          ]),
+        ]),
+      ),
+      CommonElements().offlineInfo(context),
+    ]);
+  }
+}

lib/widgets/idty_status.dart

@@ -0,0 +1,90 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:gecko/models/wallet_data.dart';
+import 'package:gecko/providers/duniter_indexer.dart';
+import 'package:gecko/providers/substrate_sdk.dart';
+import 'package:gecko/widgets/animated_text.dart';
+import 'package:gecko/widgets/name_by_address.dart';
+import 'package:provider/provider.dart';
+
+class IdentityStatus extends StatelessWidget {
+  const IdentityStatus(
+      {Key? key,
+      required this.address,
+      this.isOwner = false,
+      this.color = Colors.black})
+      : super(key: key);
+  final String address;
+  final bool isOwner;
+  final Color color;
+
+  @override
+  Widget build(BuildContext context) {
+    final duniterIndexer = Provider.of<DuniterIndexer>(context, listen: false);
+
+    return Consumer<SubstrateSdk>(builder: (context, sub, _) {
+      return FutureBuilder(
+          future: sub.idtyStatus(address),
+          initialData: '',
+          builder: (context, snapshot) {
+            duniterIndexer.idtyStatusCache[address] = snapshot.data.toString();
+            switch (snapshot.data.toString()) {
+              case 'noid':
+                {
+                  return showText('noIdentity'.tr());
+                }
+              case 'Created':
+                {
+                  return showText('identityCreated'.tr());
+                }
+              case 'ConfirmedByOwner':
+                {
+                  return isOwner
+                      ? showText('identityConfirmed'.tr())
+                      : NameByAddress(
+                          wallet: WalletData(address: address),
+                          size: 20,
+                          color: Colors.grey[700]!,
+                          fontWeight: FontWeight.w500,
+                          fontStyle: FontStyle.italic);
+                }
+              case 'Validated':
+                {
+                  return isOwner
+                      ? showText('memberValidated'.tr(), 18, true)
+                      : NameByAddress(
+                          wallet: WalletData(address: address),
+                          size: 20,
+                          color: Colors.black,
+                          fontWeight: FontWeight.w600,
+                          fontStyle: FontStyle.normal);
+                }
+              case 'expired':
+                {
+                  return showText('identityExpired'.tr());
+                }
+            }
+            return SizedBox(
+              child: showText('', 18, false, false),
+            );
+          });
+    });
+  }
+
+  AnimatedFadeOutIn showText(String text,
+      [double size = 18, bool bold = false, bool smooth = true]) {
+    // log.d('$address $text');
+    return AnimatedFadeOutIn<String>(
+      data: text,
+      duration: Duration(milliseconds: smooth ? 200 : 0),
+      builder: (value) => Text(
+        value,
+        textAlign: TextAlign.center,
+        style: TextStyle(
+            fontSize: size,
+            color: bold ? color : Colors.black,
+            fontWeight: bold ? FontWeight.w500 : FontWeight.w400),
+      ),
+    );
+  }
+}

lib/widgets/name_by_address.dart

@@ -0,0 +1,97 @@
+import 'package:flutter/material.dart';
+import 'package:gecko/globals.dart';
+import 'package:gecko/models/g1_wallets_list.dart';
+import 'package:gecko/models/queries_indexer.dart';
+import 'package:gecko/models/wallet_data.dart';
+import 'package:gecko/providers/duniter_indexer.dart';
+import 'package:gecko/widgets/wallet_name.dart';
+import 'package:graphql_flutter/graphql_flutter.dart';
+import 'package:provider/provider.dart';
+import 'package:truncate/truncate.dart';
+
+class NameByAddress extends StatelessWidget {
+  const NameByAddress(
+      {Key? key,
+      required this.wallet,
+      this.size = 20,
+      this.color = Colors.black,
+      this.fontWeight = FontWeight.w400,
+      this.fontStyle = FontStyle.italic})
+      : super(key: key);
+  final WalletData wallet;
+  final Color color;
+  final double size;
+  final FontWeight fontWeight;
+  final FontStyle fontStyle;
+
+  @override
+  Widget build(BuildContext context) {
+    final duniterIndexer = Provider.of<DuniterIndexer>(context, listen: false);
+
+    if (indexerEndpoint == '') {
+      return WalletName(wallet: wallet, size: size, color: color);
+    }
+
+    final httpLink = HttpLink(
+      '$indexerEndpoint/v1/graphql',
+    );
+
+    final client = ValueNotifier(
+      GraphQLClient(
+        cache: GraphQLCache(store: HiveStore()),
+        link: httpLink,
+      ),
+    );
+    return GraphQLProvider(
+      client: client,
+      child: Query(
+          options: QueryOptions(
+            document: gql(
+                getNameByAddressQ), // this is the query string you just created
+            variables: {
+              'address': wallet.address,
+            },
+            // pollInterval: const Duration(seconds: 10),
+          ),
+          builder: (QueryResult result,
+              {VoidCallback? refetch, FetchMore? fetchMore}) {
+            if (result.hasException) {
+              return Text(result.exception.toString());
+            }
+
+            if (result.isLoading) {
+              return const Text('Loading');
+            }
+
+            duniterIndexer.walletNameIndexer[wallet.address] =
+                result.data?['account_by_pk']?['identity']?['name'];
+
+            g1WalletsBox.put(
+                wallet.address,
+                G1WalletsList(
+                    address: wallet.address,
+                    username:
+                        duniterIndexer.walletNameIndexer[wallet.address]));
+
+            // log.d(g1WalletsBox.toMap().values.first.username);
+
+            if (duniterIndexer.walletNameIndexer[wallet.address] == null) {
+              return WalletName(wallet: wallet, size: size, color: color);
+            }
+
+            return Text(
+              color == Colors.grey[700]!
+                  ? '(${duniterIndexer.walletNameIndexer[wallet.address]!})'
+                  : truncate(
+                      duniterIndexer.walletNameIndexer[wallet.address]!, 20),
+              style: TextStyle(
+                fontSize: size,
+                color: color,
+                fontWeight: fontWeight,
+                fontStyle: fontStyle,
+              ),
+            );
+          }),
+    );
+  }
+}

lib/widgets/page_route_no_transition.dart

@@ -0,0 +1,8 @@
+import 'package:flutter/material.dart';
+
+class PageNoTransit extends MaterialPageRoute {
+  PageNoTransit({builder}) : super(builder: builder);
+
+  @override
+  Duration get transitionDuration => const Duration(milliseconds: 0);
+}

lib/widgets/template.dart

@@ -0,0 +1,18 @@
+import 'package:flutter/material.dart';
+import 'package:gecko/providers/substrate_sdk.dart';
+import 'package:provider/provider.dart';
+
+class TemplateWidget extends StatelessWidget {
+  const TemplateWidget(
+      {Key? key, required this.address, this.color = Colors.black})
+      : super(key: key);
+  final String address;
+  final Color color;
+
+  @override
+  Widget build(BuildContext context) {
+    return Consumer<SubstrateSdk>(builder: (context, sub, _) {
+      return const Text('Hello Widget');
+    });
+  }
+}

lib/widgets/ud_unit_display.dart

@@ -0,0 +1,45 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:gecko/globals.dart';
+
+class UdUnitDisplay extends StatelessWidget {
+  const UdUnitDisplay({
+    Key? key,
+    required this.size,
+    required this.color,
+  }) : super(key: key);
+
+  final double size;
+  final Color color;
+
+  @override
+  Widget build(BuildContext context) {
+    final bool isUdUnit = configBox.get('isUdUnit') ?? false;
+    return isUdUnit
+        ? Row(
+            mainAxisAlignment: MainAxisAlignment.end,
+            children: [
+              Text(
+                'ud'.tr(args: ['']),
+                style: TextStyle(
+                    fontSize: isTall ? size : size * 0.9, color: color),
+              ),
+              Column(
+                children: [
+                  Text(
+                    currencyName,
+                    style: TextStyle(
+                        fontSize: (isTall ? size : size * 0.9) * 0.7,
+                        fontWeight: FontWeight.w500,
+                        color: color),
+                  ),
+                  const SizedBox(height: 15)
+                ],
+              )
+            ],
+          )
+        : Text(currencyName,
+            style:
+                TextStyle(fontSize: isTall ? size : size * 0.9, color: color));
+  }
+}

lib/widgets/wallet_name.dart

@@ -0,0 +1,36 @@
+import 'package:flutter/material.dart';
+import 'package:gecko/globals.dart';
+import 'package:gecko/models/wallet_data.dart';
+import 'package:truncate/truncate.dart';
+
+class WalletName extends StatelessWidget {
+  const WalletName(
+      {Key? key,
+      required this.wallet,
+      this.size = 20,
+      this.color = Colors.black})
+      : super(key: key);
+  final WalletData wallet;
+  final double size;
+  final Color color;
+
+  @override
+  Widget build(BuildContext context) {
+    double newSize = (wallet.name?.length ?? 0) <= 15 ? size : size - 2;
+
+    return Row(mainAxisAlignment: MainAxisAlignment.center, children: <Widget>[
+      Text(
+        truncate(wallet.name ?? '', 20),
+        textAlign: TextAlign.center,
+        style: TextStyle(
+          fontSize: isTall ? newSize : newSize * 0.9,
+          color: color,
+          fontWeight: FontWeight.w400,
+          fontStyle: FontStyle.italic,
+        ),
+        softWrap: false,
+        overflow: TextOverflow.ellipsis,
+      ),
+    ]);
+  }
+}

pubspec.lock

@@ -8,6 +8,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "50.0.0"
+  accordion:
+    dependency: "direct main"
+    description:
+      name: accordion
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.5.1"
   analyzer:
     dependency: transitive
     description:
@@ -50,13 +57,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.9.0"
-  auth_header:
-    dependency: transitive
-    description:
-      name: auth_header
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.1"
   barcode:
     dependency: transitive
     description:
@@ -71,6 +71,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "4.2.1"
+  bip32:
+    dependency: transitive
+    description:
+      name: bip32
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
   bip32_ed25519:
     dependency: transitive
     description:
@@ -78,6 +85,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.2"
+  bip39:
+    dependency: transitive
+    description:
+      name: bip39
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.6"
   bip39_multi_nullsafety:
     dependency: transitive
     description:
@@ -92,6 +106,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.0"
+  bs58check:
+    dependency: transitive
+    description:
+      name: bs58check
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.2"
   bubble:
     dependency: "direct main"
     description:
@@ -203,21 +224,7 @@ packages:
       name: connectivity_plus
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "2.3.9"
+    version: "3.0.2"
-  connectivity_plus_linux:
-    dependency: transitive
-    description:
-      name: connectivity_plus_linux
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.3.1"
-  connectivity_plus_macos:
-    dependency: transitive
-    description:
-      name: connectivity_plus_macos
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.6"
   connectivity_plus_platform_interface:
     dependency: transitive
     description:
@@ -225,20 +232,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.2.3"
-  connectivity_plus_web:
-    dependency: transitive
-    description:
-      name: connectivity_plus_web
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.5"
-  connectivity_plus_windows:
-    dependency: transitive
-    description:
-      name: connectivity_plus_windows
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.2.2"
   convert:
     dependency: transitive
     description:
@@ -273,7 +266,7 @@ packages:
       name: dart_code_metrics
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.0.1"
+    version: "5.1.0"
   dart_style:
     dependency: transitive
     description:
@@ -288,6 +281,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.7.8"
+  decimal:
+    dependency: transitive
+    description:
+      name: decimal
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.3.2"
   dio:
     dependency: "direct main"
     description:
@@ -323,6 +323,20 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.0.2"
+  eip55:
+    dependency: transitive
+    description:
+      name: eip55
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.2"
+  ethers:
+    dependency: transitive
+    description:
+      name: ethers
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "0.0.1+3"
   fake_async:
     dependency: transitive
     description:
@@ -331,7 +345,7 @@ packages:
     source: hosted
     version: "1.3.1"
   fast_base58:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: fast_base58
       url: "https://pub.dartlang.org"
@@ -395,7 +409,7 @@ packages:
       name: flutter_inappwebview
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.3.2"
+    version: "5.7.2+2"
   flutter_lints:
     dependency: "direct main"
     description:
@@ -422,6 +436,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.7"
+  flutter_svg:
+    dependency: "direct main"
+    description:
+      name: flutter_svg
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.1.6"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -515,19 +536,19 @@ packages:
     source: hosted
     version: "0.2.2+1"
   graphql:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: graphql
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.1.2-beta.5"
+    version: "5.1.2-beta.6"
   graphql_flutter:
     dependency: "direct main"
     description:
       name: graphql_flutter
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "5.1.1-beta.4"
+    version: "5.1.1-beta.5"
   graphs:
     dependency: transitive
     description:
@@ -556,6 +577,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.1.0"
+  hive_generator:
+    dependency: "direct main"
+    description:
+      name: hive_generator
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.0"
   html:
     dependency: transitive
     description:
@@ -584,13 +612,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "4.0.2"
-  http_server:
-    dependency: transitive
-    description:
-      name: http_server
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "1.0.0"
   icons_launcher:
     dependency: "direct dev"
     description:
@@ -680,27 +701,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.3"
-  jaguar:
-    dependency: transitive
-    description:
-      name: jaguar
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.1.3"
-  jaguar_common:
-    dependency: transitive
-    description:
-      name: jaguar_common
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.0"
-  jaguar_flutter_asset:
-    dependency: transitive
-    description:
-      name: jaguar_flutter_asset
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.0"
   jdenticon_dart:
     dependency: "direct main"
     description:
@@ -722,6 +722,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "4.7.0"
+  json_rpc_2:
+    dependency: transitive
+    description:
+      name: json_rpc_2
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.2"
   lints:
     dependency: transitive
     description:
@@ -777,7 +784,7 @@ packages:
       name: mime
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.2"
+    version: "1.0.3"
   mobx:
     dependency: transitive
     description:
@@ -834,6 +841,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.8.2"
+  path_drawing:
+    dependency: transitive
+    description:
+      name: path_drawing
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.1"
   path_parsing:
     dependency: transitive
     description:
@@ -890,13 +904,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.1.3"
-  path_tree:
-    dependency: transitive
-    description:
-      name: path_tree
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.0"
   pdf:
     dependency: "direct main"
     description:
@@ -954,7 +961,7 @@ packages:
     source: hosted
     version: "7.4.0"
   pinenacl:
-    dependency: transitive
+    dependency: "direct main"
     description:
       name: pinenacl
       url: "https://pub.dartlang.org"
@@ -985,11 +992,11 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: gecko-unwrapbytes
+      ref: d45eb8d787d625331e6425df5cec9c5d33b30d35
-      resolved-ref: b019cc2a6e77b6989f94b1bef8259298410cd82a
+      resolved-ref: d45eb8d787d625331e6425df5cec9c5d33b30d35
       url: "https://github.com/poka-IT/sdk.git"
     source: git
-    version: "0.4.8"
+    version: "0.5.0"
   pool:
     dependency: transitive
     description:
@@ -1062,6 +1069,13 @@ packages:
       url: "https://github.com/insinfo/qr.flutter.git"
     source: git
     version: "4.0.0"
+  rational:
+    dependency: transitive
+    description:
+      name: rational
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.2.2"
   responsive_framework:
     dependency: "direct main"
     description:
@@ -1076,20 +1090,34 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.27.7"
+  scroll_to_index:
+    dependency: transitive
+    description:
+      name: scroll_to_index
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.1"
+  sec:
+    dependency: transitive
+    description:
+      name: sec
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.0.1"
   sentry:
     dependency: transitive
     description:
       name: sentry
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.16.1"
+    version: "6.18.0"
   sentry_flutter:
     dependency: "direct main"
     description:
       name: sentry_flutter
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "6.16.1"
+    version: "6.18.0"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -1165,6 +1193,20 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.99"
+  source_gen:
+    dependency: transitive
+    description:
+      name: source_gen
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.2.6"
+  source_helper:
+    dependency: transitive
+    description:
+      name: source_helper
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "1.3.3"
   source_span:
     dependency: transitive
     description:
@@ -1256,6 +1298,62 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "0.2.0"
+  url_launcher:
+    dependency: transitive
+    description:
+      name: url_launcher
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "6.1.7"
+  url_launcher_android:
+    dependency: transitive
+    description:
+      name: url_launcher_android
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "6.0.22"
+  url_launcher_ios:
+    dependency: transitive
+    description:
+      name: url_launcher_ios
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "6.0.17"
+  url_launcher_linux:
+    dependency: transitive
+    description:
+      name: url_launcher_linux
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.1"
+  url_launcher_macos:
+    dependency: transitive
+    description:
+      name: url_launcher_macos
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.1"
+  url_launcher_platform_interface:
+    dependency: transitive
+    description:
+      name: url_launcher_platform_interface
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.1.1"
+  url_launcher_web:
+    dependency: transitive
+    description:
+      name: url_launcher_web
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.0.13"
+  url_launcher_windows:
+    dependency: transitive
+    description:
+      name: url_launcher_windows
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "3.0.1"
   uuid:
     dependency: transitive
     description:
@@ -1284,6 +1382,13 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "1.0.2"
+  web3dart:
+    dependency: transitive
+    description:
+      name: web3dart
+      url: "https://pub.dartlang.org"
+    source: hosted
+    version: "2.5.1"
   web_socket_channel:
     dependency: transitive
     description:

pubspec.yaml

@@ -5,7 +5,7 @@ description: Pay with G1.
 # pub.dev using `pub publish`. This is preferred for private packages.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-version: 0.0.12+33
+version: 0.0.15+47
 
 environment:
   sdk: '>=2.12.0 <3.0.0'
@@ -18,16 +18,16 @@ dependencies:
   bubble: ^1.2.1
   carousel_slider: ^4.0.0
   flutter_lints: ^2.0.1
-  graphql_flutter: ^5.1.1-beta.3
+  graphql_flutter: ^5.1.1-beta.4
   hive_flutter: ^1.1.0
   image_picker: ^0.8.4
   jdenticon_dart: ^2.0.0
   logger: ^1.1.0
-  path_provider: ^2.0.9
+  path_provider: ^2.0.11
   pdf: ^3.7.1
   permission_handler: ^10.0.0
-  pin_code_fields: ^7.3.0
+  pin_code_fields: ^7.4.0
-  printing: ^5.9.1
+  printing: ^5.9.3
   provider: ^6.0.1
   barcode_scan2: ^4.2.1
   qr_flutter: #^4.0.0
@@ -35,7 +35,7 @@ dependencies:
       url: https://github.com/insinfo/qr.flutter.git
       ref: master
   responsive_framework: ^0.2.0
-  sentry_flutter: ^6.5.1
+  sentry_flutter: ^6.18.0
   shared_preferences: ^2.0.7
   truncate: ^3.0.1
   unorm_dart: ^0.2.0
@@ -48,15 +48,22 @@ dependencies:
       # ref: develop
       url: https://github.com/poka-IT/sdk.git
       # ref: gecko-old
-      ref: gecko-unwrapbytes
+      # ref: ec61ebab45287315fa1d7e84830a01d6e23891ae
+      ref: d45eb8d787d625331e6425df5cec9c5d33b30d35
   dots_indicator: ^2.1.0
-  connectivity_plus: ^2.3.3
+  connectivity_plus: ^3.0.2
   image_cropper: ^3.0.0
   easy_localization: ^3.0.1
   flutter_markdown: ^0.6.10+2
   pointycastle: ^3.6.1
   hex: ^0.2.0
   flutter_dotenv: ^5.0.2
+  accordion: ^2.5.1
+  flutter_svg: ^1.1.6
+  pinenacl: ^0.3.3
+  fast_base58: ^0.2.1
+  graphql: ^5.1.1
+  hive_generator: ^2.0.0
 
 dev_dependencies:
   # flutter_launcher_icons: ^0.9.2