Merge branch 'develop' into 'master'

Develop

See merge request papers/airgap/airgap-vault!486

android/app/src/main/java/it/airgap/vault/plugin/isolatedmodules/js/environment/JavaScriptEngineEnvironment.kt

@@ -24,7 +24,7 @@ class JavaScriptEngineEnvironment(
     private val context: Context,
     private val fileExplorer: FileExplorer,
 ) : JSEnvironment {
-    private val sandbox: Deferred<JavaScriptSandbox> = JavaScriptSandbox.createConnectedInstanceAsync(context).asDeferred()
+    private val sandbox: Deferred<JavaScriptSandbox> by lazy { JavaScriptSandbox.createConnectedInstanceAsync(context).asDeferred() }
 
     private val isolatedMutex: Mutex = Mutex()
     private val isolates: MutableMap<String, JavaScriptIsolateRegistry> = mutableMapOf()

package.json

@@ -36,47 +36,47 @@
     "apply-diagnostic-modules": "node apply-diagnostic-modules.js"
   },
   "resolutions": {
-    "@airgap/aeternity": "0.13.20",
-    "@airgap/astar": "0.13.20",
-    "@airgap/bitcoin": "0.13.20",
-    "@airgap/coinlib-core": "0.13.20",
-    "@airgap/coreum": "0.13.20",
-    "@airgap/cosmos": "0.13.20",
-    "@airgap/cosmos-core": "0.13.20",
-    "@airgap/crypto": "0.13.20",
-    "@airgap/ethereum": "0.13.20",
-    "@airgap/groestlcoin": "0.13.20",
-    "@airgap/icp": "0.13.20",
-    "@airgap/module-kit": "0.13.20",
-    "@airgap/moonbeam": "0.13.20",
-    "@airgap/optimism": "0.13.20",
-    "@airgap/polkadot": "0.13.20",
-    "@airgap/serializer": "0.13.20",
-    "@airgap/substrate": "0.13.20",
-    "@airgap/tezos": "0.13.20"
+    "@airgap/aeternity": "0.13.22",
+    "@airgap/astar": "0.13.22",
+    "@airgap/bitcoin": "0.13.22",
+    "@airgap/coinlib-core": "0.13.22",
+    "@airgap/coreum": "0.13.22",
+    "@airgap/cosmos": "0.13.22",
+    "@airgap/cosmos-core": "0.13.22",
+    "@airgap/crypto": "0.13.22",
+    "@airgap/ethereum": "0.13.22",
+    "@airgap/groestlcoin": "0.13.22",
+    "@airgap/icp": "0.13.22",
+    "@airgap/module-kit": "0.13.22",
+    "@airgap/moonbeam": "0.13.22",
+    "@airgap/optimism": "0.13.22",
+    "@airgap/polkadot": "0.13.22",
+    "@airgap/serializer": "0.13.22",
+    "@airgap/substrate": "0.13.22",
+    "@airgap/tezos": "0.13.22"
   },
   "dependencies": {
-    "@airgap/aeternity": "0.13.20",
-    "@airgap/angular-core": "0.0.42",
-    "@airgap/angular-ngrx": "0.0.42",
-    "@airgap/astar": "0.13.20",
-    "@airgap/bitcoin": "0.13.20",
-    "@airgap/coinlib-core": "0.13.20",
-    "@airgap/coreum": "0.13.20",
-    "@airgap/cosmos": "0.13.20",
-    "@airgap/cosmos-core": "0.13.20",
-    "@airgap/crypto": "0.13.20",
-    "@airgap/ethereum": "0.13.20",
-    "@airgap/groestlcoin": "0.13.20",
-    "@airgap/icp": "0.13.20",
-    "@airgap/module-kit": "0.13.20",
-    "@airgap/moonbeam": "0.13.20",
-    "@airgap/optimism": "0.13.20",
-    "@airgap/polkadot": "0.13.20",
+    "@airgap/aeternity": "0.13.22",
+    "@airgap/angular-core": "0.0.43",
+    "@airgap/angular-ngrx": "0.0.43",
+    "@airgap/astar": "0.13.22",
+    "@airgap/bitcoin": "0.13.22",
+    "@airgap/coinlib-core": "0.13.22",
+    "@airgap/coreum": "0.13.22",
+    "@airgap/cosmos": "0.13.22",
+    "@airgap/cosmos-core": "0.13.22",
+    "@airgap/crypto": "0.13.22",
+    "@airgap/ethereum": "0.13.22",
+    "@airgap/groestlcoin": "0.13.22",
+    "@airgap/icp": "0.13.22",
+    "@airgap/module-kit": "0.13.22",
+    "@airgap/moonbeam": "0.13.22",
+    "@airgap/optimism": "0.13.22",
+    "@airgap/polkadot": "0.13.22",
     "@airgap/sapling-wasm": "0.0.7",
-    "@airgap/serializer": "0.13.20",
-    "@airgap/substrate": "0.13.20",
-    "@airgap/tezos": "0.13.20",
+    "@airgap/serializer": "0.13.22",
+    "@airgap/substrate": "0.13.22",
+    "@airgap/tezos": "0.13.22",
     "@airgap-community/iso-rootstock": "1.0.0",
     "@angular/cdk": "^14.2.7",
     "@angular/common": "16.1.1",

src/app/app.module.ts

@@ -110,7 +110,7 @@ export function createTranslateLoader(http: HttpClient): AirGapTranslateLoader {
       }
     }),
     EffectsModule.forRoot(),
