Skip to content

Commit

Permalink
Revert "Release v2.2.3 - to stage (#1426)"
Browse files Browse the repository at this point in the history
This reverts commit 3f9b66f.
  • Loading branch information
patryk-sierzega committed Oct 10, 2023
1 parent 3f9b66f commit a956279
Show file tree
Hide file tree
Showing 68 changed files with 579 additions and 826 deletions.
1 change: 0 additions & 1 deletion .github/auto_assign.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ reviewers:
- patryk-sierzega
- OskarMichalkiewicz
- dkarski
- codestorybro

# A list of keywords to be skipped the process that add reviewers if pull requests include it
skipKeywords:
Expand Down
11 changes: 0 additions & 11 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
Here we write upgrading notes for brands. It's a team effort to make them as
straightforward as possible.

## [2.2.3] - 2023-05-10

### Fixed

- Fixed issue with breaking connection when deleting large number of contacts
- Improved search results preview when searching for contact in Contacts tab and Messages tab
- Added normalization of news' texts
- Fixed issues with creating device backup and changing device
- Fixed Mudita Center not stopping files upload after disconnecting the device
- Added possibility to stop file upload if user selected more files than can be uploaded to Mudita Harmony

## [2.2.2] - 2023-09-28

### Changed
Expand Down
4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@
"dist:dev:all": "npm run app:dist:dev:all --",
"dist:prod": "npm run app:dist:prod --",
"dist:prod:all": "npm run app:dist:prod:all --",
"translations:sync": "npm run app:translations:sync --",
"APP COMMANDS": "=========================================================",
"app:dist:dev": "lerna run --scope @mudita/mudita-center-app dist:dev",
"app:dist:prod": "lerna run --scope @mudita/mudita-center-app dist:prod",
"app:dist:dev:all": "lerna run --scope @mudita/mudita-center-app dist:dev:all",
"app:dist:prod:all": "lerna run --scope @mudita/mudita-center-app dist:prod:all",
"APP COMMANDS": "=========================================================",
"app:develop": "lerna run --scope @mudita/mudita-center-app develop",
"app:lint": "lerna run --scope @mudita/mudita-center-app lint",
"app:lint:typecheck": "lerna run --scope @mudita/mudita-center-app lint:typecheck",
Expand All @@ -35,7 +34,6 @@
"app:storybook:serve": "lerna run --scope @mudita/mudita-center-app storybook:serve",
"app:storybook:build": "lerna run --scope @mudita/mudita-center-app storybook:build",
"app:electron:rebuild-serialport": "lerna run --scope @mudita/mudita-center-app electron:rebuild-serialport --",
"app:translations:sync": "lerna run --scope @mudita/mudita-center-app translations:sync --",
"E2E TEST COMMANDS": "========================================================",
"test:e2e": "lerna run --scope @mudita/mudita-center-e2e test --"
},
Expand Down
10 changes: 10 additions & 0 deletions packages/app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions packages/app/src/__deprecated__/main/utils/github-instance.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
/**
* Copyright (c) Mudita sp. z o.o. All rights reserved.
* For licensing, see https://github.com/mudita/mudita-center/blob/master/LICENSE.md
*/

import axios from "axios"

// It's required only for development when API rate limits may exceed
// https://docs.github.com/en/rest/overview/resources-in-the-rest-api#rate-limiting
const githubToken = process.env.OS_UPDATE_SERVER_ACCESS_TOKEN

