Merge branch 'dev' into test

solve conflicts, version 1.0.4

android/app/src/main/AndroidManifest.xml

@@ -4,6 +4,7 @@
     <application
         android:enableOnBackInvokedCallback="true"
         android:icon="@mipmap/ic_launcher"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:label="${appName}"
         android:usesCleartextTraffic="true">
         <activity

assets/abi/TokenRoot.abi.json

@@ -0,0 +1,18 @@
+{
+  "ABI version": 2,
+  "version": "2.2",
+  "header": ["pubkey", "time", "expire"],
+  "functions": [
+    {
+      "name": "walletOf",
+      "inputs": [
+        { "name": "answerId", "type": "uint32" },
+        { "name": "walletOwner", "type": "address" }
+      ],
+      "outputs": [{ "name": "value0", "type": "address" }]
+    }
+  ],
+  "data": [],
+  "events": [],
+  "fields": []
+}

assets/abi/TokenWallet.abi.json

@@ -0,0 +1,15 @@
+{
+  "ABI version": 2,
+  "version": "2.2",
+  "header": ["pubkey", "time", "expire"],
+  "functions": [
+    {
+      "name": "balance",
+      "inputs": [{ "name": "answerId", "type": "uint32" }],
+      "outputs": [{ "name": "value0", "type": "uint128" }]
+    }
+  ],
+  "data": [],
+  "events": [],
+  "fields": []
+}

assets/translations/en.json

@@ -250,7 +250,8 @@
   "walletWord": "Wallet",
   "browserWord": "Browser",
   "profileWord": "Profile",
-  "manageAssets": "Manage assets",
+  "manageAssets": "Manage manually",
+  "orWord": "or",
   "searchWord": "Search",
   "customToken": "Custom token",
   "enterAssetName": "Enter asset name",
@@ -383,6 +384,7 @@
   "addAssetTitle": "Add TIP3 token",
   "versionWord": "Version",
   "venom": "Venom",
+  "tychoTestnet": "Tycho Testnet",
   "symbolWord": "Symbol",
   "decimalsWord": "Decimals",
   "ownerAddress": "Owner address",
@@ -541,14 +543,14 @@
   "manualBackupTitleDialog": "Manual backup",
   "manualBackupSubtitleDialog": "Save your secret recovery phrase in a secure place that only you control.",
   "createNewAccount": "Create new account",
-  "addExternalAccount": "Add an external account",
+  "addExternalAccount": "Add an external account (soon)",
   "confirmAction": "Confirm action",
   "enterYourPassword": "Enter your password",
   "useFaceID": "Use Face ID",
   "useFingerprint": "Use Fingerprint",
   "accountName": "Account name",
   "defaultWord": "Default",
-  "multisignatureWord": "Multisignature",
+  "multisignatureWord": "Multi-Signature",
   "forExperiencedUsers": "For experienced users",
   "walletDescriptionSurfWallet": "Wallet contract used in Surf. Requires deployment.",
   "walletDescriptionWalletV3": "Small legacy contract with one custodian. Deploys automatically.",
@@ -579,22 +581,26 @@
   "newSeedPhraseSwitchSubtitle": "Make sure you save your seed phrase. You can start using it right now.",
   "newSeedPhraseSwitchButton": "Switch to this seed phrase",
   "txTreeSimulationErrorComputePhase": {
-    "0": "Execution failed on ",
+    "0": "Transaction tree execution may fail, because execution failed on ",
     "1": " with exit code {}."
   },
   "txTreeSimulationErrorActionPhase": {
-    "0": "Action phase failed on ",
+    "0": "Transaction tree execution may fail, because action phase failed on ",
     "1": " with exit code {}."
   },
   "txTreeSimulationErrorFrozen": {
-    "0": "Account ",
+    "0": "Transaction tree execution may fail, because account ",
     "1": " will be frozen due to storage fee debt."
   },
   "txTreeSimulationErrorDeleted": {
-    "0": "Account ",
+    "0": "Transaction tree execution may fail, because account ",
     "1": " will be deleted due to storage fee debt."
   },
-  "txTreeSimulationErrorHint": "Please contact technical support.",
+  "txTreeSimulationErrorHint": "Contact ",
+  "txTreeSimulationErrorHintCanFix": "Send 0.2 {} to this address or contact ",
+  "txTreeSimulationErrorSupportLink": "technical support",
+  "txTreeSimulationErrorSwitchLabel": "Send it anyway. I accept the risks.",
+  "txTreeSimulationErrorTitle": "Tokens may be lost!",
   "token": "Token",
   "changeNetwork": "Change network",
   "addNetwork": "Add network",
@@ -603,5 +609,17 @@
   "operationTimeout": "Operation timeout",
   "networkConfig": "Network config",
   "connectionData": "Connection data",
-  "changeAccountName": "Change account name"
+  "changeAccountName": "Change account name",
+  "refreshToFind": "Refresh to find",
+  "newTokensLabel": "{} news tokens",
+  "foundInThisAccountLabel": "found in this account.",
+  "dontSeeYourToken": "Don`t see your token?",
+  "emptyTokensDescriptionModal": "Sorry, we couldn’t find anything matching your request.",
+  "selectTokensLabel": "Select tokens",
+  "importSelectedTokensLabel": "Import selected tokens?",
+  "selectedTokensBeImportedInfo": "Only the tokens you’ve selected will appear in your wallet. You can always hide tokens later by searching for them.",
+  "backWord": "Back",
+  "selectAll": "Select all",
+  "hideAll": "Hide all",
+  "selectSeed": "Select seed"
 }

