Merge pull request #12 from StreetSupport/staging

Merge staging into main. Bugfixing

Author: o-seliuchenko

.github/workflows/test-and-deploy.yml

@@ -36,18 +36,6 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v3
 
-      - name: Trigger Vercel Deployment
-        env:
-          VERCEL_DEPLOY_HOOK: ${{ secrets.VERCEL_DEPLOY_HOOK }}
-        run: |
-          if [ -n "$VERCEL_DEPLOY_HOOK" ]; then
-            echo "🚀 Triggering Vercel deployment after successful tests..."
-            curl -X POST "$VERCEL_DEPLOY_HOOK"
-            echo "✅ Vercel deployment triggered successfully"
-          else
-            echo "⚠️  VERCEL_DEPLOY_HOOK not configured - skipping deployment"
-          fi
-        
       - name: Set deployment status
         uses: actions/github-script@v7
         with:

src/app/sentry-example-page/page.tsx

@@ -157,7 +157,7 @@ export default function ActivateBannerModal({ banner, isOpen, onClose, onActivat
                 <FormField label="Activation Type">
                   <div className="space-y-2">
                     <label className="flex items-center">
-                      <Input
+                      <input
                         type="radio"
                         value="immediate"
                         checked={activationType === 'immediate'}
@@ -169,7 +169,7 @@ export default function ActivateBannerModal({ banner, isOpen, onClose, onActivat
                       </span>
                     </label>
                     <label className="flex items-center">
-                      <Input
+                      <input
                         type="radio"
                         value="scheduled"
                         checked={activationType === 'scheduled'}

src/components/banners/ActivateBannerModal.tsx

@@ -592,7 +592,7 @@ export function BannerEditor({ initialData, onDataChange, onSave, saving = false
             <FormField label="Upload file or provide link to file">
               <div className="flex gap-6">
                 <label className="flex items-center gap-2 cursor-pointer">
-                  <Input
+                  <input
                     type="radio"
                     name="resourceFileMode"
                     value={ResourceFileMode.UPLOAD}
@@ -603,7 +603,7 @@ export function BannerEditor({ initialData, onDataChange, onSave, saving = false
                   <span className="text-sm text-brand-k">Upload file</span>
                 </label>
                 <label className="flex items-center gap-2 cursor-pointer">
-                  <Input
+                  <input
                     type="radio"
                     name="resourceFileMode"
                     value={ResourceFileMode.MANUAL}
@@ -1197,9 +1197,9 @@ export function BannerEditor({ initialData, onDataChange, onSave, saving = false
                       onClick={() => removeCTAButton(index)}
                       title='Remove button'
                       disabled={index === 0 && formData.TemplateType === BannerTemplateType.RESOURCE_PROJECT}
-                      className={index === 0 && formData.TemplateType === BannerTemplateType.RESOURCE_PROJECT ? 'opacity-50 cursor-not-allowed' : ''}
+                      className={index === 0 && formData.TemplateType === BannerTemplateType.RESOURCE_PROJECT ? 'opacity-50 cursor-not-allowed' : 'p-2 hover:bg-brand-g hover:bg-opacity-10 rounded-full transition-colors'}
                     >
-                      <Trash className="h-4 w-4" />
+                      <Trash className="w-4 h-4 text-brand-g" />
                     </Button>
                   </div>
                   <div className="mt-2">

src/components/banners/BannerEditor.tsx

@@ -157,7 +157,7 @@ export default function ActivateSwepModal({ swep, isOpen, onClose, onActivate }:
                 <FormField label="Activation Type">
                   <div className="space-y-2">
                     <label className="flex items-center">
-                      <Input
+                      <input
                         type="radio"
                         value="immediate"
                         checked={activationType === 'immediate'}
@@ -169,7 +169,7 @@ export default function ActivateSwepModal({ swep, isOpen, onClose, onActivate }:
                       </span>
                     </label>
                     <label className="flex items-center">
-                      <Input
+                      <input
                         type="radio"
                         value="scheduled"
                         checked={activationType === 'scheduled'}