Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into paro/rfq-indexer-up…
Browse files Browse the repository at this point in the history
…dates-suggs
  • Loading branch information
parodime committed Oct 7, 2024
2 parents 27b6d78 + 5c3686c commit df0e800
Show file tree
Hide file tree
Showing 41 changed files with 1,415 additions and 18,258 deletions.
7 changes: 7 additions & 0 deletions .github/workflows/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,10 @@ jobs:
with:
token: ${{ secrets.GITHUB_TOKEN }} # Optional
filesizelimit: 15MB

- name: Add 'fe-release' label
if: github.event.pull_request.base.ref == 'fe-release'
uses: actions-ecosystem/action-add-labels@v1
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
labels: 'fe-release'
7 changes: 7 additions & 0 deletions .github/workflows/ui-preview.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- 'packages/explorer-ui/**'
- 'docs/bridge/**'
- 'packages/synapse-interface/**'
- 'packages/synapse-constants/**'
jobs:
changes:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -62,6 +63,12 @@ jobs:
cache: 'npm'
install_dependencies: 'false'
cache-path: ''
- name: Build synapse-constants
run: |
cd packages/synapse-constants
yarn install
yarn build
working-directory: ${{ github.workspace }}
- name: Get Project ID
id: project_id
# see: https://stackoverflow.com/a/75231888 for details
Expand Down
24 changes: 24 additions & 0 deletions docs/bridge/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,30 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.3.7](https://github.com/synapsecns/sanguine/compare/@synapsecns/[email protected]...@synapsecns/[email protected]) (2024-10-05)

**Note:** Version bump only for package @synapsecns/bridge-docs





## [0.3.6](https://github.com/synapsecns/sanguine/compare/@synapsecns/[email protected]...@synapsecns/[email protected]) (2024-10-05)

**Note:** Version bump only for package @synapsecns/bridge-docs





## [0.3.5](https://github.com/synapsecns/sanguine/compare/@synapsecns/[email protected]...@synapsecns/[email protected]) (2024-10-04)

**Note:** Version bump only for package @synapsecns/bridge-docs





## [0.3.4](https://github.com/synapsecns/sanguine/compare/@synapsecns/[email protected]...@synapsecns/[email protected]) (2024-10-04)

**Note:** Version bump only for package @synapsecns/bridge-docs
Expand Down
3 changes: 3 additions & 0 deletions docs/bridge/docusaurus.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,9 @@ const config: Config = {
],

themeConfig: {
colorMode: {
respectPrefersColorScheme: true,
},
// Replace with your project's social card
image: 'img/docusaurus-social-card.jpg',
announcementBar: {
Expand Down
7 changes: 4 additions & 3 deletions docs/bridge/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@synapsecns/bridge-docs",
"version": "0.3.4",
"version": "0.3.7",
"private": true,
"scripts": {
"docusaurus": "docusaurus",
Expand All @@ -24,6 +24,7 @@
"@docusaurus/logger": "3.5.2",
"@docusaurus/module-type-aliases": "3.5.2",
"@docusaurus/plugin-content-docs": "3.5.2",
"@docusaurus/plugin-google-gtag": "^3.5.2",
"@docusaurus/preset-classic": "3.5.2",
"@docusaurus/theme-common": "3.5.2",
"@docusaurus/tsconfig": "3.5.2",
Expand All @@ -33,13 +34,13 @@
"@docusaurus/utils-validation": "3.5.2",
"@easyops-cn/docusaurus-search-local": "^0.44.5",
"@mdx-js/react": "^3.0.0",
"@synapsecns/synapse-constants": "^1.6.0",
"clsx": "^2.0.0",
"docusaurus-plugin-openapi-docs": "^4.0.1",
"docusaurus-theme-openapi-docs": "^4.0.1",
"prism-react-renderer": "^2.3.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"synapse-constants": "1.3.22"
"react-dom": "^18.2.0"
},
"devDependencies": {
"typescript": "~5.2.2"
Expand Down
2 changes: 1 addition & 1 deletion docs/bridge/src/components/Routes.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BRIDGABLE_TOKENS, CHAINS } from 'synapse-constants'
import { BRIDGABLE_TOKENS, CHAINS } from '@synapsecns/synapse-constants'

const CHAINS_BY_ID = {}

Expand Down
2 changes: 1 addition & 1 deletion docs/bridge/src/components/USDC.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { USDC } from 'synapse-constants'
import { USDC } from '@synapsecns/synapse-constants'
console.log(0, USDC)

export const Test = () => {
Expand Down
6 changes: 1 addition & 5 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
{
"npmClient": "yarn",
"useWorkspaces": true,
"packages": [
"packages/*",
"packages/rfq-indexer/*",
"docs/*"
],
"packages": ["packages/*", "packages/rfq-indexer/*", "docs/*"],
"version": "independent"
}
16 changes: 16 additions & 0 deletions packages/explorer-ui/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,22 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.3.10](https://github.com/synapsecns/sanguine/compare/@synapsecns/[email protected]...@synapsecns/[email protected]) (2024-10-05)

**Note:** Version bump only for package @synapsecns/explorer-ui





## [0.3.9](https://github.com/synapsecns/sanguine/compare/@synapsecns/[email protected]...@synapsecns/[email protected]) (2024-10-05)

**Note:** Version bump only for package @synapsecns/explorer-ui





## [0.3.8](https://github.com/synapsecns/sanguine/compare/@synapsecns/[email protected]...@synapsecns/[email protected]) (2024-10-01)

**Note:** Version bump only for package @synapsecns/explorer-ui
Expand Down
3 changes: 2 additions & 1 deletion packages/explorer-ui/components/misc/AssetImage.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Image from 'next/image'
import { TOKEN_HASH_MAP, AVWETH, USDC } from 'synapse-constants'

import { TOKEN_HASH_MAP, AVWETH, USDC } from '@synapsecns/synapse-constants'
import { getTokenAddressUrl } from '@urls'

export const AssetImage = ({ tokenAddress, chainId, className }) => {
Expand Down
3 changes: 2 additions & 1 deletion packages/explorer-ui/components/misc/ChainImage.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import Image from 'next/image'
import { CHAINS } from 'synapse-constants'
import { QuestionMarkCircleIcon } from '@heroicons/react/outline'

import { CHAINS } from '@synapsecns/synapse-constants'

const CHAINS_BY_ID = CHAINS.CHAINS_BY_ID

export const ChainImage = ({ chainId, imgSize = 'w-4 h-4', className }) => {
Expand Down
3 changes: 2 additions & 1 deletion packages/explorer-ui/components/misc/ChainInfo.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import Link from 'next/link'
import Image from 'next/image'
import { CHAINS } from 'synapse-constants'
import { QuestionMarkCircleIcon } from '@heroicons/react/outline'

import { CHAINS } from '@synapsecns/synapse-constants'
import { getChainUrl, getExplorerTxUrl } from '@urls'

const CHAINS_BY_ID = CHAINS.CHAINS_BY_ID
Expand Down
2 changes: 1 addition & 1 deletion packages/explorer-ui/components/misc/MostActive.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TOKEN_HASH_MAP, CHAINS } from 'synapse-constants'
import { TOKEN_HASH_MAP, CHAINS } from '@synapsecns/synapse-constants'
import { getCoinTextColor } from '@utils/styles/coins'
import { getNetworkTextColor } from '@utils/styles/networks'
import { Grid } from '@components/tailwind/Grid'
Expand Down
2 changes: 1 addition & 1 deletion packages/explorer-ui/components/misc/TokenOnChain.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TOKEN_HASH_MAP, CHAINS } from 'synapse-constants'
import { TOKEN_HASH_MAP, CHAINS } from '@synapsecns/synapse-constants'
import { getCoinTextColor } from '@utils/styles/coins'
import { getNetworkTextColor } from '@utils/styles/networks'
import { getChainUrl } from '@urls'
Expand Down
3 changes: 2 additions & 1 deletion packages/explorer-ui/components/misc/ToolTip.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import ReactDOM from 'react-dom'
import { CHAINS } from 'synapse-constants'

import { CHAINS } from '@synapsecns/synapse-constants'
import { TableHeader } from '@components/TransactionTable/TableHeader'
import { ChainInfo } from '@components/misc/ChainInfo'
import { formatUSD } from '@utils/formatUSD'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useState } from 'react'
import { CHAINS } from 'synapse-constants'
import { CHAINS } from '@synapsecns/synapse-constants'
import TextField from '@mui/material/TextField'
import {
inputStyle,
Expand Down Expand Up @@ -303,7 +303,7 @@ export const UniversalSearch = ({
onChange: (e) => handleChains(e),
}}
>
{Object.values(CHAIN_ENUM_BY_ID).map((chain) => (
{Object.values(CHAIN_ENUM_BY_ID).map((chain: string) => (
<MenuItem key={chain} value={chain}>
{chain.charAt(0).toUpperCase() + chain.slice(1)}
</MenuItem>
Expand Down
2 changes: 1 addition & 1 deletion packages/explorer-ui/components/pages/Home/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { StandardPageContainer } from '@components/layouts/StandardPageContainer
import { BridgeTransactionTable } from '@components/BridgeTransaction/BridgeTransactionTable'
import { useLazyQuery, useQuery } from '@apollo/client'
import { SynapseLogoSvg } from '@components/layouts/MainLayout/SynapseLogoSvg'
import { CHAINS } from 'synapse-constants'
import { CHAINS } from '@synapsecns/synapse-constants'
import {
GET_BRIDGE_TRANSACTIONS_QUERY,
DAILY_STATISTICS_BY_CHAIN,
Expand Down
5 changes: 3 additions & 2 deletions packages/explorer-ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@synapsecns/explorer-ui",
"version": "0.3.8",
"version": "0.3.10",
"private": true,
"engines": {
"node": ">=18.17.0"
Expand All @@ -15,7 +15,9 @@
"@heroicons/react": "^1.0.6",
"@mui/material": "^5.11.8",
"@mui/x-date-pickers": "^5.0.17",
"@next/third-parties": "^14.2.14",
"@popperjs/core": "^2.11.5",
"@synapsecns/synapse-constants": "^1.6.0",
"@testing-library/jest-dom": "^5.16.4",
"@testing-library/react": "^13.2.0",
"@testing-library/user-event": "^13.5.0",
Expand All @@ -38,7 +40,6 @@
"recharts": "^2.3.2",
"sharp": "^0.31.3",
"swr": "^1.3.0",
"synapse-constants": "^1.5.6",
"tailwind-merge": "^1.3.0",
"tiny-warning": "^1.0.3",
"web-vitals": "^2.1.4"
Expand Down
4 changes: 2 additions & 2 deletions packages/explorer-ui/pages/_app.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Head from 'next/head'
import { ApolloProvider } from '@apollo/client'
import { PageWrapper } from '@components/layouts//MainLayout'
import { GoogleAnalytics } from 'nextjs-google-analytics'
import { GoogleAnalytics } from '@next/third-parties/google'
import { Analytics } from '@vercel/analytics/react'

import client from '../apollo-client'
Expand All @@ -13,7 +13,7 @@ const App = ({ Component, pageProps }) => {
<Head>
<title>Synapse Explorer</title>
</Head>
<GoogleAnalytics trackPageViews />
<GoogleAnalytics gaId={'G-BBC13LQXBD'} />
<ApolloProvider client={client}>
<PageWrapper>
<Component {...pageProps} />
Expand Down
2 changes: 1 addition & 1 deletion packages/explorer-ui/pages/chain/[chainId].tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import _ from 'lodash'
import { useState, useEffect } from 'react'
import { useRouter } from 'next/router'
import { CHAINS } from 'synapse-constants'
import { CHAINS } from '@synapsecns/synapse-constants'
import { useLazyQuery, useQuery } from '@apollo/client'
import {
GET_BRIDGE_TRANSACTIONS_QUERY,
Expand Down
2 changes: 1 addition & 1 deletion packages/explorer-ui/pages/token/[tokenAddress].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import _ from 'lodash'
import { useRouter } from 'next/router'
import { useState, useEffect } from 'react'
import { useSearchParams } from 'next/navigation'
import { TOKEN_HASH_MAP } from 'synapse-constants'
import { TOKEN_HASH_MAP } from '@synapsecns/synapse-constants'
import { useQuery } from '@apollo/client'
import { GET_BRIDGE_TRANSACTIONS_QUERY } from '@graphql/queries'
import { TRANSACTIONS_PATH, getChainUrl } from '@urls'
Expand Down
9 changes: 4 additions & 5 deletions packages/explorer-ui/pages/tx/[kappa].tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { ChainInfo } from '@components/misc/ChainInfo'
import { Error } from '@components/Error'
import { StandardPageContainer } from '@components/layouts/StandardPageContainer'
import { useRouter } from 'next/router'
import { CHAINS } from 'synapse-constants'
import { CHAINS } from '@synapsecns/synapse-constants'
import { GET_BRIDGE_TRANSACTIONS_QUERY } from '@graphql/queries'
import { API_URL } from '@graphql'
import { HorizontalDivider } from '@components/misc/HorizontalDivider'
Expand Down Expand Up @@ -39,12 +39,11 @@ export const BridgeTransaction = ({ queryResult }) => {

// Get time taken to complete tx w/ appropriate units.
const getTimeElapsedStr = (start, end) => {
const diff = end - start;
const diff = end - start
if (diff <= 0) {
return '1 second';
return '1 second'
}
return diff === 1 ? '1 second' : `${diff} seconds`;

return diff === 1 ? '1 second' : `${diff} seconds`
}
let content

Expand Down
2 changes: 1 addition & 1 deletion packages/explorer-ui/pages/txs/index.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CHAINS } from 'synapse-constants'
import { CHAINS } from '@synapsecns/synapse-constants'
import { useState, useEffect } from 'react'
import { useLazyQuery } from '@apollo/client'
import { GET_BRIDGE_TRANSACTIONS_QUERY } from '@graphql/queries'
Expand Down
2 changes: 1 addition & 1 deletion packages/explorer-ui/utils/addressToDecimals.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TOKEN_HASH_MAP } from 'synapse-constants'
import { TOKEN_HASH_MAP } from '@synapsecns/synapse-constants'

export const addressToDecimals = ({ tokenAddress, chainId }) => {
let decimals =
Expand Down
2 changes: 1 addition & 1 deletion packages/explorer-ui/utils/addressToSymbol.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { TOKEN_HASH_MAP } from 'synapse-constants'
import { TOKEN_HASH_MAP } from '@synapsecns/synapse-constants'

export const addressToSymbol = ({ tokenAddress, chainId }) => {
if (
Expand Down
4 changes: 2 additions & 2 deletions packages/explorer-ui/utils/classes/Token.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import _ from 'lodash'
import { CHAINS } from 'synapse-constants'
import { CHAINS } from '@synapsecns/synapse-constants'

const ChainId = CHAINS.ChainId

Expand Down Expand Up @@ -155,7 +155,7 @@ const makeMultiChainObj = (valOrObj) => {
} else {
const obj = {}
for (const [chainName, chainId] of _.entries(ChainId)) {
obj[chainId] = valOrObj
obj[chainId as number] = valOrObj
}
return obj
}
Expand Down
2 changes: 1 addition & 1 deletion packages/explorer-ui/utils/styles/coins.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import {
NOTE,
MIM,
AVWETH,
} from 'synapse-constants'
} from '@synapsecns/synapse-constants'

const COLOR_COIN_MAP = {
gray: [FRAX, GOHM, SDT, VSTA],
Expand Down
2 changes: 1 addition & 1 deletion packages/explorer-ui/utils/styles/networks.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CHAINS } from 'synapse-constants'
import { CHAINS } from '@synapsecns/synapse-constants'

const ChainId = CHAINS.ChainId

Expand Down
2 changes: 1 addition & 1 deletion packages/explorer-ui/utils/urls/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CHAINS } from 'synapse-constants'
import { CHAINS } from '@synapsecns/synapse-constants'

const CHAINS_BY_ID = CHAINS.CHAINS_BY_ID

Expand Down
Loading

0 comments on commit df0e800

Please sign in to comment.