Fix merge issues

Author: DenverCoder1

Diff for: src/cards/repo-card.js

@@ -18,7 +18,7 @@ import {
 import { repoCardLocales } from "../translations.js";
 
 const ICON_SIZE = 16;
-const DESCRIPTION_LINE_WIDTH = 59;
+const DESCRIPTION_LINE_WIDTH = 42;
 const DESCRIPTION_MAX_LINES = 3;
 
 /**
@@ -91,19 +91,17 @@ const renderRepoCard = (repo, options = {}) => {
     : DESCRIPTION_MAX_LINES;
 
   const desc = parseEmojis(description || "No description provided");
-  const multiLineDescription = show_description ? wrapTextMultiline(
-    desc,
-    DESCRIPTION_LINE_WIDTH,
-    descriptionMaxLines,
-  ) : [];
+  const multiLineDescription = show_description
+    ? wrapTextMultiline(desc, DESCRIPTION_LINE_WIDTH, descriptionMaxLines)
+    : [];
   const descriptionLinesCount = description_lines_count
     ? clampValue(description_lines_count, 1, DESCRIPTION_MAX_LINES)
     : multiLineDescription.length;
   const descriptionSvg = multiLineDescription
     .map((line) => `<tspan dy="1.2em" x="25">${encodeHTML(line)}</tspan>`)
     .join("");
 
-  const height =
+  let height =
     (descriptionLinesCount > 1 ? 120 : 110) +
     descriptionLinesCount * lineHeight;
   if (!show_description) {

Diff for: tests/__snapshots__/renderWakatimeCard.test.js.snap

@@ -87,7 +87,7 @@ exports[`Test Render WakaTime Card should render correctly with compact layout 1
         
       <g
         data-testid="card-title"
-        transform="translate(25, 35)"
+        transform="translate(25, 32)"
       >
         <g transform="translate(0, 0)">
       <text
@@ -169,7 +169,7 @@ exports[`Test Render WakaTime Card should render correctly with compact layout w
         <desc id="descId"></desc>
         <style>
           .header {
-            font: 600 18px 'Segoe UI', Ubuntu, Sans-Serif;
+            font: 600 17px 'Segoe UI', Ubuntu, Sans-Serif;
             fill: #2f80ed;
             animation: fadeInAnimation 0.8s ease-in-out forwards;
           }
@@ -239,7 +239,7 @@ exports[`Test Render WakaTime Card should render correctly with compact layout w
         
       <g
         data-testid="card-title"
-        transform="translate(25, 35)"
+        transform="translate(25, 32)"
       >
         <g transform="translate(0, 0)">
       <text
@@ -254,7 +254,7 @@ exports[`Test Render WakaTime Card should render correctly with compact layout w
 
         <g
           data-testid="main-card-body"
-          transform="translate(0, 55)"
+          transform="translate(0, 52)"
         >
           
     <svg x="0" y="0" width="100%">

Diff for: tests/renderRepoCard.test.js

@@ -69,11 +69,11 @@ describe("Test renderRepoCard", () => {
 
     expect(
       document.getElementsByClassName("description")[0].children[0].textContent,
-    ).toBe("The quick brown fox jumps over the lazy dog is");
+    ).toBe("The quick brown fox jumps over the lazy");
 
     expect(
       document.getElementsByClassName("description")[0].children[1].textContent,
-    ).toBe("an English-language pangram—a sentence");
+    ).toBe("dog is an English-language pangram—a");
 
     // Should not trim
     document.body.innerHTML = renderRepoCard({
@@ -90,7 +90,9 @@ describe("Test renderRepoCard", () => {
     document.body.innerHTML = renderRepoCard(data_repo.repository, {
       show_description: false,
     });
-    expect(document.getElementsByClassName("description")[0]).toHaveTextContent("");
+    expect(document.getElementsByClassName("description")[0]).toHaveTextContent(
+      "",
+    );
   });
 
   it("should render emojis", () => {