diff --git a/tdrive/frontend/src/app/components/file-uploads/pending-root-components/pending-root-list.tsx b/tdrive/frontend/src/app/components/file-uploads/pending-root-components/pending-root-list.tsx
index 18a6a672..9abcdc6d 100644
--- a/tdrive/frontend/src/app/components/file-uploads/pending-root-components/pending-root-list.tsx
+++ b/tdrive/frontend/src/app/components/file-uploads/pending-root-components/pending-root-list.tsx
@@ -59,28 +59,33 @@ const ModalFooter: React.FC<ModalFooterProps> = ({
   cancelUpload,
   isPaused,
   uploadingCount,
-}) => (
-  <div className="w-full flex flex-wrap bg-[#F0F2F3] text-black p-4 items-center justify-between">
-    <div className="w-full flex flex-wrap gap-2 justify-center sm:justify-end">
-      {uploadingCount > 0 && (
+}) => {
+  const pauseResumeBtnTestId = isPaused() ? 'testid:upload-root-modal-pause' : 'testid:upload-root-modal-resume';
+  const cancelCloseBtnTestId = uploadingCount ? 'testid:upload-root-modal-cancel' : 'testid:upload-root-modal-close';
+
+  return (
+    <div className="w-full flex flex-wrap bg-[#F0F2F3] text-black p-4 items-center justify-between">
+      <div className="w-full flex flex-wrap gap-2 justify-center sm:justify-end">
+        {uploadingCount > 0 && (
+          <button
+            className={`text-blue-500 px-4 py-2 rounded bg-transparent transition-all duration-300 ease-in-out 
+            hover:bg-blue-600 hover:text-white w-full sm:w-auto ${pauseResumeBtnTestId}`}
+            onClick={pauseOrResumeUpload}
+          >
+            {isPaused() ? Languages.t('general.resume') : Languages.t('general.pause')}
+          </button>
+        )}
         <button
-          className="text-blue-500 px-4 py-2 rounded bg-transparent transition-all duration-300 ease-in-out 
-          hover:bg-blue-600 hover:text-white w-full sm:w-auto testid:upload-root-modal-pause-resume"
-          onClick={pauseOrResumeUpload}
+          className={`text-blue-500 min-w-[100px] px-4 py-2 rounded bg-transparent transition-all duration-300 ease-in-out 
+          hover:bg-blue-600 hover:text-white w-full sm:w-auto ${cancelCloseBtnTestId}`}
+          onClick={cancelUpload}
         >
-          {isPaused() ? Languages.t('general.resume') : Languages.t('general.pause')}
+          {uploadingCount ? Languages.t('general.cancel') : Languages.t('general.close')}
         </button>
-      )}
-      <button
-        className="text-blue-500 min-w-[100px] px-4 py-2 rounded bg-transparent transition-all duration-300 ease-in-out 
-        hover:bg-blue-600 hover:text-white w-full sm:w-auto testid:upload-root-modal-cancel-close"
-        onClick={cancelUpload}
-      >
-        {uploadingCount ? Languages.t('general.cancel') : Languages.t('general.close')}
-      </button>
+      </div>
     </div>
-  </div>
-);
+  );
+}
 
 const PendingRootList = ({
   roots,
diff --git a/tdrive/frontend/src/app/components/file-uploads/pending-root-components/pending-root-row.tsx b/tdrive/frontend/src/app/components/file-uploads/pending-root-components/pending-root-row.tsx
index eeb99735..62e26683 100644
--- a/tdrive/frontend/src/app/components/file-uploads/pending-root-components/pending-root-row.tsx
+++ b/tdrive/frontend/src/app/components/file-uploads/pending-root-components/pending-root-row.tsx
@@ -116,6 +116,8 @@ const PendingRootRow = ({
     return rootName;
   };
 
+  const showFileFolderTestId = !showFolder || isFileRoot ? 'testid:upload-root-modal-row-show-file' : 'testid:upload-root-modal-row-show-folder';
+
   return (
     <div className="root-row testid:upload-root-modal-row">
       <div className="root-details mt-2">
@@ -141,7 +143,7 @@ const PendingRootRow = ({
             {isUploadCompleted ? (
               <button
                 onClick={handleShowFolder}
-                className="hover:bg-gray-100 p-2 rounded-md transition-all duration-200 testid:upload-root-modal-row-show-folder"
+                className={`hover:bg-gray-100 p-2 rounded-md transition-all duration-200 ${showFileFolderTestId}`}
               >
                 {!isFileRoot && (
                   <>