Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix(#2642, #2589): Change company name and copyright statement #2662

Merged
merged 2 commits into from
Dec 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions packages/desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion packages/desktop/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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()}
Expand Down Expand Up @@ -173,7 +173,7 @@ describe('OpenlinkModal', () => {
<span
class="OpenlinkModalbold"
>
www.zbay.app
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still use this component? Can we remove it?

www.tryquiet.org
</span>
- I trust them with my data and I'm not using Quiet for anonymity protection.
</div>
Expand Down Expand Up @@ -215,7 +215,7 @@ describe('OpenlinkModal', () => {
<span
class="OpenlinkModalbold"
>
www.zbay.app
www.tryquiet.org
</span>

again, but don't auto-load images.
Expand Down Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

This file was deleted.

Binary file not shown.
14 changes: 0 additions & 14 deletions packages/desktop/src/renderer/static/images/zcash/zbay-icon.svg

This file was deleted.

This file was deleted.

This file was deleted.

4 changes: 2 additions & 2 deletions packages/mobile/src/components/Chat/Chat.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ storiesOf('Chat', module)
downloadFile={() => {}}
cancelDownload={() => {}}
channel={{
name: 'Zbay',
name: 'Quiet',
description: '',
owner: '',
timestamp: 0,
Expand Down Expand Up @@ -266,7 +266,7 @@ storiesOf('Chat', module)
downloadFile={() => {}}
cancelDownload={() => {}}
channel={{
name: 'Zbay',
name: 'Quiet',
description: '',
owner: '',
timestamp: 0,
Expand Down
Loading