Skip to content

Commit cc01656

Browse files
authored
Merge pull request #2178 from oasisprotocol/lw/rm-monitor
Remove Oasis Monitor leftovers
2 parents 15a4583 + 0a6bdd9 commit cc01656

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+8
-6280
lines changed

.changelog/2178.internal.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Remove Oasis Monitor leftovers

.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,6 @@ Procfile text
202202

203203

204204
# Auto-generated files
205-
src/vendors/explorer/*/** linguist-generated=true
206205
src/vendors/oasisscan-v2/*/** linguist-generated=true
207206
src/vendors/nexus/*/** linguist-generated=true
208207
src/vendors/nexus/dump_validators.json linguist-generated=true

.vscode/settings.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,6 @@
2525
"build/": true,
2626
"build-ext/": true,
2727
"build-dev/": true,
28-
"src/vendors/explorer/apis": true,
29-
"src/vendors/explorer/models": true,
30-
"src/vendors/explorer/.openapi-generator": true,
31-
"src/vendors/explorer/.openapi-generator-ignore": true,
32-
"src/vendors/explorer/runtime.ts": true,
33-
"src/vendors/explorer/index.ts": true,
3428
"src/vendors/oasisscan-v2/apis": true,
3529
"src/vendors/oasisscan-v2/models": true,
3630
"src/vendors/oasisscan-v2/.openapi-generator": true,

src/app/components/ErrorFormatter/index.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ export function ErrorFormatter(props: Props) {
2020
const message = props.message
2121

2222
const backendToLabel = {
23-
[BackendAPIs.OasisMonitor]: t('backends.oasismonitor', 'Oasis Monitor API'),
2423
[BackendAPIs.OasisScanV2]: t('backends.oasisscanV2', 'Oasis Scan API v2'),
2524
[BackendAPIs.Nexus]: t('backends.nexus', 'Nexus API'),
2625
}

src/app/components/Footer/index.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ export const Footer = memo(() => {
2525
const { t } = useTranslation()
2626

2727
const backendToLabel = {
28-
[BackendAPIs.OasisMonitor]: t('footer.poweredBy.oasismonitor', 'Oasis Monitor API & Oasis gRPC'),
2928
[BackendAPIs.OasisScanV2]: t('footer.poweredBy.oasisscanV2', 'Oasis Scan API v2 & Oasis gRPC'),
3029
[BackendAPIs.Nexus]: t('footer.poweredBy.nexus', 'Nexus API & Oasis gRPC'),
3130
}

src/app/components/Transaction/__tests__/index.test.tsx

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -149,24 +149,6 @@ describe('<Transaction />', () => {
149149
)
150150
})
151151

152-
it('should render monitor link', () => {
153-
jest.mocked(backend).mockImplementation(() => BackendAPIs.OasisMonitor)
154-
renderComponent(store, ref, transaction, network)
155-
expect(screen.getByTestId('explorer-link')).toHaveAttribute(
156-
'href',
157-
'https://oasismonitor.com/operation/ff1234',
158-
)
159-
})
160-
161-
it('should render testnet monitor link', () => {
162-
jest.mocked(backend).mockImplementation(() => BackendAPIs.OasisMonitor)
163-
renderComponent(store, ref, transaction, 'testnet')
164-
expect(screen.getByTestId('explorer-link')).toHaveAttribute(
165-
'href',
166-
'https://testnet.oasismonitor.com/operation/ff1234',
167-
)
168-
})
169-
170152
it('should render paratime transaction row', () => {
171153
const runtimeId = '123'
172154

src/app/pages/AccountPage/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ export function AccountPage() {
4646
)
4747
const balance: BalanceDetails = {
4848
available: account.available,
49-
delegations: balanceDelegations?.toString() ?? null, //@TODO oasis-explorer : account.debonding_delegations_balance ?? 0,
50-
debonding: balanceDebondingDelegations?.toString() ?? null, //@TODO oasis-explorer : account.delegations_balance ?? 0,
49+
delegations: balanceDelegations?.toString() ?? null, //@TODO nexus : account.debonding_delegations_balance ?? 0,
50+
debonding: balanceDebondingDelegations?.toString() ?? null, //@TODO nexus : account.delegations_balance ?? 0,
5151
total:
5252
account.available == null || balanceDelegations == null || balanceDebondingDelegations == null
5353
? null

src/app/pages/E2EPage/E2EWindow.d.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import * as monitor from 'vendors/monitor'
21
import * as oasisscanV2 from 'vendors/oasisscan-v2'
32
import * as nexus from 'vendors/nexus'
43
import * as oasis from '@oasisprotocol/client'
@@ -9,7 +8,6 @@ import { Store } from '@reduxjs/toolkit'
98
import { RootState } from '../../../types'
109

1110
interface _E2EWindow extends Window {
12-
monitor: typeof monitor
1311
oasisscanV2: typeof oasisscanV2
1412
nexus: typeof nexus
1513
oasis: typeof oasis

src/app/pages/E2EPage/index.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import { TextArea } from 'grommet/es6/components/TextArea'
66
import { TextInput } from 'grommet/es6/components/TextInput'
77
import React, { useEffect } from 'react'
88
import { useNavigate } from 'react-router-dom'
9-
import * as monitor from 'vendors/monitor'
109
import * as oasisscanV2 from 'vendors/oasisscan-v2'
1110
import * as nexus from 'vendors/nexus'
1211
import * as oasis from '@oasisprotocol/client'
@@ -40,7 +39,6 @@ declare const window: E2EWindow
4039
function ExposeInternals() {
4140
const store = useStore()
4241
useEffect(() => {
43-
window.monitor = monitor
4442
window.oasisscanV2 = oasisscanV2
4543
window.nexus = nexus
4644
window.oasis = oasis

src/app/state/account/types.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ import { NetworkType } from '../network/types'
55

66
export interface BalanceDetails {
77
available: StringifiedBigInt | null
8-
/** This is delayed in getAccount by 20 seconds on oasisscan and 5 seconds on oasismonitor. */
8+
/** This is delayed in getAccount by 20 seconds on oasisscan and unknown on nexus. */
99
debonding: StringifiedBigInt | null
10-
/** This is delayed in getAccount by 20 seconds on oasisscan and 5 seconds on oasismonitor. */
10+
/** This is delayed in getAccount by 20 seconds on oasisscan and unknown on nexus. */
1111
delegations: StringifiedBigInt | null
12-
/** This is delayed in getAccount by 20 seconds on oasisscan and 5 seconds on oasismonitor. */
12+
/** This is delayed in getAccount by 20 seconds on oasisscan and unknown on nexus. */
1313
total: StringifiedBigInt | null
1414
nonce: StringifiedBigInt
1515
}

0 commit comments

Comments
 (0)