From 044e6077a7707b9648c4a6bc0be5dc0ea75011a7 Mon Sep 17 00:00:00 2001
From: Nur Fikri <codingki@gmail.com>
Date: Thu, 12 Dec 2024 09:17:56 +0700
Subject: [PATCH] try to fix workflow

---
 .github/workflows/sync-staging.yml         | 18 +++---------------
 packages/widget/src/devMode/loadWidget.tsx | 15 ---------------
 2 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/sync-staging.yml b/.github/workflows/sync-staging.yml
index e2ed3247a..cf68df68b 100644
--- a/.github/workflows/sync-staging.yml
+++ b/.github/workflows/sync-staging.yml
@@ -19,21 +19,9 @@ jobs:
         with:
           ref: staging
 
-      - id: configure
-        name: configure
-        run: git config pull.ff true
-
-      - id: pull-main
-        name: Pull latest 'main'
-        run: git pull --ff-only origin main
-
-      - id: diff-check
-        name: Check if 'staging' is behind 'main'
-        run: git diff --exit-code origin/main
-
-      - id: fast-forward
-        name: Fast forward 'main' → 'staging'
-        run: git merge --ff-only origin/main
+      - id: merge-main-to-staging
+        name: Merge 'main' → 'staging'
+        run: git merge --no-ff main
 
       - id: push-staging
         name: Push latest 'staging'
diff --git a/packages/widget/src/devMode/loadWidget.tsx b/packages/widget/src/devMode/loadWidget.tsx
index dc47bc6e2..ca472cb53 100644
--- a/packages/widget/src/devMode/loadWidget.tsx
+++ b/packages/widget/src/devMode/loadWidget.tsx
@@ -46,21 +46,6 @@ const DevMode = () => {
             routeConfig={{
               goFast: true,
             }}
-          // // @ts-expect-error - testing
-          // connectedAddress={{
-          //   "cosmoshub-4": "address",
-          //   "1": "0xaddress",
-          //   "solana": "address",
-          // }}
-          // getCosmosSigner={(chainId) => {
-          //   return getSigner(chainId)
-          // }}
-          // getEVMSigner={(chainId) => {
-          //   return getSigner(chainId)
-          // }}
-          // getSVMSigner={(chainId) => {
-          //   return getSigner(chainId)
-          // }}
           />
         </div>
       </Row>