Merge pull request #553 from dappforce/improvement/ui

Fix Grill Widget SetConfig 404 issue
dappforce · Feb 23, 2024 · 56b8573 · 56b8573
2 parents 655e2f0 + 69359e9
commit 56b8573
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/src/components/content-staking/SuperLike.tsx b/src/components/content-staking/SuperLike.tsx
@@ -192,7 +192,7 @@ export default function SuperLike({
         return (
           <div
             {...props}
-            className={cx('flex items-center gap-3', props.className)}
+            className={cx('flex items-center gap-3 text-sm', props.className)}
           >
             {disabledCause ? (
               <PopOver

diff --git a/src/providers/config/ConfigProvider.tsx b/src/providers/config/ConfigProvider.tsx
@@ -1,7 +1,9 @@
+import { env } from '@/env.mjs'
 import { getCurrentUrlOrigin } from '@/utils/links'
 import { sendMessageToParentWindow } from '@/utils/window'
 import { useRouter } from 'next/router'
 import { createContext, useContext, useEffect, useRef, useState } from 'react'
+import urlJoin from 'url-join'
 import { ConfigContextState, getConfig } from './utils'
 
 const ConfigContext = createContext<ConfigContextState>({
@@ -29,16 +31,20 @@ export function ConfigProvider({ children }: { children: any }) {
       if (eventData && eventData.type === 'grill:setConfig') {
         const payload = eventData.payload as string
         const currentPathnameAndQuery = window.location.href.replace(
-          getCurrentUrlOrigin(),
+          urlJoin(getCurrentUrlOrigin(), env.NEXT_PUBLIC_BASE_PATH),
+          ''
+        )
+        const payloadPathname = payload.replace(
+          new RegExp(`^${env.NEXT_PUBLIC_BASE_PATH}`),
           ''
         )
         if (
-          payload &&
-          !payload.startsWith('http') &&
-          payload !== currentPathnameAndQuery
+          payloadPathname &&
+          !payloadPathname.startsWith('http') &&
+          payloadPathname !== currentPathnameAndQuery
         ) {
           sendMessageToParentWindow('isUpdatingConfig', 'true')
-          await push(payload)
+          await push(payloadPathname)
           sendMessageToParentWindow('isUpdatingConfig', 'false')
         }
       }