Skip to content

Commit

Permalink
Merge branch 'develop' into root/remove-typechain
Browse files Browse the repository at this point in the history
  • Loading branch information
adamgall committed May 15, 2024
2 parents 482c5b4 + b50892b commit 1d5de0a
Show file tree
Hide file tree
Showing 9 changed files with 37 additions and 20 deletions.
17 changes: 17 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Publish Release
on:
push:
tags:
- 'v*.*.*'

jobs:
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Release
uses: softprops/action-gh-release@v2
with:
generate_release_notes: true
target_commitish: main
4 changes: 0 additions & 4 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,6 @@
name="description"
content="Are you outgrowing your Multisig? Decent extends Safe treasuries into on-chain hierarchies of permissions, token flows, and governance."
/>
<meta
name="git-hash"
content="%VITE_APP_GIT_HASH%"
/>
<meta
property="og:url"
content="%VITE_APP_SITE_URL%"
Expand Down
2 changes: 2 additions & 0 deletions package-lock.json

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

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
{
"name": "decent-interface",
"version": "0.1.0",
"private": true,
"dependencies": {
"@adraffy/ens-normalize": "^1.10.1",
Expand Down Expand Up @@ -59,10 +60,10 @@
"lint:check": "eslint . --ext .ts,.tsx",
"pretty": "prettier . --write",
"pretty:check": "prettier . --check",
"dev": "VITE_APP_GIT_HASH=`git rev-parse HEAD` vite --force",
"dev": "vite --force",
"start": "vite start",
"preview": "vite preview",
"build": "VITE_APP_GIT_HASH=`git rev-parse HEAD` NODE_OPTIONS=--max-old-space-size=8192 vite build",
"build": "NODE_OPTIONS=--max-old-space-size=8192 vite build",
"graphql:build": "graphclient build",
"graphql:dev-server": "graphclient serve-dev",
"test": "vitest --dir=test",
Expand Down
16 changes: 5 additions & 11 deletions src/components/ui/page/Footer.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import { Flex, Link, Tooltip, Image } from '@chakra-ui/react';
import { Flex, Link, Image } from '@chakra-ui/react';
import { useTranslation } from 'react-i18next';
import { URL_DECENT } from '../../../constants/url';
import ExternalLink, { ExtrernalLinkWrappable } from '../links/ExternalLink';

export function Footer() {
const { t } = useTranslation('home');
const commitHash = import.meta.env.VITE_APP_GIT_HASH;
return (
<Flex
w="100%"
Expand All @@ -18,16 +17,11 @@ export function Footer() {
>
<Flex gap={4}>
<ExternalLink href="/docs/fractal_audit.pdf">{t('audit')}</ExternalLink>
<Tooltip
placement="top"
label={t('currentBuild', { hash: commitHash })}
<ExtrernalLinkWrappable
href={`https://github.com/decentdao/decent-interface/releases/tag/v${import.meta.env.PACKAGE_VERSION}`}
>
<ExtrernalLinkWrappable
href={`https://github.com/decentdao/decent-interface/commit/${commitHash}`}
>
{commitHash.substring(0, 7)}
</ExtrernalLinkWrappable>
</Tooltip>
v{import.meta.env.PACKAGE_VERSION}
</ExtrernalLinkWrappable>
</Flex>
<Link
target="_blank"
Expand Down
5 changes: 4 additions & 1 deletion src/helpers/errorLogging.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,10 @@ function initErrorLogging() {
createRoutesFromChildren,
matchRoutes,
}),
Sentry.replayIntegration(),
Sentry.replayIntegration({
maskAllText: false,
maskAllInputs: false,
}),
Sentry.feedbackIntegration({
colorScheme: 'dark',
}),
Expand Down
1 change: 0 additions & 1 deletion src/i18n/locales/en/home.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,5 @@
"shutterTitle": "Shutter DAO 0x36",
"myosinTitle": "Myosin",
"textMoreDAOs": "Load More",
"currentBuild": "Current Build: {{hash}}",
"audit": "Audit"
}
3 changes: 2 additions & 1 deletion src/vite-env.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
/// <reference types="vite/client" />

interface ImportMetaEnv {
readonly PACKAGE_VERSION: string;

readonly VITE_APP_NAME: string;
readonly VITE_APP_GIT_HASH: string;

readonly VITE_APP_ALCHEMY_MAINNET_API_KEY: string;
readonly VITE_APP_ALCHEMY_POLYGON_API_KEY: string;
Expand Down
4 changes: 4 additions & 0 deletions vite.config.mts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import react from '@vitejs/plugin-react-swc';
import { defineConfig } from 'vite';
import { checker } from 'vite-plugin-checker';
import packageJson from './package.json';

// https://vitejs.dev/config/
export default defineConfig({
Expand All @@ -11,4 +12,7 @@ export default defineConfig({
build: {
sourcemap: true,
},
define: {
'import.meta.env.PACKAGE_VERSION': JSON.stringify(packageJson.version),
},
});

0 comments on commit 1d5de0a

Please sign in to comment.