Merge branch 'develop' into 'master'

Develop

See merge request papers/airgap/airgap-wallet!714

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

@@ -25,7 +25,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()

e2e/src/app.e2e-spec.ts

@@ -79,14 +79,6 @@ describe('AirGap Wallet', () => {
     await page.takeScreenshot('scan')
   })
 
-  it('should open exchange page', async () => {
-    await page.clickDismissButton()
-
-    await page.clickExchangeTab()
-
-    await page.takeScreenshot('exchange')
-  })
-
   it('should open settings page', async () => {
     await page.clickDismissButton()
 

e2e/src/pages/app.po.ts

@@ -15,10 +15,6 @@ export class AppPage extends PageObjectBase {
     return this.clickButton('#tab-button-scan')
   }
 
-  public async clickExchangeTab(): Promise<void> {
-    return this.clickButton('#tab-button-exchange')
-  }
-
   public async clickSettingsTab(): Promise<void> {
     return this.clickButton('#tab-button-settings')
   }

package.json

@@ -54,28 +54,28 @@
     }
   },
   "dependencies": {
-    "@airgap/aeternity": "0.13.20",
+    "@airgap/aeternity": "0.13.21",
     "@airgap/angular-core": "0.0.42",
     "@airgap/angular-ngrx": "0.0.42",
-    "@airgap/astar": "0.13.20",
+    "@airgap/astar": "0.13.21",
     "@airgap/beacon-sdk": "3.1.5-beta.0",
-    "@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/bitcoin": "0.13.21",
+    "@airgap/coinlib-core": "0.13.21",
+    "@airgap/coreum": "0.13.21",
+    "@airgap/cosmos": "0.13.21",
+    "@airgap/cosmos-core": "0.13.21",
+    "@airgap/crypto": "0.13.21",
+    "@airgap/ethereum": "0.13.21",
+    "@airgap/groestlcoin": "0.13.21",
+    "@airgap/icp": "0.13.21",
+    "@airgap/module-kit": "0.13.21",
+    "@airgap/moonbeam": "0.13.21",
+    "@airgap/optimism": "0.13.21",
+    "@airgap/polkadot": "0.13.21",
     "@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.21",
+    "@airgap/substrate": "0.13.21",
+    "@airgap/tezos": "0.13.21",
     "@airgap-community/iso-rootstock": "1.0.0",
     "@angular/animations": "^16.1.1",
     "@angular/common": "^16.1.1",

src/app/app-routing.module.ts

@@ -138,14 +138,6 @@ const routes: Routes = [
     canActivate: [ServiceKeyGuard],
     loadChildren: () => import('./pages/scan-address/scan-address.module').then((m) => m.ScanAddressPageModule)
   },
-  {
-    path: 'exchange-confirm/:id',
-    resolve: {
-      special: DataResolverService
-    },
-    canActivate: [ServiceKeyGuard],
-    loadChildren: () => import('./pages/exchange-confirm/exchange-confirm.module').then((m) => m.ExchangeConfirmPageModule)
-  },
   {
     path: 'transaction-confirm/:id',
     resolve: {
@@ -174,14 +166,6 @@ const routes: Routes = [
     canActivate: [ServiceKeyGuard],
     loadChildren: () => import('./pages/delegation-list/delegation-list.module').then((m) => m.DelegationListPageModule)
   },
-  {
-    path: 'exchange-select',
-    loadChildren: () => import('./pages/exchange-select/exchange-select.module').then((m) => m.ExchangeSelectPageModule)
-  },
-  {
-    path: 'exchange-custom',
-    loadChildren: () => import('./pages/exchange-custom/exchange-custom.module').then((m) => m.ExchangeCustomPageModule)
-  },
   {
     path: 'ledger-sign/:id',
     resolve: {

src/app/app.component.html

@@ -17,10 +17,6 @@
               <ion-icon slot="start" name="barcode-outline"></ion-icon>
               <ion-label>{{ 'tabs.scan' | translate }}</ion-label>
             </ion-item>
-            <ion-item routerLink="tabs/exchange" routerLinkActive="active-link">
-              <ion-icon slot="start" name="repeat-outline"></ion-icon>
-              <ion-label>{{ 'tabs.exchange' | translate }}</ion-label>
-            </ion-item>
             <ion-item routerLink="tabs/settings" routerLinkActive="active-link">
               <ion-icon slot="start" name="settings-outline"></ion-icon>
               <ion-label>{{ 'tabs.settings' | translate }}</ion-label>

src/app/app.module.ts

@@ -51,7 +51,6 @@ import { Diagnostic } from '@ionic-native/diagnostic/ngx'
 import { IonicModule, IonicRouteStrategy, Platform } from '@ionic/angular'
 import { Drivers } from '@ionic/storage'
 import { IonicStorageModule } from '@ionic/storage-angular'
-import { EffectsModule } from '@ngrx/effects'
 import { StoreModule } from '@ngrx/store'
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core'
 import { ZXingScannerModule } from '@zxing/ngx-scanner'
@@ -72,8 +71,6 @@ import {
 import { ComponentsModule } from './components/components.module'
 import { appConfig } from './config/app-config'
 import { BeaconRequestPageModule } from './pages/beacon-request/beacon-request.module'
-import { ExchangeSelectPageModule } from './pages/exchange-select/exchange-select.module'
-import { ExchangeEffects } from './pages/exchange/effects'
 import { IntroductionPushPageModule } from './pages/introduction-push/introduction-push.module'
 import { IsolatedModulesOnboardingPageModule } from './pages/isolated-modules-onboarding/isolated-modules-onboarding.module'
 import { ProtocolSelectPageModule } from './pages/protocol-select/protocol-select.module'
@@ -83,7 +80,6 @@ import { AccountProvider } from './services/account/account.provider'
 import { ThemeService } from './services/appearance/theme.service'
 import { CoinlibService } from './services/coinlib/coinlib.service'
 import { WalletEnvironmentService } from './services/environment/wallet-environment.service'
-import { ExchangeProvider } from './services/exchange/exchange'
 import { ExtensionsService } from './services/extensions/extensions.service'
 import { ProtocolGuard } from './services/guard/protocol.guard'
 import { ServiceKeyGuard } from './services/guard/serviceKey.guard'
@@ -130,7 +126,6 @@ export function createTranslateLoader(http: HttpClient): AirGapTranslateLoader {
         strictActionImmutability: false
       }
     }),
-    EffectsModule.forRoot([ExchangeEffects]),
     ZXingScannerModule,
     MomentModule,
     IonicModule.forRoot(),
@@ -151,7 +146,6 @@ export function createTranslateLoader(http: HttpClient): AirGapTranslateLoader {
     ComponentsModule,
     ProtocolSelectPageModule,
     BeaconRequestPageModule,
-    ExchangeSelectPageModule,
     IntroductionPushPageModule,
     IsolatedModulesOnboardingPageModule
   ],
@@ -187,7 +181,6 @@ export function createTranslateLoader(http: HttpClient): AirGapTranslateLoader {
     DeeplinkService,
     OperationsProvider,
     ExtensionsService,
-    ExchangeProvider,
     CoinlibService,
     PushProvider,
     PushBackendProvider,

src/app/app.reducers.ts

@@ -2,7 +2,6 @@ import { InjectionToken } from '@angular/core'
 import { ActionReducer, ActionReducerMap, MetaReducer } from '@ngrx/store'
 import { environment } from 'src/environments/environment'
 import * as fromApp from '../app/app.reducer'
-import * as fromExchange from '../app/pages/exchange/reducer'
 
 export interface State {
   app: fromApp.State
@@ -27,7 +26,6 @@ export const metaReducers: MetaReducer<State>[] = !environment.production ? [log
 
 export const ROOT_REDUCERS = new InjectionToken<ActionReducerMap<State>>('Root reducers token', {
   factory: () => ({
-    app: fromApp.reducer,
-    exchange: fromExchange.reducer
+    app: fromApp.reducer
   })
 })

src/app/components/components.module.ts

@@ -18,16 +18,13 @@ import { DappPeerComponent } from './dapp-peer/dapp-peer.component'
 import { DelegateActionPopoverComponent } from './delegate-action-popover/delegate-action-popover.component'
 import { DelegateEditPopoverComponent } from './delegate-edit-popover/delegate-edit-popover.component'
 import { EmptyStateComponent } from './empty-state/empty-state'
-import { ExchangeSelectionComponent } from './exchange-selection/exchange-selection.component'
 import { FeeComponent } from './fee/fee.component'
 import { FromToComponent } from './from-to/from-to.component'
 import { InteractionSelectionComponent } from './interaction-selection/interaction-selection.component'
 import { OptimismERC20Form } from './optimism-erc20-form/optimism-erc20-form.component'
 import { PermissionRequestComponent } from './permission-request/permission-request.component'
 import { PortfolioItemComponent } from './portfolio-item/portfolio-item'
-import { RemoveLiquidityComponent } from './remove-liquidity/remove-liquidity.component'
 import { SignedTransactionComponent } from './signed-transaction/signed-transaction'
-import { SwapComponent } from './swap/swap'
 import { TezosDelegationCard } from './tezos-delegation-card/tezos-delegation-card'
 import { TezosFAForm } from './tezos-fa-form/tezos-fa-form.component'
 import { TezosSaplingContractForm } from './tezos-sapling-contract-form/tezos-sapling-contract-form.component'
@@ -53,7 +50,6 @@ import { FlipCardBackComponent } from './flip-card/flip-card-back'
 @NgModule({
   declarations: [
     PortfolioItemComponent,
-    SwapComponent,
     AccountEditPopoverComponent,
     AmountComponent,
     CardActionableComponent,
@@ -86,8 +82,6 @@ import { FlipCardBackComponent } from './flip-card/flip-card-back'
     WidgetInputText,
     WidgetRewardList,
     WidgetOptionButtonGroup,
-    RemoveLiquidityComponent,
-    ExchangeSelectionComponent,
     MtPelerinComponent,
     FlipCardComponent,
     FlipCardFrontComponent,
@@ -110,7 +104,6 @@ import { FlipCardBackComponent } from './flip-card/flip-card-back'
   exports: [
     PortfolioItemComponent,
     AmountComponent,
-    SwapComponent,
     AccountEditPopoverComponent,
     CardActionableComponent,
     EmptyStateComponent,
@@ -141,8 +134,6 @@ import { FlipCardBackComponent } from './flip-card/flip-card-back'
     WidgetInputText,
     WidgetRewardList,
     WidgetOptionButtonGroup,
-    RemoveLiquidityComponent,
-    ExchangeSelectionComponent,
     MtPelerinComponent,
     FlipCardComponent,
     FlipCardFrontComponent,

src/app/components/mt-pelerin/mt-pelerin.component.html

@@ -18,6 +18,9 @@ <h5>{{ 'account-transaction-list.mtpelerin.header' | translate }}</h5>
     <p>
       {{ 'account-transaction-list.mtpelerin.note_description' | translate }}
     </p>
+    <span>
+      <a (click)="navigate('https://developers.mtpelerin.com/service-information/supported-countries')">{{ 'mtpelerin.noteLink1' | translate }}</a>, <a (click)="navigate('https://www.mtpelerin.com/terms-conditions')">{{ 'mtpelerin.noteLink2' | translate }}</a>
+    </span>
   </ion-row>
 
   <ion-fab vertical="bottom" horizontal="end" slot="fixed">

src/app/components/mt-pelerin/mt-pelerin.component.ts

@@ -22,4 +22,8 @@ export class MtPelerinComponent {
       this.dismiss()
     }
   }
+
+  public navigate(path: string) {
+    window.open(path, '_blank')
+  }
 }