Skip to content

Commit

Permalink
Merge branch 'remove-exchanges-page' into 'develop'
Browse files Browse the repository at this point in the history
removal of exchanges

See merge request papers/airgap/airgap-wallet!712
  • Loading branch information
godenzim committed Oct 9, 2023
2 parents 0cc41f7 + c807609 commit bdf3ddf
Show file tree
Hide file tree
Showing 58 changed files with 6 additions and 7,311 deletions.
8 changes: 0 additions & 8 deletions e2e/src/app.e2e-spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
4 changes: 0 additions & 4 deletions e2e/src/pages/app.po.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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')
}
Expand Down
16 changes: 0 additions & 16 deletions src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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: {
Expand Down Expand Up @@ -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: {
Expand Down
4 changes: 0 additions & 4 deletions src/app/app.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
7 changes: 0 additions & 7 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -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'
Expand All @@ -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'
Expand Down Expand Up @@ -130,7 +126,6 @@ export function createTranslateLoader(http: HttpClient): AirGapTranslateLoader {
strictActionImmutability: false
}
}),
EffectsModule.forRoot([ExchangeEffects]),
ZXingScannerModule,
MomentModule,
IonicModule.forRoot(),
Expand All @@ -151,7 +146,6 @@ export function createTranslateLoader(http: HttpClient): AirGapTranslateLoader {
ComponentsModule,
ProtocolSelectPageModule,
BeaconRequestPageModule,
ExchangeSelectPageModule,
IntroductionPushPageModule,
IsolatedModulesOnboardingPageModule
],
Expand Down Expand Up @@ -187,7 +181,6 @@ export function createTranslateLoader(http: HttpClient): AirGapTranslateLoader {
DeeplinkService,
OperationsProvider,
ExtensionsService,
ExchangeProvider,
CoinlibService,
PushProvider,
PushBackendProvider,
Expand Down
4 changes: 1 addition & 3 deletions src/app/app.reducers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
})
})
9 changes: 0 additions & 9 deletions src/app/components/components.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand All @@ -53,7 +50,6 @@ import { FlipCardBackComponent } from './flip-card/flip-card-back'
@NgModule({
declarations: [
PortfolioItemComponent,
SwapComponent,
AccountEditPopoverComponent,
AmountComponent,
CardActionableComponent,
Expand Down Expand Up @@ -86,8 +82,6 @@ import { FlipCardBackComponent } from './flip-card/flip-card-back'
WidgetInputText,
WidgetRewardList,
WidgetOptionButtonGroup,
RemoveLiquidityComponent,
ExchangeSelectionComponent,
MtPelerinComponent,
FlipCardComponent,
FlipCardFrontComponent,
Expand All @@ -110,7 +104,6 @@ import { FlipCardBackComponent } from './flip-card/flip-card-back'
exports: [
PortfolioItemComponent,
AmountComponent,
SwapComponent,
AccountEditPopoverComponent,
CardActionableComponent,
EmptyStateComponent,
Expand Down Expand Up @@ -141,8 +134,6 @@ import { FlipCardBackComponent } from './flip-card/flip-card-back'
WidgetInputText,
WidgetRewardList,
WidgetOptionButtonGroup,
RemoveLiquidityComponent,
ExchangeSelectionComponent,
MtPelerinComponent,
FlipCardComponent,
FlipCardFrontComponent,
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit bdf3ddf

Please sign in to comment.