Skip to content
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
11 changes: 11 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Build output
build/
dist/
coverage/

# Vendor data with hand-aligned formatting (contract ABIs)
src/assets/abis/

# Generated / lockfiles
yarn.lock
package-lock.json
18 changes: 9 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
"test:debug": "playwright test --debug",
"test:codegen": "playwright codegen",
"eject": "craco eject",
"lint:ci": "eslint --color 'src/**/*.{js,jsx,ts,tsx}'",
"lint:check": "eslint --quiet 'src/**/*.{js,jsx,ts,tsx}'",
"lint:fix": "eslint --fix 'src/**/*.{js,jsx,ts,tsx}'",
"lint:ci": "eslint --color --ext .js,.jsx,.ts,.tsx src",
"lint:check": "eslint --quiet --ext .js,.jsx,.ts,.tsx src",
"lint:fix": "eslint --fix --ext .js,.jsx,.ts,.tsx src",
"prepare": "husky install"
},
"dependencies": {
Expand Down Expand Up @@ -105,22 +105,22 @@
"@types/react-html-parser": "^2.0.2",
"@types/react-router-dom": "^5.1.6",
"@types/yup": "^0.29.11",
"@typescript-eslint/eslint-plugin": "^6.21.0",
"@typescript-eslint/parser": "^6.21.0",
"@typescript-eslint/eslint-plugin": "^7.18.0",
"@typescript-eslint/parser": "^7.18.0",
"craco-esbuild": "^0.6.1",
"dotenv": "^17.2.3",
"esbuild": "^0.25.10",
"eslint": "^7.22.0",
"eslint-config-prettier": "^8.1.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint": "^8.57.1",
"eslint-config-prettier": "^10.1.8",
"eslint-plugin-prettier": "^5.5.5",
"eslint-plugin-react": "^7.21.5",
"eslint-plugin-react-hooks": "^4.2.0",
"husky": "8.0.3",
"jest": "^29.7.0",
"jsdom": "^27.0.0",
"lint-staged": "15.2.2",
"patch-package": "^8.0.0",
"prettier": "^2.2.0",
"prettier": "^3.8.3",
"source-map-explorer": "2.5.2",
"ts-jest": "^29.1.4",
"typescript": "^5.0.4"
Expand Down
4 changes: 2 additions & 2 deletions src/modules/creator/components/DeploymentLoader.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ export const DeploymentLoader: React.FC<Props> = ({ states, activeStep, error })
? errorMessage
: states[focusedState].activeText
: showCompletedText
? states[focusedState].completedText
: ""}
? states[focusedState].completedText
: ""}
{showActiveText && !error && <SuspenseDots />}
</WaitingText>
</Grid>
Expand Down
5 changes: 1 addition & 4 deletions src/modules/etherlink/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{
"rules": {
"@typescript-eslint/no-unused-vars": [
"warn",
{ "argsIgnorePattern": "^_", "varsIgnorePattern": "^_" }
],
"@typescript-eslint/no-unused-vars": ["warn", { "argsIgnorePattern": "^_", "varsIgnorePattern": "^_" }],
"no-unused-vars": "off"
}
}
15 changes: 9 additions & 6 deletions src/modules/etherlink/creator/EvmDaoRegistry.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,15 @@ interface RegistryEntry {
// Use StyledTextField from src/components/ui

const updateRegistryStore = (entries: RegistryEntry[], setFieldValue: (field: string, value: any) => void) => {
const registryObject = entries.reduce((acc, entry) => {
if (entry.key) {
acc[entry.key] = entry.value
}
return acc
}, {} as Record<string, string>)
const registryObject = entries.reduce(
(acc, entry) => {
if (entry.key) {
acc[entry.key] = entry.value
}
return acc
},
{} as Record<string, string>
)
setFieldValue("registry", registryObject)
}

Expand Down
12 changes: 6 additions & 6 deletions src/modules/etherlink/explorer/EtherlinkDAO/EvmProposalsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -183,12 +183,12 @@ export const EvmProposalsPage = () => {
l === "passed"
? "succeeded"
: l === "failed"
? "defeated"
: l === "no quorum"
? "no-quorum"
: l === "dropped"
? "defeated"
: l
? "defeated"
: l === "no quorum"
? "no-quorum"
: l === "dropped"
? "defeated"
: l
)
const offchainStatus = f?.offchainStatus || "all"
const status = type === "offchain" ? [offchainStatus] : statusFromDialog.length ? statusFromDialog : ["all"]
Expand Down
8 changes: 4 additions & 4 deletions src/modules/etherlink/explorer/EtherlinkDAO/EvmUserPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,10 @@ export const EvmUserPage = () => {
? isNotDelegatingNotClaimed
? "not delegating - not claimed"
: isNotDelegatingClaimed
? "not delegating - claimed"
: isDelegating
? "delegating"
: ""
? "not delegating - claimed"
: isDelegating
? "delegating"
: ""
: ""
// For vote-directly label, compare voting weight vs personal balance
const EPS = 1e-9
Expand Down
4 changes: 2 additions & 2 deletions src/modules/etherlink/explorer/EvmProposalsActionDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,8 @@ export const EvmProposalsActionDialog = ({ open, handleClose }: { open: boolean;
{(userVotingWeight || 0) > 0
? "Voting Power Ready"
: isDelegating
? "Delegating..."
: "Self‑delegate (Claim Voting Power)"}
? "Delegating..."
: "Self‑delegate (Claim Voting Power)"}
</NextButton>
</Box>

Expand Down
4 changes: 2 additions & 2 deletions src/modules/explorer/components/NavigationMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -302,8 +302,8 @@ export const NavigationMenu: React.FC<{ disableMobileMenu?: boolean }> = ({ disa
location.pathname.match("/explorer/daos")
? classes.explorer
: location.pathname.match("/explorer/lite")
? classes.lite
: classes.home
? classes.lite
: classes.home
}
>
{pages.map((page, i) => (
Expand Down
16 changes: 8 additions & 8 deletions src/modules/explorer/components/ProposalActionsDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -236,10 +236,10 @@ const ProposalActionsDialogForTezos: React.FC<{
elem.id === "off-chain"
? handleLiteProposal()
: !shouldDisable
? elem.isLambda
? handleOpenCustomProposalModal(elem.id)
: handleOpenSupportedExecuteProposalModal(elem.id)
: null
? elem.isLambda
? handleOpenCustomProposalModal(elem.id)
: handleOpenSupportedExecuteProposalModal(elem.id)
: null
}
>
<ActionText color={shouldDisable && elem.id !== "off-chain" ? "textSecondary" : "textPrimary"}>
Expand Down Expand Up @@ -322,10 +322,10 @@ const ProposalActionsDialogForTezos: React.FC<{
elem.id === "off-chain"
? handleLiteProposal()
: !shouldDisable
? elem.isLambda
? handleOpenCustomProposalModal(elem.id)
: handleOpenSupportedExecuteProposalModal(elem.id)
: null
? elem.isLambda
? handleOpenCustomProposalModal(elem.id)
: handleOpenSupportedExecuteProposalModal(elem.id)
: null
}
>
<ActionText color={shouldDisable && elem.id !== "off-chain" ? "textSecondary" : "textPrimary"}>
Expand Down
54 changes: 29 additions & 25 deletions src/modules/explorer/components/UserBalancesWidget.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,36 +6,40 @@ import { useTezos } from "services/beacon/hooks/useTezos"
import { useDAO } from "services/services/dao/hooks/useDAO"
import { useDAOID } from "../pages/DAO/router"

const BalanceBox = styled(({ radiusSide, color, ...other }: any) => <Grid {...other} />)(
({ radiusSide, color }: { radiusSide: "left" | "right" | "none"; color: string }) => {
let borderRadius = "0"
const BalanceBox = styled(({ radiusSide, color, ...other }: any) => <Grid {...other} />)(({
radiusSide,
color
}: {
radiusSide: "left" | "right" | "none"
color: string
}) => {
let borderRadius = "0"

switch (radiusSide) {
case "none": {
break
}
case "left": {
borderRadius = "4px 0 0 4px"
break
}
case "right": {
borderRadius = "0 4px 4px 0"
break
}
switch (radiusSide) {
case "none": {
break
}
case "left": {
borderRadius = "4px 0 0 4px"
break
}
case "right": {
borderRadius = "0 4px 4px 0"
break
}
}

return {
"width": 166,
"height": 41.85,
borderRadius,
color,
"backgroundColor": hexToRgba(color, 0.15),
"& > div": {
height: "100%"
}
return {
"width": 166,
"height": 41.85,
borderRadius,
color,
"backgroundColor": hexToRgba(color, 0.15),
"& > div": {
height: "100%"
}
}
)
})

const TitleText = styled(Typography)({
fontSize: 11,
Expand Down
4 changes: 2 additions & 2 deletions src/modules/explorer/pages/Config/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,8 @@ export const Config: React.FC = () => {
elem.id === "off-chain"
? handleLiteProposal()
: elem.isLambda
? handleOpenCustomProposalModal(elem.id)
: handleOpenSupportedExecuteProposalModal(elem.id)
? handleOpenCustomProposalModal(elem.id)
: handleOpenSupportedExecuteProposalModal(elem.id)
}
>
<ActionText color="textPrimary">{elem.name}</ActionText>
Expand Down
11 changes: 7 additions & 4 deletions src/services/bakingBad/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
import { Network, rpcNodes } from "services/beacon"

export const networkNameMap: Record<Network, string> = Object.keys(rpcNodes).reduce((acc, network) => {
acc[network as Network] = network
return acc
}, {} as Record<Network, string>)
export const networkNameMap: Record<Network, string> = Object.keys(rpcNodes).reduce(
(acc, network) => {
acc[network as Network] = network
return acc
},
{} as Record<Network, string>
)
Original file line number Diff line number Diff line change
Expand Up @@ -222,8 +222,8 @@ const useEvmDaoCreateStore = () => {
daoData.tokenDeploymentMechanism === "wrapped"
? "wrapped ERC20"
: daoData.nonTransferable
? "non-transferable"
: "transferable"
? "non-transferable"
: "transferable"

console.error("No wrapper address found!", {
factoryType,
Expand Down
5 changes: 1 addition & 4 deletions src/services/wagmi/etherlink/.eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
{
"rules": {
"@typescript-eslint/no-unused-vars": [
"warn",
{ "argsIgnorePattern": "^_", "varsIgnorePattern": "^_" }
],
"@typescript-eslint/no-unused-vars": ["warn", { "argsIgnorePattern": "^_", "varsIgnorePattern": "^_" }],
"no-unused-vars": "off"
}
}
Loading
Loading