Merge pull request #2597 from decentdao/2593-modal-border

Update modal border
decentdao · Dec 5, 2024 · 3d39078 · 3d39078
2 parents e51e012 + e94f677
commit 3d39078
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/src/components/Roles/RolePaymentDetails.tsx b/src/components/Roles/RolePaymentDetails.tsx
@@ -353,7 +353,7 @@ export function RolePaymentDetails({
                     height={6}
                     borderRadius="lg"
                   >
-                    {t(payment.isCancelling ? 'cancelling' : 'cancelled')}
+                    {t('cancelled')}
                   </Tag>
                 )}
                 <GreenStreamingDot isStreaming={payment.isStreaming()} />

diff --git a/src/components/ui/modals/ModalBase.tsx b/src/components/ui/modals/ModalBase.tsx
@@ -59,9 +59,8 @@ export function ModalBase({
       ) : (
         <ModalContent
           bg="neutral-2"
-          borderWidth="1px"
           borderRadius="0.5rem"
-          borderColor="neutral-4"
+          boxShadow="0px 0px 0px 1px #100414, 0px 0px 0px 1px rgba(248, 244, 252, 0.04) inset, 0px 1px 0px 0px rgba(248, 244, 252, 0.04) inset"
           padding="1.5rem"
           containerProps={
             zIndex

diff --git a/src/i18n/locales/en/proposal.json b/src/i18n/locales/en/proposal.json
@@ -143,6 +143,6 @@
   "pendingProposalNotice": "Pending proposal still processing",
   "metadataFailedParsePlaceholder": "Unknown - Failed to parse metadata",
   "multisigNonceDuplicateErrorMessage": "Transaction with the same nonce already exists",
-  "createFromScratch": "Create from scratch",
+  "createFromScratch": "Start from scratch",
   "browseTemplates": "Browse templates"
 }
diff --git a/src/i18n/locales/en/roles.json b/src/i18n/locales/en/roles.json
@@ -92,7 +92,6 @@
   "roleInfoErrorPaymentScheduleInvalid": "Invalid payment schedule.",
   "cancelPayment": "Cancel Payment",
   "cancelled": "Canceled",
-  "cancelling": "Cancelling",
   "cancelPaymentInfoMessage": "These values can't be edited. To update them, please cancel this payment and create a new one.",
   "cancellingPaymentInfoMessage": "This payment is marked for cancelling and thus can not be edited.",
   "confirmCancelPaymentTitle": "Are you sure you want to cancel this payment?",