From d3e2c4c1c4ca80ae42abb78373571ea8ab939e49 Mon Sep 17 00:00:00 2001 From: enesozturk Date: Wed, 11 Dec 2024 16:29:32 +0300 Subject: [PATCH 1/3] refactor: initialize the theme state on page load --- .../app/fonts/NewAmsterdam-Regular.ttf | Bin 73764 -> 0 bytes apps/builder/lib/constants.ts | 19 ++------ apps/builder/lib/fonts.ts | 46 +++--------------- apps/builder/lib/theme-store.ts | 20 ++++---- .../providers/appkit-context-provider.tsx | 3 +- apps/builder/providers/appkit-provider.tsx | 1 + 6 files changed, 26 insertions(+), 63 deletions(-) delete mode 100644 apps/builder/app/fonts/NewAmsterdam-Regular.ttf diff --git a/apps/builder/app/fonts/NewAmsterdam-Regular.ttf b/apps/builder/app/fonts/NewAmsterdam-Regular.ttf deleted file mode 100644 index 124a9cc150eb40d7fe48f86e09dec56957124027..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 73764 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

Akqo4Pj1H(qC*fRh^%7WN+6K-ynv#;L8fOXK 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 diff --git a/apps/builder/lib/constants.ts b/apps/builder/lib/constants.ts index dfa32e2745..3016d9116b 100644 --- a/apps/builder/lib/constants.ts +++ b/apps/builder/lib/constants.ts @@ -1,13 +1,4 @@ -import { - notoSans, - inter, - domine, - ebGaramond, - breeSerif, - teko, - bellota, - newAmsterdam -} from '@/lib/fonts' +import { notoSans, inter, domine, ebGaramond, breeSerif, bellota } from '@/lib/fonts' export const ACCENT_COLORS = ['#3B82F6', '#EF4444', '#F59E0B', '#10B981'] export const BG_COLORS = ['#202020', '#363636', '#FFFFFF'] @@ -17,16 +8,14 @@ export const RADIUS_NAME_VALUE_MAP = { S: '1px', M: '2px', L: '4px', - XL: '6px' + XL: '8px' } export const FONT_OPTIONS = [ - { label: 'Noto Sans', value: notoSans.style.fontFamily }, { label: 'Inter', value: inter.style.fontFamily }, + { label: 'Noto Sans', value: notoSans.style.fontFamily }, { label: 'Domine', value: domine.style.fontFamily }, { label: 'EB Garamond', value: ebGaramond.style.fontFamily }, { label: 'Bree Serif', value: breeSerif.style.fontFamily }, - { label: 'Teko', value: teko.style.fontFamily }, - { label: 'Bellota', value: bellota.style.fontFamily }, - { label: 'New Amsterdam', value: newAmsterdam.style.fontFamily } + { label: 'Bellota', value: bellota.style.fontFamily } ] diff --git a/apps/builder/lib/fonts.ts b/apps/builder/lib/fonts.ts index d85feaea64..b200569882 100644 --- a/apps/builder/lib/fonts.ts +++ b/apps/builder/lib/fonts.ts @@ -1,14 +1,4 @@ -import { - Noto_Sans, - Inter, - Domine, - EB_Garamond, - Bree_Serif, - Teko, - Bellota, - Delius, - Agbalumo -} from 'next/font/google' +import { Noto_Sans, Inter, Domine, EB_Garamond, Bree_Serif, Bellota } from 'next/font/google' import localFont from 'next/font/local' export const khTeka = localFont({ @@ -36,25 +26,22 @@ export const khTeka = localFont({ ] }) -export const newAmsterdam = localFont({ - src: [{ path: '../app/fonts/NewAmsterdam-Regular.ttf', weight: '400', style: 'normal' }] -}) - export const inter = Inter({ subsets: ['latin'], - weight: ['400', '500'], - style: ['normal'] + weight: ['400', '500', '600', '700'], + style: ['normal'], + display: 'swap' }) export const domine = Domine({ subsets: ['latin'], - weight: ['400', '500'], + weight: ['400', '500', '600', '700'], style: ['normal'] }) export const ebGaramond = EB_Garamond({ subsets: ['latin'], - weight: ['400', '500'], + weight: ['400', '500', '600', '700'], style: ['normal'] }) @@ -64,30 +51,13 @@ export const breeSerif = Bree_Serif({ style: ['normal'] }) -export const teko = Teko({ - subsets: ['latin'], - weight: ['400', '500'], - style: ['normal'] -}) - export const bellota = Bellota({ subsets: ['latin'], - weight: ['400'], + weight: ['300', '400', '700'], style: ['normal'] }) - export const notoSans = Noto_Sans({ subsets: ['latin'], - weight: ['400', '500'], + weight: ['400', '500', '600', '700'], style: ['normal'] }) - -export const delius = Delius({ - subsets: ['latin'], - weight: '400' -}) - -export const agbalumo = Agbalumo({ - subsets: ['latin'], - weight: '400' -}) diff --git a/apps/builder/lib/theme-store.ts b/apps/builder/lib/theme-store.ts index 3d429cef75..b871391ee6 100644 --- a/apps/builder/lib/theme-store.ts +++ b/apps/builder/lib/theme-store.ts @@ -1,3 +1,4 @@ +import { inter } from '@/lib/fonts' import { urlStateUtils } from '@/lib/url-state' import { AppKit } from '@reown/appkit' import { ThemeVariables } from '@reown/appkit-core' @@ -20,12 +21,21 @@ export const state = proxy({ borderRadius: '2px', themeVariables: {}, modal: undefined, - fontFamily: '' + fontFamily: inter.style.fontFamily }) export const ThemeStore = { state, + initializeThemeVariables(value: ThemeState['themeVariables']) { + state.mixColorStrength = value['--w3m-color-mix-strength'] || 0 + state.mixColor = value['--w3m-color-mix'] || '' + state.accentColor = value['--w3m-accent'] || '' + state.borderRadius = value['--w3m-border-radius-master'] || '2px' + state.fontFamily = value['--w3m-font-family'] || inter.style.fontFamily + state.themeVariables = value + }, + setMixColorStrength(value: ThemeState['mixColorStrength']) { state.mixColorStrength = value if (state.modal) { @@ -58,14 +68,6 @@ export const ThemeStore = { } }, - setThemeVariables(value: ThemeState['themeVariables']) { - state.themeVariables = value - if (state.modal) { - state.modal.setThemeVariables(value) - urlStateUtils.updateURLWithState({ themeVariables: value }) - } - }, - setFontFamily(value: ThemeState['fontFamily']) { state.fontFamily = value if (state.modal) { diff --git a/apps/builder/providers/appkit-context-provider.tsx b/apps/builder/providers/appkit-context-provider.tsx index c9c0875590..559490608e 100644 --- a/apps/builder/providers/appkit-context-provider.tsx +++ b/apps/builder/providers/appkit-context-provider.tsx @@ -10,6 +10,7 @@ import { useSnapshot } from 'valtio' import { UniqueIdentifier } from '@dnd-kit/core' import { defaultCustomizationConfig } from '@/lib/config' import { useTheme } from 'next-themes' +import { inter } from '@/lib/fonts' interface AppKitProviderProps { children: ReactNode @@ -101,7 +102,7 @@ export const ContextProvider: React.FC = ({ children }) => ThemeStore.setMixColor(variables['--w3m-color-mix'] || '') ThemeStore.setMixColorStrength(variables['--w3m-color-mix-strength'] || 0) ThemeStore.setBorderRadius(variables['--w3m-border-radius-master'] || '2px') - ThemeStore.setFontFamily(variables['--w3m-font-family'] || '') + ThemeStore.setFontFamily(variables['--w3m-font-family'] || inter.style.fontFamily) } function resetConfigs() { diff --git a/apps/builder/providers/appkit-provider.tsx b/apps/builder/providers/appkit-provider.tsx index 1df581d74a..98eb83c774 100644 --- a/apps/builder/providers/appkit-provider.tsx +++ b/apps/builder/providers/appkit-provider.tsx @@ -43,6 +43,7 @@ export const modal = createAppKit({ }) ThemeStore.setModal(modal) +ThemeStore.initializeThemeVariables(initialConfig?.themeVariables || {}) export function AppKitProvider({ children, From 45180ddd308fdb8b7316a4c88c5a498fef5996aa Mon Sep 17 00:00:00 2001 From: enesozturk Date: Wed, 11 Dec 2024 16:29:40 +0300 Subject: [PATCH 2/3] chore: hide go back when in embedded mode --- packages/scaffold-ui/src/partials/w3m-header/index.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/scaffold-ui/src/partials/w3m-header/index.ts b/packages/scaffold-ui/src/partials/w3m-header/index.ts index 4c126032c5..f7d82b429f 100644 --- a/packages/scaffold-ui/src/partials/w3m-header/index.ts +++ b/packages/scaffold-ui/src/partials/w3m-header/index.ts @@ -209,11 +209,13 @@ export class W3mHeader extends LitElement { private leftHeaderTemplate() { const { view } = RouterController.state const isConnectHelp = view === 'Connect' + const isEmbeddedEnable = OptionsController.state.enableEmbedded const isApproveTransaction = view === 'ApproveTransaction' const isConnectingSIWEView = view === 'ConnectingSiwe' const isAccountView = view === 'Account' - const shouldHideBack = isApproveTransaction || isConnectingSIWEView + const shouldHideBack = + isApproveTransaction || isConnectingSIWEView || (isConnectHelp && isEmbeddedEnable) if (isAccountView) { return html` Date: Wed, 11 Dec 2024 16:33:02 +0300 Subject: [PATCH 3/3] chore: changeset --- .changeset/soft-eggs-glow.md | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .changeset/soft-eggs-glow.md diff --git a/.changeset/soft-eggs-glow.md b/.changeset/soft-eggs-glow.md new file mode 100644 index 0000000000..5c5b8dad51 --- /dev/null +++ b/.changeset/soft-eggs-glow.md @@ -0,0 +1,23 @@ +--- +'@reown/appkit-scaffold-ui': patch +'@apps/builder': patch +'@reown/appkit-adapter-ethers': patch +'@reown/appkit-adapter-ethers5': patch +'@reown/appkit-adapter-solana': patch +'@reown/appkit-adapter-wagmi': patch +'@reown/appkit': patch +'@reown/appkit-utils': patch +'@reown/appkit-cdn': patch +'@reown/appkit-cli': patch +'@reown/appkit-common': patch +'@reown/appkit-core': patch +'@reown/appkit-experimental': patch +'@reown/appkit-polyfills': patch +'@reown/appkit-siwe': patch +'@reown/appkit-siwx': patch +'@reown/appkit-ui': patch +'@reown/appkit-wallet': patch +'@reown/appkit-wallet-button': patch +--- + +Hides the go back button on header when embedded mode is enabled