Skip to content

Commit

Permalink
Update lots of user facing instances of Fractal to Decent
Browse files Browse the repository at this point in the history
  • Loading branch information
adamgall committed Apr 30, 2024
1 parent 8df1e7c commit 3fc069c
Show file tree
Hide file tree
Showing 29 changed files with 67 additions and 67 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ COINGECKO_API_KEY=""
TOKEN_PRICE_CACHE_INTERVAL_MINUTES=""

# App name displayed as Title
VITE_APP_NAME="Fractal"
VITE_APP_NAME="Decent"

# Alchemy provider API key, used on Mainnet
VITE_APP_ALCHEMY_MAINNET_API_KEY=""
Expand Down
6 changes: 3 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
## Contributing to Fractal Interface
## Contributing to Decent Interface

### Submitting an Issue

- Some issues may already be reported, please search existing issues before submitting a new one.

- If this is a potential security vulnerability in Decent, please see our [Security Policy](https://github.com/decentdao/decent-interface/blob/HEAD/.github/SECURITY.md) for instructions on privately reporting to our security team.

- Otherwise, simply create a new issue and the Fractal development team will respond in a timely manner. Please be as descriptive of the issue as possible.
- Otherwise, simply create a new issue and the Decent development team will respond in a timely manner. Please be as descriptive of the issue as possible.

- If looking to contribute a bug fix or feature, please discuss the change via the bug ticket or a new Github issue before submitting a pull request for the greatest likelihood of being accepted.

Expand All @@ -22,7 +22,7 @@
automation tests in the [test directory](https://github.com/decentdao/decent-interface/tree/HEAD/tests).
- All of your components should be composed of [Chakra UI](https://chakra-ui.com/) base components, using our custom theme.

- A member of the Fractal engineering team will respond with any further discussion or requested changes and once approved
- A member of the Decent engineering team will respond with any further discussion or requested changes and once approved
you are free to merge.
- We appreciate the collaboration!

Expand Down
4 changes: 2 additions & 2 deletions .github/SECURITY.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Security Policy

We at Fractal encourage security researchers to contact us directly and privately to report any potential security vulnerabilities in either our smart contracts or front end code.
We at Decent encourage security researchers to contact us directly and privately to report any potential security vulnerabilities in either our smart contracts or front end code.

If the issue you are reporting is not a security vulnerability, simply [open a new GitHub issue](https://github.com/decentdao/decent-interface/issues/new/choose).

## Reporting a Vulnerability

If you would like to disclose a vulnerability in Fractal, please send a new email to [[email protected]](mailto:[email protected]).
If you would like to disclose a vulnerability in Decent, please send a new email to [[email protected]](mailto:[email protected]).

Please include the following information in your email:

Expand Down
2 changes: 1 addition & 1 deletion .graphclientrc.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
sources:
- name: fractal
- name: decent
handler:
graphql:
endpoint: https://api.studio.thegraph.com/query/{context.subgraphSpace:71032}/{context.subgraphSlug:fractal-mainnet}/{context.subgraphVersion:v0.0.2}
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2022 fractal-framework
Copyright (c) 2024 decent

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Fractal Interface
# Decent Interface

## Local Development

Expand Down
8 changes: 4 additions & 4 deletions docker/blockchain/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Dockerfile for Fractal Blockchain Node
# Dockerfile for Decent Blockchain Node
FROM node:18.12.1-alpine

# Set working directory
WORKDIR /fractal-blockchain-node/
WORKDIR /decent-blockchain-node/

# Copy package.json
COPY ./hardhat.package.json /fractal-blockchain-node/package.json
COPY ./hardhat.package.json /decent-blockchain-node/package.json

# Install needed dependencies
# These dependencies are needed so that the node will run correctly
Expand All @@ -14,7 +14,7 @@ RUN apk --no-cache add python3 make g++ \
&& apk del python3 make g++

# Copy the rest of the files
COPY ./hardhat.config.js /fractal-blockchain-node/hardhat.config.js
COPY ./hardhat.config.js /decent-blockchain-node/hardhat.config.js
COPY ./entrypoint.sh /usr/local/bin

# Keep server running
Expand Down
2 changes: 1 addition & 1 deletion docker/webapp/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ ENV VITE_APP_LOCAL_CHAIN_ID=$VITE_APP_LOCAL_CHAIN_ID
ENV VITE_APP_LOCAL_PROVIDER_URL=$VITE_APP_LOCAL_PROVIDER_URL

# Set working directory
WORKDIR /fractal-webapp/
WORKDIR /decent-webapp/

# Copy package.json and package-lock.json files
COPY package*.json ./
Expand Down
6 changes: 3 additions & 3 deletions docs/TRANSLATIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,19 @@

- Add your translations in the last column of the output CSV file. Feel free to improve existing translations!

- When finished translating, run `2_csv_to_json.py` to generate the required `.json` files for the Fractal app:
- When finished translating, run `2_csv_to_json.py` to generate the required `.json` files for the Decent app:

```console
python3 2_csv_to_json.py
```

- Submit a pull request with these changes, as detailed in [CONTRIBUTING.md](../.github/CONTRIBUTING.md).

- We encourage anyone to try cloning the Fractal repo and submitting a PR with translations (you can definitely do it!), however if you get stuck the Fractal team can provide you with a CSV to edit and return to us, simply add your request to the related Github issue.
- We encourage anyone to try cloning the Decent repo and submitting a PR with translations (you can definitely do it!), however if you get stuck the Decent team can provide you with a CSV to edit and return to us, simply add your request to the related Github issue.

### Translation Guidelines

- The app name is Fractal, which is a project of Decent DAO. Unless used as their non product specific meanings (e.g. John is a decent fellow who loves fractals.), these words should not be translated.
- The app name is Decent, which is a project of Decent DAO. Unless used as their non product specific meanings (e.g. John is a decent fellow who loves decent projects.), these words should not be translated.

- Content within curly brackets (e.g. `{{count}}`), indicates a variable that is replaced within the app logic, and neither the brackets, nor the content within should be altered. _You may place these bracketed variables anywhere in your translation text_.

Expand Down
4 changes: 2 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
/>
<meta
name="description"
content="Are you outgrowing your Multisig? Fractal extends Safe treasuries into on-chain hierarchies of permissions, token flows, and governance."
content="Are you outgrowing your Multisig? Decent extends Safe treasuries into on-chain hierarchies of permissions, token flows, and governance."
/>
<meta
name="git-hash"
Expand All @@ -33,7 +33,7 @@
/>
<meta
property="og:description"
content="Are you outgrowing your Multisig? Fractal extends Safe treasuries into on-chain hierarchies of permissions, token flows, and governance."
content="Are you outgrowing your Multisig? Decent extends Safe treasuries into on-chain hierarchies of permissions, token flows, and governance."
/>
<meta
property="og:type"
Expand Down
4 changes: 2 additions & 2 deletions public/manifest.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"short_name": "Fractal",
"name": "Fractal",
"short_name": "Decent",
"name": "Decent",
"icons": [
{
"src": "favicon.ico",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export function ModulesContainer() {
{moduleType === FractalModuleType.AZORIUS
? ' (Azorius Module)'
: moduleType === FractalModuleType.FRACTAL
? ' (Fractal Module)'
? ' (Fractal Module)' // TODO rename this?
: ''}
</DisplayAddress>
</Flex>
Expand Down
4 changes: 2 additions & 2 deletions src/hooks/DAO/proposal/useCastVote.ts
Original file line number Diff line number Diff line change
Expand Up @@ -182,15 +182,15 @@ const useCastVote = ({
type: extendedSnapshotProposal.type,
privacy: extendedSnapshotProposal.privacy,
choice: encryptedChoice!,
app: 'fractal',
app: 'decent',
});
} else {
await client.vote(signer.provider as ethers.providers.Web3Provider, address, {
space: daoSnapshotSpaceName,
proposal: extendedSnapshotProposal.proposalId,
type: extendedSnapshotProposal.type,
choice,
app: 'fractal',
app: 'decent',
});
}
toast.dismiss(toastId);
Expand Down
4 changes: 2 additions & 2 deletions src/hooks/DAO/useDAOName.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { useNetworkConfig } from '../../providers/NetworkConfig/NetworkConfigPro
import { createAccountSubstring } from '../utils/useDisplayName';

/**
* Gets the 'display name' for a Fractal DAO, in the following order of preference:
* Gets the 'display name' for a DAO, in the following order of preference:
*
* 1. Primary ENS Name (reverse record)
* 2. Fractal name registry name
Expand Down Expand Up @@ -75,7 +75,7 @@ export default function useDAOName({
}

/**
* Gets the 'display name' for a Fractal DAO, in the following order of preference:
* Gets the 'display name' for a DAO, in the following order of preference:
*
* 1. Primary ENS Name (reverse record)
* 2. Fractal name registry name
Expand Down
2 changes: 1 addition & 1 deletion src/hooks/utils/cache/useLocalDB.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export enum DBObjectKeys {
*/
const withIndexedDB = (callback: (db: IDBDatabase) => Promise<any>) => {
return new Promise((resolve, reject) => {
const openRequest = indexedDB.open('fractal', DB_VERSION);
const openRequest = indexedDB.open('fractal', DB_VERSION); // TODO might want to migrate this to a new name?

openRequest.onupgradeneeded = () => {
const db = openRequest.result;
Expand Down
4 changes: 2 additions & 2 deletions src/hooks/utils/useDisplayName.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ export const createAccountSubstring = (account: string) => {
* Primary ENS Name (reverse record), otherwise returning a truncated address in the form
* 0xbFC4...7551
*
* This is intended to be used for NON Fractal DAO display names. If you would like to get the
* display name for a Fractal DAO, use the useDAOName hook instead.
* This is intended to be used for NON DAO display names. If you would like to get the
* display name for a DAO, use the useDAOName hook instead.
*/
const useDisplayName = (account?: string | null, truncate?: boolean) => {
if (truncate === undefined) truncate = true;
Expand Down
4 changes: 2 additions & 2 deletions src/i18n/locales/en/common.json
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@
"abiSelectorDescription": "Autopopulate with verified functions",
"titleNodes": "Hierarchy",
"404Title": "Page not found",
"404Button": "Fractal App Home",
"404Button": "Decent App Home",
"signers": "Signers",
"daoDetails": "Safe details",
"signersRequired": "Signers Required",
Expand All @@ -99,7 +99,7 @@
"refresh": "Refresh",
"invalidSafe1": "We couldn't find a Safe at this address on {{chain}}.",
"invalidSafe2": "Please double check the address then try again.",
"wrongNetwork1": "Fractal is currently connected to {{chain}}.",
"wrongNetwork1": "Decent is currently connected to {{chain}}.",
"wrongNetwork2": "Try switching the app to the correct chain for your Safe.",
"badQueryParam1": "The Safe address in the URL isn't formatted correctly",
"badQueryParam2": "",
Expand Down
26 changes: 13 additions & 13 deletions src/i18n/locales/en/daoCreate.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"buttonCreate": "Create a DAO",
"buttonCreate": "Create a Safe DAO",
"addNFTButton": "Import another token",
"labelCreateSubDAOProposal": "Create a sub-Safe",
"labelCreateSubDAOProposal": "Create a child Safe DAO",
"errorLowSignerThreshold": "Threshold must be greater than 0",
"errorHighSignerThreshold": "Threshold is too high",
"labelSigners": "Total Signers",
Expand All @@ -22,8 +22,8 @@
"nftDetailsToken": "Token",
"nftDetailsWeight": "Weight",
"n/a": "n/a",
"labelConnectWallet": "To deploy a new Fractal",
"titleFundingOptions": "Go to parent-Safe",
"labelConnectWallet": "To deploy a new Safe DAO",
"titleFundingOptions": "Go to parent Safe",
"labelSelectNFT": "Select NFT",
"labelNFTAddress": "NFT Address",
"helperNFTAddress": "Import an existing ERC-721 token",
Expand Down Expand Up @@ -66,38 +66,38 @@
"labelTokenSupply": "Token Supply",
"helperTokenSupply": "Total available tokens",
"labelMultisigGov": "Safe Multisig",
"descMultisigGov": "Multi-signature governance on a Safe{Wallet}",
"descMultisigGov": "Multi-signature governance on a Safe",
"labelAzoriusErc20Gov": "Token Voting Safe",
"descAzoriusErc20Gov": "ERC-20 token voting governance on a Safe{Wallet}",
"descAzoriusErc20Gov": "ERC-20 token voting governance on a Safe",
"labelAzoriusErc721Gov": "NFT Voting Safe",
"descAzoriusErc721Gov": "Assign voting rights and ownership privileges to ERC-721 token holders",
"labelDAOName": "DAO name",
"daoNamePlaceholder": "Name",
"helperDAOName": "What is your DAO called?",
"titleProposalSettings": "Proposal Settings",
"labelDeploySubDAO": "Create a sub-Safe Proposal",
"labelDeployAzorius": "Create Azorius deployment Proposal",
"labelDeploySubDAO": "Create a child Safe proposal",
"labelDeployAzorius": "Create Azorius deployment proposal",
"titleAllocations": "Initial Token Allocations",
"titleTokenParams": "Token Metadata",
"titleTokenSupply": "Token Supply",
"titleAddress": "Address",
"titleAmount": "Amount",
"createSubDAOPendingToastMessage": "Creating your sub-Safe Proposal",
"createSubDAOPendingToastMessage": "Creating your child Safe proposal",
"createSubDAOSuccessToastMessage": "Deployment successful",
"createSubDAOFailureToastMessage": "Deployment failed",
"helperAllocations": "Unallocated tokens will be placed in your DAO's treasury",
"helperAllocations": "Unallocated tokens will be placed in your Safe DAO's treasury",
"labelSelectToken": "Select Token",
"helperSelectToken": "Create a new token or use an existing ERC-20 token.",
"radioLabelNewToken": "New Token",
"radioLabelExistingToken": "Existing Token",
"helperNewToken": "Create a new ERC-20 token to vote with",
"helperExistingToken": "Use an existing ERC-20 for voting",
"warningExistingToken": "This token must be wrapped in order to be used as a voting token",
"warningExistingTokenTooltip": "Fractal will deploy a new ERC-20 governance token to wrap this one. Holders can deposit their tokens to vote with or withdraw them at any time.",
"warningExistingTokenTooltip": "Decent will deploy a new ERC-20 governance token to wrap this one. Holders can deposit their tokens to vote with or withdraw them at any time.",
"snapshot": "Snapshot",
"snapshotHelper": "Does your DAO have a Snapshot space?",
"snapshotHelper": "Does your Safe DAO have a Snapshot space?",
"tooltipMultisig": "Multisig is useful when you only have a small group of decision makers that all need to sign a transaction for it pass. <1>Learn more</1>",
"tooltipTokenVoting": "Token Voting is a method to give a larger group of ERC-20 token holders governance power to propose and vote on transactions. <1>Learn more</1>",
"toastDisconnected": "Connect an account to proceed!",
"tooltipNftVoting": "NFT Voting is good practice to give a group ERC-721 (aka NFT) holders to propose and vote on transactions. Multiple NFT addresses may be used. Learn more with <1>Fractal Docs</1>"
"tooltipNftVoting": "NFT Voting is good practice to give a group ERC-721 (aka NFT) holders to propose and vote on transactions. Multiple NFT addresses may be used. Learn more with <1>Decent Docs</1>"
}
10 changes: 5 additions & 5 deletions src/i18n/locales/en/dashboard.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"titleFavorites": "Favorites",
"emptyFavorites": "No favorites",
"errorInvalidSearch": "This is not a valid Ethereum address",
"errorFailedSearch": "Sorry, this address is not a Fractal or Safe{WALLET} on {{chain}}",
"errorFailedSearch": "Sorry, this address is not a Decent DAO or Safe on {{chain}}",
"searchDAOPlaceholder": "Search for a Safe by address or ENS",
"titleGovernance": "Governance",
"titleType": "Type",
Expand All @@ -15,11 +15,11 @@
"noActivity": "No Activity",
"proposalDescription_one": "Proposal to execute {{count}} transaction",
"proposalDescription_other": "Proposal to execute {{count}} transactions",
"freezeDescription": "Freeze vote pending on sub-Safe",
"frozenDescription": "Safe is Frozen",
"freezeDescription": "Freeze vote pending on child Safe",
"frozenDescription": "Safe is frozen",
"freezeButton": "Freeze",
"freezeVotedButton": "Vote Cast",
"noVotesButton": "User Has No Votes",
"freezeVotedButton": "Vote cast",
"noVotesButton": "User has no votes",
"tipFreeze": "{{amount}} required freeze votes",
"proposalOnChainRejection": "that rejects transaction {{proposalId}}",
"proposalDescriptionCont": "that will",
Expand Down
10 changes: 5 additions & 5 deletions src/i18n/locales/en/home.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"homeTitle": "Welcome to Fractal",
"homeDesc": "Are you outgrowing your Multisig? Fractal extends Safe treasuries into on-chain hierarchies of permissions, token flows, and governance.",
"homeTitle": "Welcome to Decent",
"homeDesc": "Are you outgrowing your Multisig? Decent extends Safe treasuries into on-chain hierarchies of permissions, token flows, and governance.",
"govern": "Govern",
"governDesc": "Choose a governance per sub-Safe. Create and authorize proposals. Decentralize on any timeline.",
"governDesc": "Choose a governance per sub-Safe. Create and authorize proposals. Decentralize on any timeline.",
"structure": "Structure",
"structureDesc": "Start with any Safe Multisig. Connect teams in flexible sub-Safe hierarchies for agile delivery.",
"operate": "Operate",
"operateDesc": "Unleash on-chain efficiency with reuseable, streamed, and permissioned transactions.",
"featuredTitle": "Featured Organizations",
"featuredDesc": "Here are some projects using Fractal to convert their Safe Multisig into DAOs as they decentralize:",
"featuredDesc": "Here are some projects using Decent to convert their Safe Multisig into DAOs as they decentralize:",
"decentTitle": "Decent DAO",
"decentDesc": "We are an open-source collective that unites builders toward global decentralization.",
"awakeTitle": "AwakeVC",
Expand All @@ -24,6 +24,6 @@
"createButton": "+ Start from Scratch",
"homeAttribution": "Made with 💜 by <1>Decent DAO</1>",
"audit": "Audit",
"learnCTA": "Explore the Docs to see how Fractal works",
"learnCTA": "Explore the Docs to see how Decent works",
"getStartedButton": "Get Started"
}
2 changes: 1 addition & 1 deletion src/i18n/locales/en/navigation.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"faq": "FAQ",
"discord": "Discord",
"documentation": "Documentation",
"ariaLabelFractalBrand": "Navigate Fractal Home",
"ariaLabelFractalBrand": "Navigate Decent Home",
"ariaLabelHome": "Navigate Safe Home",
"ariaLabelProposals": "Navigate Safe Proposals",
"ariaLabelActivities": "Navigate Safe Activities",
Expand Down
4 changes: 2 additions & 2 deletions src/i18n/locales/en/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
"guardTitle": "Guard",
"modulesAndGuardsTitle": "Modules and Guards",
"modulesAndGuardsDescription1": "Modules are contracts added to extends a Safe's capabilities.",
"modulesAndGuardsDescription2": "A Freeze Guard is added to all sub-Safes created on Fractal. A Freeze Guard allow the parent Safe's members to block the sub-Safe's access to funds and freeze active proposals.",
"modulesAndGuardsDescription2": "A Freeze Guard is added to all child Safes created on Decent. A Freeze Guard allow the parent Safe's members to block the sub-Safe's access to funds and freeze active proposals.",
"daoMetadataName": "Safe Name",
"daoMetadataSnapshot": "Snapshot Space",
"daoMetadataDescriptionTitle": "Safe Metadata & Off-chain",
"daoMetadataDescriptionTitle": "Safe Metadata & offchain",
"daoMetadataDescriptionText": "Activities or transactions that occur outside of the blockchain network or aren't stored on-chain.",
"proposeChanges": "Propose Change"
}
2 changes: 1 addition & 1 deletion src/i18n/locales/uk/daoCreate.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"buttonCreate": "Створити Fractal",
"buttonCreate": "Створити Decent",
"errorLowSignerThreshold": "Поріг голосів має бути більше ніж 0",
"errorHighSignerThreshold": "Поріг голосів зависокий",
"labelSigners": "Загалом підписантів",
Expand Down
2 changes: 1 addition & 1 deletion src/i18n/locales/uk/dashboard.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"titleFavorites": "Вподобані",
"emptyFavorites": "Нема вподобайок",
"errorFailedSearch": "Вибачте, ця адреса - ані Safe{Wallet} ані Fractal",
"errorFailedSearch": "Вибачте, ця адреса - ані Safe ані Decent",
"titleGovernance": "Система Управління",
"titleType": "Тип",
"titleVotingPeriod": "Період голосування",
Expand Down
Loading

0 comments on commit 3fc069c

Please sign in to comment.