fix: solve merge conflicts

Author: aerodeval

desk/src/components/Settings/Telephony/Telephony.vue

@@ -38,60 +38,6 @@
         <div class="flex-1 flex flex-col">
           <!-- General -->
           <div
-<<<<<<< HEAD
-            class="flex flex-col gap-1.5"
-            v-if="telephonyAgent.doc && twilio.doc.enabled"
-          >
-            <FormControl
-              label="Twilio number"
-              type="text"
-              required
-              v-model="telephonyAgent.doc.twilio_number"
-            />
-            <ErrorMessage :message="twilioErrors.number" />
-          </div>
-          <div
-            class="flex flex-col gap-1.5"
-            v-if="telephonyAgent.doc && exotel.doc.enabled"
-          >
-            <FormControl
-              label="Exotel number"
-              type="text"
-              required
-              v-model="telephonyAgent.doc.exotel_number"
-            />
-            <ErrorMessage :message="exotelErrors.number" />
-          </div>
-          <div
-            class="flex flex-col gap-1.5"
-            v-if="telephonyAgent.doc && exotel.doc.enabled"
-          >
-            <FormControl
-              :label="__('Personal mobile no')"
-              type="text"
-              required
-              v-model="telephonyAgent.doc.mobile_no"
-              :description="__('Required for exotel integration')"
-            />
-            <ErrorMessage :message="exotelErrors.mobileNo" />
-          </div>
-        </div>
-        <div class="mt-6" v-if="twilio?.doc">
-          <div class="text-base font-semibold text-ink-gray-8">Twilio</div>
-          <div class="mt-4">
-            <div class="grid grid-cols-2 gap-4">
-              <Checkbox
-                :label="__('Enabled')"
-                v-model="twilio.doc.enabled"
-                @update:modelValue="twilio.doc.enabled = $event ? 1 : 0"
-              />
-              <Checkbox
-                :label="__('Record Calls')"
-                v-model="twilio.doc.record_calls"
-                v-if="twilio.doc.enabled"
-                @update:modelValue="twilio.doc.record_calls = $event ? 1 : 0"
-              />
-=======
             class="flex items-center justify-between gap-8 py-3 hover:bg-gray-50 rounded px-2"
           >
             <div class="flex flex-col">
@@ -101,7 +47,6 @@
               <div class="text-p-sm text-ink-gray-5">
                 {{ __("Default calling medium for logged in user") }}
               </div>
->>>>>>> 15b246e3 (Merge pull request #2969 from aerodeval/fix/-fix-ui-inconsistency)
             </div>
             <div class="flex items-center gap-2">
               <!-- <Select

desk/src/components/layouts/layoutSettings.ts

@@ -8,8 +8,6 @@ import { __ } from "@/translation";
 
 export const agentPortalSidebarOptions = [
   {
-<<<<<<< HEAD
-=======
     label: __("Home"),
     icon: LucideHome,
     to: "Home",
@@ -20,7 +18,6 @@ export const agentPortalSidebarOptions = [
     to: "Dashboard"
   },
   {
->>>>>>> 15b246e3 (Merge pull request #2969 from aerodeval/fix/-fix-ui-inconsistency)
     label: __("Tickets"),
     icon: LucideTicket,
     to: "TicketsAgent",

desk/src/components/view-controls/QuickFilters.vue

@@ -1,10 +1,6 @@
 <template>
   <FadedScrollableDiv
-<<<<<<< HEAD
     class="quick-filters flex flex-1 items-center -ml-1 overflow-x-auto py-1 gap-2 pr-4"
-=======
-    class="flex flex-1 items-center -ml-1 overflow-x-scroll py-1 gap-2"
->>>>>>> 15b246e3 (Merge pull request #2969 from aerodeval/fix/-fix-ui-inconsistency)
     orientation="horizontal"
     v-if="!quickFilters.loading"
   >

desk/src/pages/dashboard/Dashboard.vue

@@ -211,14 +211,11 @@ import {
 } from "frappe-ui";
 const { isMobileView } = useScreenSize();
 import { computed, h, onMounted, reactive, ref, watch } from "vue";
-<<<<<<< HEAD
-=======
 import { __ } from "@/translation";
 import LucideBuilding2 from "~icons/lucide/building-2";
 import LucideUser from "~icons/lucide/user";
 import { useScreenSize } from "@/composables/screen";
 import { useStorage } from "@vueuse/core";
->>>>>>> 15b246e3 (Merge pull request #2969 from aerodeval/fix/-fix-ui-inconsistency)
 
 interface NumberCardData {
   title: string;

desk/src/pages/ticket/TicketAgent.vue

@@ -70,11 +70,8 @@ import { createResource, toast, usePageMeta } from "frappe-ui";
 import { computed, onBeforeUnmount, onMounted, provide, ref, watch } from "vue";
 import { useRoute } from "vue-router";
 import { showCommentBox, showEmailBox } from "./modalStates";
-<<<<<<< HEAD
-=======
 import TicketIcon from "@/components/icons/TicketIcon.vue";
 
->>>>>>> 15b246e3 (Merge pull request #2969 from aerodeval/fix/-fix-ui-inconsistency)
 const telephonyStore = useTelephonyStore();
 
 const { $socket } = globalStore();

desk/src/pages/ticket/Tickets.vue

@@ -412,26 +412,6 @@ const viewActions = (view) => {
           class: "h-4 w-4",
         }),
         onClick: () => {
-<<<<<<< HEAD
-          const newView = {
-            name: _view.name,
-            public: !_view.public,
-          };
-
-          if (_view.public) {
-            $dialog({
-              title: __("Make {0} private?", [_view.label]),
-              message: __(
-                "This view is currently public. Changing it to private will hide it for all the users."
-              ),
-              actions: [
-                {
-                  label: __("Confirm"),
-                  variant: "solid",
-                  onClick({ close }) {
-                    close();
-                    updateView(newView);
-=======
           toggleViewVisibility(
             _view,
             __("Hide view from sidebar"),
@@ -511,7 +491,6 @@ const viewActions = (view) => {
                       handleSuccess(__("deleted"));
                       close();
                     },
->>>>>>> 15b246e3 (Merge pull request #2969 from aerodeval/fix/-fix-ui-inconsistency)
                   },
                 },
               ],

package.json

@@ -3,19 +3,8 @@
 	"scripts": {
 		"postinstall": "cd desk && yarn install",
 		"dev": "cd desk && yarn dev",
-<<<<<<< HEAD
 		"build": "cd desk && yarn build"
 	},
-=======
-		"build": "cd desk && yarn build",
-		"disable-workspaces": "sed -i '' 's/\"workspaces\"/\"aworkspaces\"/g' package.json",
-		"enable-workspaces": "sed -i '' 's/\"aworkspaces\"/\"workspaces\"/g' package.json && rm -rf node_modules ./desk/node_modules/ frappe-ui/node_modules/ && yarn install"
-	},
-	"workspaces": [
-		"desk",
-		"frappe-ui"
-	],
->>>>>>> 15b246e3 (Merge pull request #2969 from aerodeval/fix/-fix-ui-inconsistency)
 	"resolutions": {
 		"cheerio": "1.0.0-rc.12",
 		"prosemirror-model": "1.25.4"