assets/translations/ko.json

@@ -250,7 +250,8 @@
   "walletWord": "Wallet",
   "browserWord": "Browser",
   "profileWord": "Profile",
-  "manageAssets": "Manage assets",
+  "manageAssets": "Manage manually",
+  "orWord": "or",
   "searchWord": "Search",
   "customToken": "Custom token",
   "enterAssetName": "Enter asset name",
@@ -383,6 +384,7 @@
   "addAssetTitle": "Add TIP3 token",
   "versionWord": "Version",
   "venom": "Venom",
+  "tychoTestnet": "Tycho Testnet",
   "symbolWord": "Symbol",
   "decimalsWord": "Decimals",
   "ownerAddress": "Owner address",
@@ -541,14 +543,14 @@
   "manualBackupTitleDialog": "Manual backup",
   "manualBackupSubtitleDialog": "Save your secret recovery phrase in a secure place that only you control.",
   "createNewAccount": "Create new account",
-  "addExternalAccount": "Add an external account",
+  "addExternalAccount": "Add an external account (soon)",
   "confirmAction": "Confirm action",
   "enterYourPassword": "Enter your password",
   "useFaceID": "Use Face ID",
   "useFingerprint": "Use Fingerprint",
   "accountName": "Account name",
   "defaultWord": "Default",
-  "multisignatureWord": "Multisignature",
+  "multisignatureWord": "Multi-Signature",
   "forExperiencedUsers": "For experienced users",
   "walletDescriptionSurfWallet": "Wallet contract used in Surf. Requires deployment.",
   "walletDescriptionWalletV3": "Small legacy contract with one custodian. Deploys automatically.",
@@ -579,22 +581,26 @@
   "newSeedPhraseSwitchSubtitle": "Make sure you save your seed phrase. You can start using it right now.",
   "newSeedPhraseSwitchButton": "Switch to this seed phrase",
   "txTreeSimulationErrorComputePhase": {
-    "0": "Execution failed on ",
+    "0": "Transaction tree execution may fail, because execution failed on ",
     "1": " with exit code {}."
   },
   "txTreeSimulationErrorActionPhase": {
-    "0": "Action phase failed on ",
+    "0": "Transaction tree execution may fail, because action phase failed on ",
     "1": " with exit code {}."
   },
   "txTreeSimulationErrorFrozen": {
-    "0": "Account ",
+    "0": "Transaction tree execution may fail, because account ",
     "1": " will be frozen due to storage fee debt."
   },
   "txTreeSimulationErrorDeleted": {
-    "0": "Account ",
+    "0": "Transaction tree execution may fail, because account ",
     "1": " will be deleted due to storage fee debt."
   },
-  "txTreeSimulationErrorHint": "Please contact technical support.",
+  "txTreeSimulationErrorHint": "Contact ",
+  "txTreeSimulationErrorHintCanFix": "Send 0.2 {} to this address or contact ",
+  "txTreeSimulationErrorSupportLink": "technical support",
+  "txTreeSimulationErrorSwitchLabel": "Send it anyway. I accept the risks.",
+  "txTreeSimulationErrorTitle": "Tokens may be lost!",
   "token": "Token",
   "changeNetwork": "Change network",
   "addNetwork": "Add network",
@@ -603,5 +609,17 @@
   "operationTimeout": "Operation timeout",
   "networkConfig": "Network config",
   "connectionData": "Connection data",
-  "changeAccountName": "Change account name"
+  "changeAccountName": "Change account name",
+  "refreshToFind": "Refresh to find",
+  "newTokensLabel": "{} news tokens",
+  "foundInThisAccountLabel": "found in this account.",
+  "dontSeeYourToken": "Don`t see your token?",
+  "emptyTokensDescriptionModal": "Sorry, we couldn’t find anything matching your request.",
+  "selectTokensLabel": "Select tokens",
+  "importSelectedTokensLabel": "Import selected tokens?",
+  "selectedTokensBeImportedInfo": "Only the tokens you’ve selected will appear in your wallet. You can always hide tokens later by searching for them.",
+  "backWord": "Back",
+  "selectAll": "Select all",
+  "hideAll": "Hide all",
+  "selectSeed": "Select seed"
 }

build.yaml

@@ -9,3 +9,25 @@ targets:
       json_serializable:
         options:
           explicit_to_json: true
+        generate_for:
+          - lib/app/service/*.dart
+          - lib/app/service/**/*.dart
+          - lib/data/**/*.dart
+          - lib/http/dto/*.dart
+      retrofit_generator:
+        generate_for:
+          - lib/http/api/*.dart
+      injectable_generator:injectable_builder:
+        generate_for:
+          - lib/di/*.dart
+          - lib/app/service/*.dart
+          - lib/app/service/**/*.dart
+          - lib/http/dio_module.dart
+          - lib/http/repository/*.dart
+      freezed:
+        generate_for:
+          - lib/app/service/dto/*.dart
+          - lib/data/**/*.dart
+          - lib/**/*_cubit.dart
+          - lib/**/*_bloc.dart
+          - lib/**/*_state.dart