export const githubInstance = axios.create({
headers: {
...(githubToken ? { Authorization: `token ${githubToken}` } : {}),
},
})
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@
"component.updateDownloadedModalDescription": "Do you want to update app now or during next launch?",
"component.updateDownloadedModalMessage": "Update is ready to install",
"component.updateDownloadedModalWarning": "Note that update process will require app {osxPlatform, select, false {restart} true {quit}}.\nMake sure you saved all data you're currently working on.",
"component.updateErrorModalDescription": "Please restart the app or update it manually.",
"component.updateErrorModalDescription": "Please download the latest Mudita Center version from {link}",
"component.updateErrorModalMessage": "Error",
"component.updateForcedModalButton": "Download",
"component.updateForcedModalCurrentVersion": "Your current version: v.{version}",
Expand Down Expand Up @@ -333,7 +333,7 @@
"module.contacts.firstName": "First name",
"module.contacts.forwardNamecard": "Forward namecard",
"module.contacts.forwardTooltipDescription": "Forward namecard",
"module.contacts.googleButtonText": "Log in to Google",
"module.contacts.googleButtonText": "Continue with Google",
"module.contacts.ice": "ICE",
"module.contacts.iceContact": "ICE contact",
"module.contacts.importBody": "Select the contacts you want to save on your Pure",
Expand All @@ -356,7 +356,7 @@
"module.contacts.information": "Information",
"module.contacts.listFavourites": "Favorites",
"module.contacts.listUnnamedContact": "No name",
"module.contacts.manualImportText": "Import vCard",
"module.contacts.manualImportText": "Import from vcf file",
"module.contacts.newContactCallLabel": "Add contact",
"module.contacts.newTitle": "New contact",
"module.contacts.noAddress": "No address",
Expand All @@ -366,7 +366,7 @@
"module.contacts.noNotes": "No notes",
"module.contacts.noPhoneNumber": "No phone number",
"module.contacts.notes": "Note",
"module.contacts.outlookButtonText": "Log in to Outlook",
"module.contacts.outlookButtonText": "continue with outlook",
"module.contacts.panelManageButton": "Manage",
"module.contacts.panelNewContactButton": "New contact",
"module.contacts.panelSearchListNoData": "No data provided",
Expand Down Expand Up @@ -428,7 +428,7 @@
"module.filesManager.pendingUploadModalAbortButtonText": "Abort",
"module.filesManager.pendingUploadModalActionButton": "Ok",
"module.filesManager.pendingUploadModalHeader": "Files uploading",
"module.filesManager.pendingUploadModalTextDetailsInfo": "The first {count, plural, one {file} other {# files}} will be uploaded to the device.",
"module.filesManager.pendingUploadModalTextDetailsInfo": "The file limit has almost been reached. You can upload only {count} {count, plural, one {file} other {files}}",
"module.filesManager.pendingUploadModalTextInfo": "Mudita Center cannot load all files.\nThe number of selected files exceeds the limit.",
"module.filesManager.pendingUploadModalTitle": "Upload files",
"module.filesManager.selectionNumber": "{num, plural, =-1 {All Files} one {# File} other {# Files}} selected",
Expand Down Expand Up @@ -916,4 +916,4 @@
"module.tools.notesTemporaryText": "New Note",
"module.tools.notesUnsavedNote": "unsaved",
"module.tools.voiceRecorder": "Voice Recorder"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import {
ModalContentWithoutMargin,
RoundIconWrapper,
ModalMainText,
ModalLink,
} from "App/ui/components/modal-dialog"
import { Size } from "App/__deprecated__/renderer/components/core/button/button.config"
import { AppUpdateStepModalTestIds } from "App/__deprecated__/renderer/wrappers/app-update-step-modal/app-update-step-modal-test-ids.enum"
Expand All @@ -31,6 +30,7 @@ import { useDispatch } from "react-redux"
import { togglePrivacyPolicyAccepted } from "App/settings/actions"
import { Dispatch } from "../../store"
import styled from "styled-components"
import { fontWeight, textColor } from "../../styles/theming/theme-getters"
import { BrowserActions } from "App/__deprecated__/common/enums/browser-actions.enum"