-    IonicModule.forRoot(),
+    IonicModule.forRoot({ innerHTMLTemplatesEnabled: true }),
     AppRoutingModule,
     HttpClientModule,
     TranslateModule.forRoot({

src/app/components/secret-option-item/secret-option-item.component.html

@@ -14,6 +14,7 @@
       class="ion-no-margin"
       [ngModel]="checkboxValue"
       [disabled]="!enabled"
+      (ionChange)="doAction()"
     ></ion-checkbox>
   </ion-item>
 

src/app/pages/account-address/account-address.page.ts

@@ -20,7 +20,7 @@ import { AccountEditPopoverComponent } from './account-edit-popover/account-edit
 
 // TODO: add wallet definition into a service
 export const airgapwallet = {
-  icon: 'airgap-wallet-app-logo.png',
+  icon: 'airgap-wallet-app-logo.svg',
   name: 'AirGap Wallet',
   qrType: QRType.V3
 }
@@ -49,6 +49,12 @@ const metamask = {
   qrType: QRType.METAMASK
 }
 
+const imtoken = {
+  icon: 'imtoken-wallet.svg',
+  name: 'imToken',
+  qrType: QRType.METAMASK
+}
+
 const rabby = {
   icon: 'rabby-wallet.svg',
   name: 'Rabby',
@@ -132,7 +138,7 @@ export class AccountAddressPage {
         case MainProtocolSymbols.OPTIMISM:
           this.syncOptions = [airgapwallet]
           if (this.wallet.isExtendedPublicKey) {
-            this.syncOptions.push(metamask, rabby)
+            this.syncOptions.push(metamask, imtoken, rabby)
           } else {
             this.showMetaMaskMigrationOnboarding = true
           }

src/app/pages/secret-show/secret-show.page.ts

@@ -85,17 +85,7 @@ export class SecretShowPage {
 
           const alert: HTMLIonAlertElement = await this.alertController.create({
             header: title,
-            message: [
-              heading,
-              '<br/>',
-              text,
-              '<br/>',
-              waitLabelP1,
-              '<strong>',
-              SHOW_SECRET_MIN_TIME_IN_SECONDS.toString(),
-              waitLabelP2,
-              '</strong>'
-            ].join(''),
+            message: `${heading} <br/> ${text} <br/> ${waitLabelP1} <strong>${SHOW_SECRET_MIN_TIME_IN_SECONDS.toString()}${waitLabelP2}</strong>`,
             buttons: ['Okay']
           })
           alert.present().catch(handleErrorLocal(ErrorCategory.IONIC_ALERT))

src/assets/i18n/en.json

@@ -671,7 +671,7 @@
   },
   "bip85-show": {
     "title": "Show BIP85 Details",
-    "text": "Write down all the words on a piece of paper. You will have to verify the mnemonic on the next page.",
+    "text": "Please write down the mnemonic length and index, this information will be necessary for restoring this child wallet.",
     "mnemonic-length": "Mnemonic Length",
     "index": "Index",
     "fingerprint": "Fingerprint",