diff --git a/src/back/services/notification.ts b/src/back/services/notification.ts index 05014e00c..87876f814 100644 --- a/src/back/services/notification.ts +++ b/src/back/services/notification.ts @@ -13,7 +13,7 @@ import { areValidAddresses } from '../utils/validations' import { CoauthorService } from './coauthor' -const PushAPI = NOTIFICATIONS_SERVICE_ENABLED ? require('@pushprotocol/restapi') : null +import PushAPI = require('@pushprotocol/restapi') const chainId = isProdEnv() ? ChainId.ETHEREUM_MAINNET : ChainId.ETHEREUM_GOERLI const PUSH_CHANNEL_OWNER_PK = process.env.PUSH_CHANNEL_OWNER_PK diff --git a/src/components/Banner/Banner.css b/src/components/Banner/Banner.css index 46f406d3f..f8a233927 100644 --- a/src/components/Banner/Banner.css +++ b/src/components/Banner/Banner.css @@ -35,7 +35,7 @@ right: 0; margin: 8px; background-color: #f1f6fe; - z-index: 10; + z-index: 8; } .Banner .Banner__Button { diff --git a/src/entities/Proposal/jobs.test.ts b/src/entities/Proposal/jobs.test.ts index d7f8f3741..5d0a6df48 100644 --- a/src/entities/Proposal/jobs.test.ts +++ b/src/entities/Proposal/jobs.test.ts @@ -38,6 +38,8 @@ jest.mock('../../constants', () => ({ NOTIFICATIONS_SERVICE_ENABLED: false, })) +jest.mock('@pushprotocol/restapi/src/index.js', () => jest.fn()) + describe('finishProposals', () => { beforeAll(() => { jest.spyOn(ProposalModel, 'finishProposal') diff --git a/src/entities/QuarterBudget/model.test.ts b/src/entities/QuarterBudget/model.test.ts index 8020fc30f..3a130236a 100644 --- a/src/entities/QuarterBudget/model.test.ts +++ b/src/entities/QuarterBudget/model.test.ts @@ -31,6 +31,8 @@ const VALID_QUARTER_BUDGET_2 = { updated_at: NOW, } +jest.mock('@pushprotocol/restapi/src/index.js', () => jest.fn()) + describe('QuarterBudgetModel', () => { describe('createNewBudgets', () => { beforeEach(() => { diff --git a/src/entities/QuarterBudget/utils.test.ts b/src/entities/QuarterBudget/utils.test.ts index b989947aa..cf028a7f6 100644 --- a/src/entities/QuarterBudget/utils.test.ts +++ b/src/entities/QuarterBudget/utils.test.ts @@ -30,6 +30,8 @@ const EXISTING_BUDGETS: QuarterBudgetAttributes[] = [ { ...TEST_DATA, start_at: QUARTER_2_START_DATE, finish_at: QUARTER_2_END_DATE }, ] +jest.mock('@pushprotocol/restapi/src/index.js', () => jest.fn()) + describe('thereAreNoOverlappingBudgets', () => { it('returns true when no budgets overlap with the given dates', () => { const startAt = Time(QUARTER_2_END_DATE).add(1, 'day').toDate() diff --git a/src/entities/QuarterCategoryBudget/utils.test.ts b/src/entities/QuarterCategoryBudget/utils.test.ts index 27f9881fa..a2f03d40b 100644 --- a/src/entities/QuarterCategoryBudget/utils.test.ts +++ b/src/entities/QuarterCategoryBudget/utils.test.ts @@ -6,6 +6,8 @@ import { NewGrantCategory } from '../Grant/types' import { getCategoryBudgetTotal, toNewGrantCategory, validateCategoryBudgets } from './utils' +jest.mock('@pushprotocol/restapi/src/index.js', () => jest.fn()) + describe('getCategoryBudgetTotal', () => { it('returns a percentage of the budget total', () => { expect(getCategoryBudgetTotal(10, 100)).toEqual(10) diff --git a/src/services/BudgetService.test.ts b/src/services/BudgetService.test.ts index 8a9ed24ce..387e2a45e 100644 --- a/src/services/BudgetService.test.ts +++ b/src/services/BudgetService.test.ts @@ -112,6 +112,8 @@ jest.mock('../constants', () => ({ NOTIFICATIONS_SERVICE_ENABLED: false, })) +jest.mock('@pushprotocol/restapi/src/index.js', () => jest.fn()) + describe('BudgetService', () => { describe('getTransparencyBudgets', () => { beforeAll(() => {