export interface AppUpdateAvailableProps {
Expand Down Expand Up @@ -95,8 +95,13 @@ const messages = defineMessages({
const PrivacyPolicyCheckboxWrapper = styled.div`
display: flex;
`
const StyledLink = styled(ModalLink)`

const StyledLink = styled.a`
text-decoration: underline;
cursor: pointer;
font-size: 1.4rem;
font-weight: ${fontWeight("default")};
color: ${textColor("action")};
`

const AppUpdateModal: FunctionComponent<ComponentProps<typeof ModalDialog>> = ({
Expand Down Expand Up @@ -246,7 +251,9 @@ export const AppUpdateError: FunctionComponent<
message={{
...messages.errorUpdateDescription,
values: {
link: <ModalLink onClick={openMuditaWebPage}>mudita.com</ModalLink>,
link: (
<StyledLink onClick={openMuditaWebPage}>mudita.com</StyledLink>
),
},
}}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,10 @@ const onPhoneNumberSelect = jest.fn()
const onContactSelect = jest.fn()
const onClose = jest.fn()

beforeAll(() => {
mockAllIsIntersecting(true)
})

describe("Functionality: open/close", () => {
test("Modal is closed when `open` field is equal to `false`", () => {
const { queryByTestId } = render({
Expand Down Expand Up @@ -272,8 +276,6 @@ describe("Functionality: contacts list", () => {
withPhoneNumberOnly: false,
})

mockAllIsIntersecting(true)

// AUTO DISABLED - fix me if you like :)
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
const contactListProps = contactSimpleListSpy.mock
Expand All @@ -282,6 +284,31 @@ describe("Functionality: contacts list", () => {
expect(contactListProps.contacts.flat().length).toEqual(5)
expect(contactListProps.contacts.flat()).toMatchInlineSnapshot(`
Array [
Object {
"email": "[email protected]",
"firstAddressLine": "4929 Pine Garden Lane",
"firstName": "John",
"id": "1",
"lastName": "Doe",
"note": "",
"primaryPhoneNumber": "123 456 789",
"secondAddressLine": "Atlanta, GA, 30339, USA",
"secondaryPhoneNumber": "32 123 44 55",
},
Object {
"blocked": false,
"email": "[email protected]",
"favourite": false,
"firstAddressLine": "Malczewskiego 3, Warszawa",
"firstName": "Sławomir",
"ice": false,
"id": "2",
"lastName": "Borewicz",
"note": "sapiente rem dignissimos sunt",
"primaryPhoneNumber": "+71 195 069 214",
"secondAddressLine": "",
"secondaryPhoneNumber": "",
},
Object {
"blocked": false,
"email": "",
Expand Down Expand Up @@ -310,31 +337,6 @@ describe("Functionality: contacts list", () => {
"secondAddressLine": "",
"secondaryPhoneNumber": "",
},
Object {
"blocked": false,
"email": "[email protected]",
"favourite": false,
"firstAddressLine": "Malczewskiego 3, Warszawa",
"firstName": "Sławomir",
"ice": false,
"id": "2",
"lastName": "Borewicz",
"note": "sapiente rem dignissimos sunt",
"primaryPhoneNumber": "+71 195 069 214",
"secondAddressLine": "",
"secondaryPhoneNumber": "",
},
Object {
"email": "[email protected]",
"firstAddressLine": "4929 Pine Garden Lane",
"firstName": "John",
"id": "1",
"lastName": "Doe",
"note": "",
"primaryPhoneNumber": "123 456 789",
"secondAddressLine": "Atlanta, GA, 30339, USA",
"secondaryPhoneNumber": "32 123 44 55",
},
Object {
"blocked": false,
"email": "",
Expand Down Expand Up @@ -374,6 +376,31 @@ describe("Functionality: contacts list", () => {
expect(contactListProps.contacts.flat().length).toEqual(4)
expect(contactListProps.contacts.flat()).toMatchInlineSnapshot(`
Array [
Object {
"email": "[email protected]",
"firstAddressLine": "4929 Pine Garden Lane",
"firstName": "John",
"id": "1",
"lastName": "Doe",
"note": "",
"primaryPhoneNumber": "123 456 789",
"secondAddressLine": "Atlanta, GA, 30339, USA",
"secondaryPhoneNumber": "32 123 44 55",
},
Object {
"blocked": false,
"email": "[email protected]",
"favourite": false,
"firstAddressLine": "Malczewskiego 3, Warszawa",
"firstName": "Sławomir",
"ice": false,
"id": "2",
"lastName": "Borewicz",
"note": "sapiente rem dignissimos sunt",
"primaryPhoneNumber": "+71 195 069 214",
"secondAddressLine": "",
"secondaryPhoneNumber": "",
},
Object {
"blocked": false,
"email": "",
Expand Down Expand Up @@ -402,31 +429,6 @@ describe("Functionality: contacts list", () => {
"secondAddressLine": "",
"secondaryPhoneNumber": "",
},
Object {
"blocked": false,
"email": "[email protected]",
"favourite": false,
"firstAddressLine": "Malczewskiego 3, Warszawa",
"firstName": "Sławomir",
"ice": false,
"id": "2",
"lastName": "Borewicz",
"note": "sapiente rem dignissimos sunt",
"primaryPhoneNumber": "+71 195 069 214",
"secondAddressLine": "",
"secondaryPhoneNumber": "",
},
Object {
"email": "[email protected]",
"firstAddressLine": "4929 Pine Garden Lane",
"firstName": "John",
"id": "1",
"lastName": "Doe",
"note": "",
"primaryPhoneNumber": "123 456 789",
"secondAddressLine": "Atlanta, GA, 30339, USA",
"secondaryPhoneNumber": "32 123 44 55",
},
]
`)
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { ContactInputSearch } from "App/contacts/components/contact-input-search
import { ContactSimpleList } from "App/contacts/components/contact-simple-list"
import { ContactsSelectModalProps } from "App/contacts/components/contacts-select-modal/contacts-select-modal.interface"
import { Contact } from "App/contacts/dto"
import { contactsFilter } from "App/contacts/helpers/contacts-filter/contacts-filter.helper"
import {
contactHashSelector,
favouriteContactHashSelector,
Expand All @@ -17,8 +18,6 @@ import { FunctionComponent } from "App/__deprecated__/renderer/types/function-co
import { noop } from "App/__deprecated__/renderer/utils/noop"
import React, { useEffect, useState } from "react"
import { useSelector } from "react-redux"
import { filterContacts } from "App/contacts/helpers/filter-contacts/filter-contacts"
import { sortByLastNameAscending } from "App/utils/sort-by-last-name-ascending"

export const ContactSelectModal: FunctionComponent<
ContactsSelectModalProps
Expand All @@ -40,7 +39,7 @@ export const ContactSelectModal: FunctionComponent<

useEffect(() => {
setResults(
filterContacts(contacts.flat().sort(sortByLastNameAscending), searchQuery)
contacts.flat().filter((item) => contactsFilter(item, searchQuery || ""))
)
// AUTO DISABLED - fix me if you like :)
// eslint-disable-next-line react-hooks/exhaustive-deps
Expand Down
Loading

0 comments on commit a956279

Please sign in to comment.