rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

chore: copy and style improvements

Browse Source
This commit is contained in:
Mo
2023-05-03 08:41:25 -05:00
parent 4aad554c1a
commit 44e91b5ede
24 changed files with 47 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/web/src/javascripts/Event/ApplicationEventObserver.spec.ts
View File

@@ -27,7 +27,7 @@ import { PurchaseFlowController } from '@/Controllers/PurchaseFlow/PurchaseFlowC
import { SyncStatusController } from '@/Controllers/SyncStatusController'
import { AccountMenuPane } from '@/Components/AccountMenu/AccountMenuPane'
import { ApplicationEventObserver } from './ApplicationEventObserver'
import { ApplicationEventObserver, JoinWorkspaceSuccessString } from './ApplicationEventObserver'
import { WebApplication } from '@/Application/Application'
describe('ApplicationEventObserver', () => {
@@ -169,10 +169,7 @@ describe('ApplicationEventObserver', () => {
await createObserver().handle(ApplicationEvent.Launched)
expect(subscriptionManager.acceptInvitation).toHaveBeenCalledWith('1-2-3')
expect(toastService.showToast).toHaveBeenCalledWith(
ToastType.Success,
'Successfully joined a shared subscription',
)
expect(toastService.showToast).toHaveBeenCalledWith(ToastType.Success, JoinWorkspaceSuccessString)
expect(routeService.removeQueryParameterFromURL).toHaveBeenCalledWith(RootQueryParam.AcceptSubscriptionInvite)
})
@@ -278,10 +275,7 @@ describe('ApplicationEventObserver', () => {
await createObserver().handle(ApplicationEvent.SignedIn)
expect(subscriptionManager.acceptInvitation).toHaveBeenCalledWith('1-2-3')
expect(toastService.showToast).toHaveBeenCalledWith(
ToastType.Success,
'Successfully joined a shared subscription',
)
expect(toastService.showToast).toHaveBeenCalledWith(ToastType.Success, JoinWorkspaceSuccessString)
expect(routeService.removeQueryParameterFromURL).toHaveBeenCalledWith(RootQueryParam.AcceptSubscriptionInvite)
})

5
packages/web/src/javascripts/Event/ApplicationEventObserver.ts
View File

@@ -23,6 +23,9 @@ import { AccountMenuPane } from '@/Components/AccountMenu/AccountMenuPane'
import { EventObserverInterface } from './EventObserverInterface'
import { WebApplication } from '@/Application/Application'
export const JoinWorkspaceSuccessString =
'Successfully joined a shared subscription. You may have to sign out and back in for changes to take effect.'
export class ApplicationEventObserver implements EventObserverInterface {
constructor(
private application: WebApplication,
@@ -129,7 +132,7 @@ export class ApplicationEventObserver implements EventObserverInterface {
this.toastService.hideToast(processingToastId)
const toastType = acceptResult.success ? ToastType.Success : ToastType.Error
const toastMessage = acceptResult.success ? 'Successfully joined a shared subscription' : acceptResult.message
const toastMessage = acceptResult.success ? JoinWorkspaceSuccessString : acceptResult.message
this.toastService.showToast(toastType, toastMessage)