Skip to content
Projects
Groups
Snippets
Help
Sign in / Register
Toggle navigation
Minds Frontend
Project overview
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Locked Files
Issues
403
Merge Requests
67
CI / CD
Security & Compliance
Packages
Analytics
Wiki
Snippets
Members
Collapse sidebar
Close sidebar
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Minds
Minds Frontend
Commits
5d993dc3
Commit
5d993dc3
authored
36 minutes ago
by
Olivia Madrid
Browse files
Options
Download
resolve merge conflict duplicat identifier
parent
0b7b9f3e
epic/wallet-80
1 merge request
!686
WIP: Epic/wallet 80
Pipeline
#119098420
failed with stages
in 12 minutes and 13 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
1 deletion
+2
-1
src/app/common/services/configs.service.ts
View file @
5d993dc3
import
{
Client
}
from
'
../api/client.service
'
;
import
{
Injectable
,
Inject
}
from
'
@angular/core
'
;
import
{
Subject
}
from
'
rxjs
'
;
import
{
Injectable
,
Inject
,
Optional
,
Injector
}
from
'
@angular/core
'
;
import
{
RedirectService
}
from
'
./redirect.service
'
;
...
...
This diff is collapsed.
src/app/modules/wallet/v2/wallet-v2.module.ts
View file @
5d993dc3
...
...
@@ -31,6 +31,7 @@ import { TransactionOverlayService } from '../../blockchain/transaction-overlay/
import
{
ConfigsService
}
from
'
../../../common/services/configs.service
'
;
import
{
TokenContractService
}
from
'
../../blockchain/contracts/token-contract.service
'
;
import
{
WithdrawContractService
}
from
'
../../blockchain/contracts/withdraw-contract.service
'
;
import
{
AnalyticsModule
}
from
'
../../analytics/analytics.module
'
;
//////////////////////////////////////////////////
// TODO add a wildcard and the parameter routes as children once feature-flag is lifted
...
...
@@ -72,6 +73,7 @@ export const WALLET_V2_ROUTES: Routes = [
ReactiveFormsModule
,
CommonModule
,
RouterModule
,
AnalyticsModule
,
],
declarations
:
[
WalletDashboardComponent
,
...
...
This diff is collapsed.
Please
register
or
sign in
to comment