Merge branch 'develop' into update-orbitdb

CHANGELOG.md

@@ -8,6 +8,10 @@
 * Instantiates signature chain when creating communities and reloading application ([#2626](https://github.com/TryQuiet/quiet/issues/2626))
 * Added in LFA-ready invite links ([#2627](https://github.com/TryQuiet/quiet/issues/2627))
 
+### Fixes
+* Changed company name in app to "A Quiet LLC" ([#2642] (https://github.com/TryQuiet/quiet/issues/2642))
+* Fixed copyright statement in Electron app ([#2589] (https://github.com/TryQuiet/quiet/issues/2589))
+
 ## [2.3.2]
 
 ### Chores

PUBLISHING.md

@@ -75,15 +75,15 @@ Alpha releases are pre-release versions of the release which are delivered to QA
 1. Trigger a production release with `GH_TOKEN=<token> npm run publish --release=[patch|minor|major|<EXACT_VERSION>]` (e.g. to create a prerelease of a minor update `npm run publish --release=minor`) This should remove the `alpha.x` suffix, and create a release on the [Releases Page](https://github.com/TryQuiet/quiet/releases), and trigger Github Actions to deploy the release to the Google Play Store and App Store. If the semantic version is different from the alpha release, select no in the prompt to create new versions, and call the command again with the exact version.
 1. Manually update the release notes on the [Releases Page](https://github.com/TryQuiet/quiet/releases) with the changes included in the release. See [RELEASE_NOTES_GUIDE.md](RELEASE_NOTES_GUIDE.md) for guidance on writing release notes.
 1. Promote the release on the [Google Play Console](https://play.google.com/console/) to a production track.
-1. Promote the release on the [App Store Connect](https://appstoreconnect.apple.com/).
+1. Promote the release on the [App Store Connect](https://appstoreconnect.apple.com/). If the new version has Approved status on the ios console but users see "This beta isn't accepting any new testers right now." please follow those instructions: [Resolving error](https://help.playtestcloud.com/en/articles/6824982-resolving-the-this-beta-isn-t-accepting-any-new-testers-right-now-error).
 1. Checkout the `gh-pages` branch, and create a PR ([example](https://github.com/TryQuiet/quiet/pull/2605)) to update the download links on the [Quiet website](https://tryquiet.org/#Downloads) to point to the new release.
 
 ## Post-release checklist (production)
 
 - [ ] Release build completed successfully and the assets are uploaded to the release page
 - [ ] Download links are updated on website
 - [ ] App is promoted and sent for review on a production track in Google Play
-- [ ] App is promoted and sent for review on an external track in App Store (Test Flight)
+- [ ] App is promoted and sent for review on an external track in App Store (Test Flight) **Note:** this is a separate step *after* the builds become visible in TestFlight!! 
 - [ ] Issues in `Ready for QA` are moved to `Done`
 
 ## QA

packages/desktop/package.json

@@ -2,8 +2,8 @@
   "name": "@quiet/desktop",
   "productName": "Quiet",
   "author": {
-    "name": "Zbay LLC",
-    "email": "h@zbay.llc"
+    "name": "Quiet LLC",
+    "email": "h@quiet.chat"
   },
   "license": "GPL-3.0-or-later",
   "build": {

packages/desktop/snap/snapcraft.yaml

@@ -1,4 +1,4 @@
-name: zbay # you probably want to 'snapcraft register <name>'
+name: quiet # you probably want to 'snapcraft register <name>'
 base: core # the base snap is the execution environment for this snap
 version: git # just for humans, typically '1.2+git' or '1.3.2'
 summary: Single-line elevator pitch for your amazing snap # 79 char long summary

packages/desktop/src/renderer/components/ui/OpenlinkModal/OpenlinkModal.test.tsx

@@ -7,7 +7,7 @@ describe('OpenlinkModal', () => {
   it('renders component', () => {
     const result = renderComponent(
       <OpenlinkModal
-        url='https://www.zbay.app/'
+        url='https://tryquiet.org/'
         open
         isImage
         handleClose={jest.fn()}
@@ -173,7 +173,7 @@ describe('OpenlinkModal', () => {
                               <span
                                 class="OpenlinkModalbold"
                               >
-                                www.zbay.app
+                                www.tryquiet.org
                               </span>
                               - I trust them with my data and I'm not using Quiet for anonymity protection. 
                             </div>
@@ -215,7 +215,7 @@ describe('OpenlinkModal', () => {
                               <span
                                 class="OpenlinkModalbold"
                               >
-                                www.zbay.app
+                                www.tryquiet.org
                               </span>
                                
                               again, but don't auto-load images.
@@ -281,7 +281,7 @@ describe('OpenlinkModal', () => {
                                 href=""
                                 style="color: rgb(103, 191, 211); text-decoration: none; word-break: break-all;"
                               >
-                                Load image from site www.zbay.app
+                                Load image from site www.tryquiet.org
                               </a>
                             </div>
                           </div>

packages/desktop/src/renderer/components/ui/OpenlinkModal/OpenlinkModal.tsx

@@ -93,7 +93,7 @@ export const OpenlinkModal: React.FC<OpenLinkModalProps> = ({
   open,
   handleClose,
   handleConfirm,
-  url = 'https://www.zbay.app/',
+  url = 'https://tryquiet.org/',
   addToWhitelist,
   setWhitelistAll,
   isImage = false,

packages/desktop/src/renderer/components/widgets/Settings/About.tsx

@@ -34,7 +34,7 @@ export const About: FC = () => {
           <Typography variant='body2'>
             Version: {version}
             <br />
-            Copyright © {new Date().getFullYear()} Zbay LLC
+            Copyright © {new Date().getFullYear()} Quiet LLC and other contributors
           </Typography>
         </Grid>
       </Grid>

packages/mobile/src/components/Chat/Chat.stories.tsx

@@ -24,7 +24,7 @@ storiesOf('Chat', module)
       downloadFile={() => {}}
       cancelDownload={() => {}}
       channel={{
-        name: 'Zbay',
+        name: 'Quiet',
         description: '',
         owner: '',
         timestamp: 0,
@@ -266,7 +266,7 @@ storiesOf('Chat', module)
       downloadFile={() => {}}
       cancelDownload={() => {}}
       channel={{
-        name: 'Zbay',
+        name: 'Quiet',
         description: '',
         owner: '',
         timestamp: 0,