sync develop <-> main

.github/workflows/deploy-sanity-studio.yml

@@ -3,6 +3,14 @@ name: Deploy Sanity Studio
 on:
   workflow_dispatch:
     inputs:
+      ref:
+        description: 'Choose branch: develop for draft preview, main for production release (same dataset)'
+        required: true
+        default: 'main'
+        type: choice
+        options:
+          - main
+          - develop
       environment:
         description: 'Deployment environment'
         required: true
@@ -27,12 +35,12 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          ref: main
+          ref: ${{ inputs.ref }}
 
-      - name: Use Node.js 20
+      - name: Use Node.js 22
         uses: actions/setup-node@v4
         with:
-          node-version: 20
+          node-version: 22
           cache: 'npm'
           cache-dependency-path: trustvc-cms/package-lock.json
 
@@ -41,8 +49,14 @@ jobs:
 
       # Non-interactive deploy: token from Manage → Project → API (SANITY_AUTH_TOKEN env is required in CI)
       - name: Deploy Sanity Studio
-        run: SANITY_AUTH_TOKEN=${{ secrets.SANITY_AUTH_TOKEN }} npm run deploy
+        run: |
+          if [ -z "${SANITY_STUDIO_HOSTNAME}" ]; then
+            echo "SANITY_STUDIO_HOSTNAME secret is not set" >&2
+            exit 1
+          fi
+          npm run deploy -- --yes --url "${SANITY_STUDIO_HOSTNAME}"
         env:
           SANITY_AUTH_TOKEN: ${{ secrets.SANITY_AUTH_TOKEN }}
           SANITY_STUDIO_PROJECT_ID: ${{ secrets.SANITY_STUDIO_PROJECT_ID }}
           SANITY_STUDIO_DATASET: ${{ secrets.SANITY_STUDIO_DATASET }}
+          SANITY_STUDIO_HOSTNAME: ${{ secrets.SANITY_STUDIO_HOSTNAME }}

.github/workflows/deploy-trustvc-website.yml

@@ -11,14 +11,6 @@ on:
         options:
           - main
           - develop
-      environment:
-        description: 'Deployment environment'
-        required: true
-        default: 'development'
-        type: choice
-        options:
-          - development
-          - production
 
 permissions:
   contents: read

src/components/AssetManagementPanel/AssetManagementApplication/AssetManagementApplication.test.tsx

@@ -17,6 +17,7 @@ const mockRejectTransferOwner = vi.fn()
 const mockRejectTransferHolder = vi.fn()
 const mockRejectTransferOwnerHolder = vi.fn()
 const mockSetShowEndorsementChain = vi.fn()
+const mockResetProviders = vi.fn()
 
 // Mock useTokenInformationContext
 const mockUseTokenInformationContext = vi.fn()
@@ -138,6 +139,7 @@ describe('AssetManagementApplication', () => {
       rejectTransferHolderState: 'INITIALIZED',
       rejectTransferOwnerHolder: mockRejectTransferOwnerHolder,
       rejectTransferOwnerHolderState: 'INITIALIZED',
+      resetProviders: mockResetProviders,
     })
   })
 
@@ -349,6 +351,7 @@ describe('AssetManagementApplication', () => {
         rejectTransferHolderState: 'INITIALIZED',
         rejectTransferOwnerHolder: mockRejectTransferOwnerHolder,
         rejectTransferOwnerHolderState: 'INITIALIZED',
+        resetProviders: mockResetProviders,
       })
 
       render(<AssetManagementApplication {...defaultTransferableProps} />)

src/components/AssetManagementPanel/AssetManagementApplication/index.tsx

@@ -92,6 +92,7 @@ export const AssetManagementApplication: FunctionComponent<
     // reject transfer owner holder
     rejectTransferOwnerHolder,
     rejectTransferOwnerHolderState,
+    resetProviders,
   } = useTokenInformationContext()
   const [assetManagementAction, setAssetManagementAction] =
     useState<AssetManagementActions>(AssetManagementActions.None)
@@ -118,7 +119,9 @@ export const AssetManagementApplication: FunctionComponent<
         : v5RoleHash.RestorerRole,
   })
 
-  const onDestroyToken = (remarks: string = '0x') => {
+  const onDestroyToken = (
+    { remarks }: { remarks: string } = { remarks: '0x' }
+  ) => {
     destroyToken({ tokenId, remarks })
   }
 
@@ -130,9 +133,10 @@ export const AssetManagementApplication: FunctionComponent<
 
   const onSetFormAction = useCallback(
     (assetManagementActions: AssetManagementActions) => {
+      resetProviders()
       setAssetManagementAction(assetManagementActions)
     },
-    [setAssetManagementAction]
+    [setAssetManagementAction, resetProviders]
   )
 
   // Initialize the token information context with tokenId and tokenRegistryAddress

src/components/AssetManagementPanel/AssetManagementForm/AssetManagementForm.tsx

@@ -56,7 +56,7 @@ interface TransferActions {
 interface ReturnToIssuerActions {
   onReturnToIssuer: ({ remarks }: { remarks: string }) => void
   returnToIssuerState: string
-  onDestroyToken: (remarks: string) => void
+  onDestroyToken: ({ remarks }: { remarks: string }) => void
   destroyTokenState: string
   onRestoreToken: ({ remarks }: { remarks: string }) => void
   restoreTokenState: string
@@ -192,7 +192,10 @@ export const AssetManagementForm: FunctionComponent<
       rejectTransferOwnerHolderState === FormState.PENDING_CONFIRMATION ||
       rejectTransferOwnerState === FormState.PENDING_CONFIRMATION ||
       rejectTransferHolderState === FormState.PENDING_CONFIRMATION ||
-      transferOwnerHoldersState === FormState.PENDING_CONFIRMATION
+      transferOwnerHoldersState === FormState.PENDING_CONFIRMATION ||
+      destroyTokenState === FormState.PENDING_CONFIRMATION ||
+      restoreTokenState === FormState.PENDING_CONFIRMATION ||
+      returnToIssuerState === FormState.PENDING_CONFIRMATION
     )
       return
     onSetFormAction(AssetManagementActions.None)
@@ -204,6 +207,9 @@ export const AssetManagementForm: FunctionComponent<
     rejectTransferOwnerHolderState,
     rejectTransferOwnerState,
     rejectTransferHolderState,
+    destroyTokenState,
+    restoreTokenState,
+    returnToIssuerState,
     onSetFormAction,
   ])