@faststore/core 3.98.0-dev.1 → 3.98.0-dev.10

package/public/icons.svg

@@ -1,6 +1,14 @@
 <svg style="display:none">
   <symbol id="ArrowElbowDownRight" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256" fill="currentColor"><rect width="256" height="256" fill="none"></rect><polyline points="160 128 208 176 160 224" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"></polyline><polyline points="64 32 64 176 208 176" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"></polyline></symbol>
 
+  <symbol id="CircleNotch" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 256 256"><path d="M232,128a104,104,0,0,1-208,0c0-41,23.81-78.36,60.66-95.27a8,8,0,0,1,6.68,14.54C60.15,61.59,40,93.27,40,128a88,88,0,0,0,176,0c0-34.73-20.15-66.41-51.34-80.73a8,8,0,0,1,6.68-14.54C208.19,49.64,232,87,232,128Z"></path></symbol>
+
+  <symbol id="Table"  xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 256 256"><path d="M224,48H32a8,8,0,0,0-8,8V192a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A8,8,0,0,0,224,48ZM40,112H80v32H40Zm56,0H216v32H96ZM216,64V96H40V64ZM40,160H80v32H40Zm176,32H96V160H216v32Z"></path></symbol>
+
+  <symbol id="WarningOctagon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" fill="currentColor" viewBox="0 0 256 256"><path d="M120,136V80a8,8,0,0,1,16,0v56a8,8,0,0,1-16,0ZM232,91.55v72.9a15.86,15.86,0,0,1-4.69,11.31l-51.55,51.55A15.86,15.86,0,0,1,164.45,232H91.55a15.86,15.86,0,0,1-11.31-4.69L28.69,175.76A15.86,15.86,0,0,1,24,164.45V91.55a15.86,15.86,0,0,1,4.69-11.31L80.24,28.69A15.86,15.86,0,0,1,91.55,24h72.9a15.86,15.86,0,0,1,11.31,4.69l51.55,51.55A15.86,15.86,0,0,1,232,91.55Zm-16,0L164.45,40H91.55L40,91.55v72.9L91.55,216h72.9L216,164.45ZM128,160a12,12,0,1,0,12,12A12,12,0,0,0,128,160Z"></path></symbol>
+
+  <symbol id="Paperclip" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><rect width="256" height="256" fill="none"/><path d="M80,144H192a16,16,0,0,0,0-32H48a32,32,0,0,0,0,64H192a48,48,0,0,0,0-96H80" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="16"/></symbol>
+
   <symbol id="ArrowLeft" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 256 256"><rect width="256" height="256" fill="none"></rect><line x1="216" y1="128" x2="40" y2="128" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></line><polyline points="112 56 40 128 112 200" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></polyline></symbol>
 
   <symbol id="ArrowRight" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 256 256"><rect width="256" height="256" fill="none"></rect><line x1="40" y1="128" x2="216" y2="128" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></line><polyline points="144 56 216 128 144 200" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></polyline></symbol>
@@ -17,10 +25,24 @@
     <path d="M10.5 50.9443C9.5375 50.9443 8.71364 50.6015 8.02842 49.9159C7.34281 49.2307 7 48.4068 7 47.4443V16.5277C7 15.5652 7.34281 14.7411 8.02842 14.0555C8.71364 13.3703 9.5375 13.0277 10.5 13.0277H16.9167C16.9167 9.99434 17.9569 7.38878 20.0375 5.211C22.1181 3.03322 24.675 1.94434 27.7083 1.94434C30.8552 1.94434 33.5378 3.01378 35.756 5.15267C37.9742 7.29156 39.0833 9.91656 39.0833 13.0277H45.5C46.4625 13.0277 47.2866 13.3703 47.9722 14.0555C48.6574 14.7411 49 15.5652 49 16.5277V47.4443C49 48.4068 48.6574 49.2307 47.9722 49.9159C47.2866 50.6015 46.4625 50.9443 45.5 50.9443H10.5ZM10.5 47.4443H45.5V16.5277H10.5V47.4443ZM28 30.5277C31.0722 30.5277 33.7361 29.3999 35.9917 27.1443C38.2472 24.8888 39.375 22.2249 39.375 19.1527H35.875C35.875 21.2916 35.0972 23.1388 33.5417 24.6943C31.9861 26.2499 30.1389 27.0277 28 27.0277C25.8611 27.0277 24.0139 26.2499 22.4583 24.6943C20.9028 23.1388 20.125 21.2916 20.125 19.1527H16.625C16.625 22.2249 17.7528 24.8888 20.0083 27.1443C22.2639 29.3999 24.9278 30.5277 28 30.5277ZM20.4167 13.0277H35.5833C35.5833 10.8888 34.8542 9.09017 33.3958 7.63184C31.9375 6.1735 30.1389 5.44434 28 5.44434C25.8611 5.44434 24.0625 6.1735 22.6042 7.63184C21.1458 9.09017 20.4167 10.8888 20.4167 13.0277Z" fill="#D6D6D6"/>
   </symbol>
 
+
+  <symbol id="Thrash" xmlns="http://www.w3.org/2000/svg"  fill="currentColor" viewBox="0 0 256 256">
+  <path d="M216,48H176V40a24,24,0,0,0-24-24H104A24,24,0,0,0,80,40v8H40a8,8,0,0,0,0,16h8V208a16,16,0,0,0,16,16H192a16,16,0,0,0,16-16V64h8a8,8,0,0,0,0-16ZM96,40a8,8,0,0,1,8-8h48a8,8,0,0,1,8,8v8H96Zm96,168H64V64H192ZM112,104v64a8,8,0,0,1-16,0V104a8,8,0,0,1,16,0Zm48,0v64a8,8,0,0,1-16,0V104a8,8,0,0,1,16,0Z"></path>
+  </symbol>
+
+<symbol id="CircleWarning" xmlns="http://www.w3.org/2000/svg"  fill="currentColor" viewBox="0 0 256 256">
+<path d="M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm0,192a88,88,0,1,1,88-88A88.1,88.1,0,0,1,128,216Zm-8-80V80a8,8,0,0,1,16,0v56a8,8,0,0,1-16,0Zm20,36a12,12,0,1,1-12-12A12,12,0,0,1,140,172Z"></path>
+</symbol>
+
+  <symbol id="Table"  xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 256 256"><path d="M224,48H32a8,8,0,0,0-8,8V192a16,16,0,0,0,16,16H216a16,16,0,0,0,16-16V56A8,8,0,0,0,224,48ZM40,112H80v32H40Zm56,0H216v32H96ZM216,64V96H40V64ZM40,160H80v32H40Zm176,32H96V160H216v32Z"></path>
+  </symbol>
+
   <symbol id="Bell" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 256 256"><rect width="256" height="256" fill="none"></rect><path d="M56.2,104a71.9,71.9,0,0,1,72.3-72c39.6.3,71.3,33.2,71.3,72.9V112c0,35.8,7.5,56.6,14.1,68a8,8,0,0,1-6.9,12H49a8,8,0,0,1-6.9-12c6.6-11.4,14.1-32.2,14.1-68Z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path><path d="M96,192v8a32,32,0,0,0,64,0v-8" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path></symbol>
 
   <symbol id="BellRinging" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 256 256"><rect width="256" height="256" fill="none"></rect><path d="M56.20305,112a71.80121,71.80121,0,1,1,143.60186,0h0c0,35.81563,7.49325,56.59893,14.093,67.95814A7.999,7.999,0,0,1,207.01628,192H48.98365A7.99908,7.99908,0,0,1,42.103,179.95641c6.60328-11.35959,14.1-32.1426,14.1-67.95641Z" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path><path d="M96,192v8a32,32,0,0,0,64,0v-8" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path><path d="M183.43247,23.98832a104.46641,104.46641,0,0,1,37.91845,42.1156" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path><path d="M34.64909,66.10391A104.46639,104.46639,0,0,1,72.56757,23.98829" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path></symbol>
 
+  <symbol id="AlertFilled" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 256 256"><path d="M128,24A104,104,0,1,0,232,128,104.11,104.11,0,0,0,128,24Zm-8,56a8,8,0,0,1,16,0v56a8,8,0,0,1-16,0Zm8,104a12,12,0,1,1,12-12A12,12,0,0,1,128,184Z"></path></symbol>
+
   <symbol id="Calendar" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 256 256"><rect width="256" height="256" fill="none"></rect><rect x="40" y="40" width="176" height="176" rx="8"  stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" fill="none"></rect><line x1="176" y1="24" x2="176" y2="56" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></line><line x1="80" y1="24" x2="80" y2="56" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></line><line x1="40" y1="88" x2="216" y2="88" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></line><path d="M92,127.99666h28l-16,20a16,16,0,1,1-11.30681,27.3206" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></path><polyline points="144 139.997 160 127.997 160 179.997" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round"></polyline></symbol>
 
   <symbol id="CaretDown" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 256 256"><rect width="256" height="256" fill="none"></rect><polyline points="208 96 128 176 48 96" fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="24"></polyline></symbol>
@@ -257,4 +279,44 @@
   <symbol id="CheckCircle" width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
     <path d="M8.83464 13.8333L14.7096 7.95829L13.543 6.79163L8.83464 11.5L6.45964 9.12496L5.29297 10.2916L8.83464 13.8333ZM10.0013 18.3333C8.84852 18.3333 7.76519 18.1145 6.7513 17.677C5.73741 17.2395 4.85547 16.6458 4.10547 15.8958C3.35547 15.1458 2.76172 14.2638 2.32422 13.25C1.88672 12.2361 1.66797 11.1527 1.66797 9.99996C1.66797 8.84718 1.88672 7.76385 2.32422 6.74996C2.76172 5.73607 3.35547 4.85413 4.10547 4.10413C4.85547 3.35413 5.73741 2.76038 6.7513 2.32288C7.76519 1.88538 8.84852 1.66663 10.0013 1.66663C11.1541 1.66663 12.2374 1.88538 13.2513 2.32288C14.2652 2.76038 15.1471 3.35413 15.8971 4.10413C16.6471 4.85413 17.2409 5.73607 17.6784 6.74996C18.1159 7.76385 18.3346 8.84718 18.3346 9.99996C18.3346 11.1527 18.1159 12.2361 17.6784 13.25C17.2409 14.2638 16.6471 15.1458 15.8971 15.8958C15.1471 16.6458 14.2652 17.2395 13.2513 17.677C12.2374 18.1145 11.1541 18.3333 10.0013 18.3333ZM10.0013 16.6666C11.8624 16.6666 13.4388 16.0208 14.7305 14.7291C16.0221 13.4375 16.668 11.8611 16.668 9.99996C16.668 8.13885 16.0221 6.56246 14.7305 5.27079C13.4388 3.97913 11.8624 3.33329 10.0013 3.33329C8.14019 3.33329 6.5638 3.97913 5.27214 5.27079C3.98047 6.56246 3.33464 8.13885 3.33464 9.99996C3.33464 11.8611 3.98047 13.4375 5.27214 14.7291C6.5638 16.0208 8.14019 16.6666 10.0013 16.6666Z" fill="#015132"/>
   </symbol>
+
+
+  <symbol id="Clip" width="24" height="24" viewBox="0 0 24 24" fill="currentColor" xmlns="http://www.w3.org/2000/svg">
+    <mask id="mask0_480_1752" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="0" y="0" width="24" height="24">
+    <rect width="24" height="24" fill="#D9D9D9"/>
+    </mask>
+    <g mask="url(#mask0_480_1752)">
+    <path d="M18 15.75C18 17.4833 17.3917 18.9583 16.175 20.175C14.9583 21.3917 13.4833 22 11.75 22C10.0167 22 8.54167 21.3917 7.325 20.175C6.10833 18.9583 5.5 17.4833 5.5 15.75V6.5C5.5 5.25 5.9375 4.1875 6.8125 3.3125C7.6875 2.4375 8.75 2 10 2C11.25 2 12.3125 2.4375 13.1875 3.3125C14.0625 4.1875 14.5 5.25 14.5 6.5V15.25C14.5 16.0167 14.2333 16.6667 13.7 17.2C13.1667 17.7333 12.5167 18 11.75 18C10.9833 18 10.3333 17.7333 9.8 17.2C9.26667 16.6667 9 16.0167 9 15.25V6H11V15.25C11 15.4667 11.0708 15.6458 11.2125 15.7875C11.3542 15.9292 11.5333 16 11.75 16C11.9667 16 12.1458 15.9292 12.2875 15.7875C12.4292 15.6458 12.5 15.4667 12.5 15.25V6.5C12.4833 5.8 12.2375 5.20833 11.7625 4.725C11.2875 4.24167 10.7 4 10 4C9.3 4 8.70833 4.24167 8.225 4.725C7.74167 5.20833 7.5 5.8 7.5 6.5V15.75C7.48333 16.9333 7.89167 17.9375 8.725 18.7625C9.55833 19.5875 10.5667 20 11.75 20C12.9167 20 13.9083 19.5875 14.725 18.7625C15.5417 17.9375 15.9667 16.9333 16 15.75V6H18V15.75Z" fill="currentColor"/>
+    </g>
+  </symbol>
+
+  <symbol id="ClipPlus" width="60" height="50" viewBox="0 0 60 50" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g clip-path="url(#clip0_53_3652)">
+    <rect x="13" y="15" width="40" height="36" rx="6" transform="rotate(-9.35048 13 15)" fill="#CBE9FF"/>
+    <rect x="10.75" y="8.75" width="38.5" height="34.5" rx="5.25" fill="white" stroke="black" stroke-width="1.5" stroke-linecap="round"/>
+    <mask id="mask0_53_3652" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="17" y="14" width="24" height="24">
+    <rect x="17" y="14" width="24" height="24" fill="#D9D9D9"/>
+    </mask>
+    <g mask="url(#mask0_53_3652)">
+    <path d="M30.5 35.4802C28.9667 35.4802 27.6667 34.9546 26.6 33.9033C25.5333 32.8521 25 31.5708 25 30.0597V19.7113C25 18.6272 25.3917 17.6991 26.175 16.9271C26.9583 16.1551 27.9 15.769 29 15.769C30.1 15.769 31.0417 16.1551 31.825 16.9271C32.6083 17.6991 33 18.6272 33 19.7113V29.0741C33 29.764 32.7583 30.3471 32.275 30.8235C31.7917 31.2998 31.2 31.538 30.5 31.538C29.8 31.538 29.2083 31.2998 28.725 30.8235C28.2417 30.3471 28 29.764 28 29.0741V19.7113H29.5V29.0741C29.5 29.3533 29.5958 29.5874 29.7875 29.7763C29.9792 29.9652 30.2167 30.0597 30.5 30.0597C30.7833 30.0597 31.0208 29.9652 31.2125 29.7763C31.4042 29.5874 31.5 29.3533 31.5 29.0741V19.7113C31.5 19.0214 31.2583 18.4383 30.775 17.9619C30.2917 17.4856 29.7 17.2474 29 17.2474C28.3 17.2474 27.7083 17.4856 27.225 17.9619C26.7417 18.4383 26.5 19.0214 26.5 19.7113V30.0597C26.5 31.1438 26.8917 32.0718 27.675 32.8439C28.4583 33.6159 29.4 34.0019 30.5 34.0019C31.6 34.0019 32.5417 33.6159 33.325 32.8439C34.1083 32.0718 34.5 31.1438 34.5 30.0597V19.7113H36V30.0597C36 31.5708 35.4667 32.8521 34.4 33.9033C33.3333 34.9546 32.0333 35.4802 30.5 35.4802Z" fill="black"/>
+    </g>
+    <mask id="mask1_53_3652" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="-2" y="-2" width="25" height="25">
+    <rect x="-1.90356" y="-1.63379" width="24" height="24" fill="#D9D9D9"/>
+    </mask>
+    <g mask="url(#mask1_53_3652)">
+    <circle cx="10.6" cy="9.96621" r="9.6" fill="white"/>
+    <path d="M9.7 14.7666H11.5V10.8666H15.4V9.06658H11.5V5.16658H9.7V9.06658H5.8V10.8666H9.7V14.7666ZM10.6069 19.5666C9.28563 19.5666 8.04167 19.3166 6.875 18.8166C5.70833 18.3166 4.6875 17.6291 3.8125 16.7541C2.9375 15.8791 2.25 14.8586 1.75 13.6926C1.25 12.5266 1 11.2808 1 9.95513C1 8.62943 1.25 7.38741 1.75 6.22908C2.25 5.07074 2.9375 4.05408 3.8125 3.17908C4.6875 2.30408 5.70798 1.61658 6.87395 1.11658C8.03993 0.616577 9.28577 0.366577 10.6115 0.366577C11.9372 0.366577 13.1792 0.616577 14.3375 1.11658C15.4958 1.61658 16.5125 2.30408 17.3875 3.17908C18.2625 4.05408 18.95 5.07261 19.45 6.23468C19.95 7.39676 20.2 8.63843 20.2 9.95968C20.2 11.2809 19.95 12.5249 19.45 13.6916C18.95 14.8582 18.2625 15.8791 17.3875 16.7541C16.5125 17.6291 15.494 18.3166 14.3319 18.8166C13.1698 19.3166 11.9282 19.5666 10.6069 19.5666ZM10.6 17.7666C12.7667 17.7666 14.6083 17.0082 16.125 15.4916C17.6417 13.9749 18.4 12.1332 18.4 9.96658C18.4 7.79991 17.6417 5.95824 16.125 4.44158C14.6083 2.92491 12.7667 2.16658 10.6 2.16658C8.43333 2.16658 6.59167 2.92491 5.075 4.44158C3.55833 5.95824 2.8 7.79991 2.8 9.96658C2.8 12.1332 3.55833 13.9749 5.075 15.4916C6.59167 17.0082 8.43333 17.7666 10.6 17.7666Z" fill="#0366DD"/>
+    </g>
+    </g>
+    <defs>
+    <clipPath id="clip0_53_3652">
+    <rect width="60" height="50" fill="white"/>
+    </clipPath>
+    </defs>
+  </symbol>
+
+  <symbol id="Inventory" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" fill="currentColor">
+    <path d="M11 19.425V12.575L5 9.1V15.95L11 19.425ZM13 19.425L19 15.95V9.1L13 12.575V19.425ZM11 21.725L4 17.7C3.68333 17.5167 3.4375 17.275 3.2625 16.975C3.0875 16.675 3 16.3417 3 15.975V8.025C3 7.65833 3.0875 7.325 3.2625 7.025C3.4375 6.725 3.68333 6.48333 4 6.3L11 2.275C11.3167 2.09167 11.65 2 12 2C12.35 2 12.6833 2.09167 13 2.275L20 6.3C20.3167 6.48333 20.5625 6.725 20.7375 7.025C20.9125 7.325 21 7.65833 21 8.025V15.975C21 16.3417 20.9125 16.675 20.7375 16.975C20.5625 17.275 20.3167 17.5167 20 17.7L13 21.725C12.6833 21.9083 12.35 22 12 22C11.65 22 11.3167 21.9083 11 21.725ZM16 8.525L17.925 7.425L12 4L10.05 5.125L16 8.525ZM12 10.85L13.95 9.725L8.025 6.3L6.075 7.425L12 10.85Z"/>
+  </symbol>
+
 </svg>

package/src/components/ThirdPartyScripts/index.ts

@@ -1 +1,2 @@
 export { default } from './ThirdPartyScripts'
+export { useShoppingAssistant } from './useShoppingAssistant'

package/src/components/ThirdPartyScripts/useShoppingAssistant.tsx

@@ -0,0 +1,30 @@
+import type { RefObject } from 'react'
+import { useEffect } from 'react'
+
+const SHOPPING_ASSISTANT_SCRIPT_URL = 'https://cdn.cloud.weni.ai/agentic-cx.js'
+
+/**
+ * Injects the Shopping Assistant script when the hook runs, unless third-party scripts are disabled.
+ * @param containerRef - Optional ref to an HTMLElement. When provided, the script is appended inside this container (e.g. inside the ShoppingAssistant section). Otherwise the script is appended to document.head.
+ * Must be used in a component rendered in the body (not inside Next.js Head) so that useEffect runs on the client.
+ */
+export function useShoppingAssistant(
+  containerRef?: RefObject<HTMLElement | null>
+): void {
+  useEffect(() => {
+    if (process.env.DISABLE_3P_SCRIPTS) return
+
+    const script = document.createElement('script')
+    script.src = SHOPPING_ASSISTANT_SCRIPT_URL
+    const container = containerRef?.current
+    if (container) {
+      container.appendChild(script)
+    } else {
+      document.head.appendChild(script)
+    }
+
+    return () => {
+      script.remove()
+    }
+  }, [containerRef])
+}

package/src/components/account/MyAccountDrawer/OrganizationDrawer/OrganizationDrawer.tsx

@@ -11,6 +11,7 @@ import storeConfig from '../../../../../discovery.config'
 import { ProfileSummary } from '../ProfileSummary/ProfileSummary'
 import { OrganizationDrawerBody } from './OrganizationDrawerBody'
 import { OrganizationDrawerHeader } from './OrganizationDrawerHeader'
+import { setReloadAfterLogoutReturn } from './useReloadAfterLogoutReturn'
 import styles from './section.module.scss'
 
 type OrganizationDrawerProps = {
@@ -27,6 +28,7 @@ const clearBrowserStorageForCurrentDomain = async () => {
     const sessionStorageKeys = [
       'faststore_session_ready',
       'faststore_auth_cookie_value',
+      'faststore_person_id',
       'faststore_cache_bust_last_value',
     ]
 
@@ -53,6 +55,25 @@ const clearBrowserStorageForCurrentDomain = async () => {
     } catch {}
   } catch {}
 
+  // Clear IndexedDB: remove session key first (avoids blocked when DB has open connections),
+  // then delete the whole keyval-store
+  try {
+    if ('indexedDB' in window) {
+      const { del } = await import('idb-keyval')
+      await del('fs::session').catch(() => {})
+    }
+
+    const idb = window.indexedDB
+    if (idb) {
+      await new Promise<void>((resolve) => {
+        const req = idb.deleteDatabase('keyval-store')
+        req.onsuccess = () => resolve()
+        req.onerror = () => resolve()
+        req.onblocked = () => resolve()
+      })
+    }
+  } catch {}
+
   // Clear all cookies containing 'vtex' in the name (case-insensitive)
   try {
     const hostname = window.location.hostname
@@ -80,21 +101,6 @@ const clearBrowserStorageForCurrentDomain = async () => {
       }
     }
   } catch {}
-
-  // Clear IndexedDB (keyval-store)
-  try {
-    if (!('indexedDB' in window)) return
-
-    const idb = window.indexedDB
-    if (!idb) return
-
-    await new Promise<void>((resolve) => {
-      const req = idb.deleteDatabase('keyval-store')
-      req.onsuccess = () => resolve()
-      req.onerror = () => resolve()
-      req.onblocked = () => resolve()
-    })
-  } catch {}
 }
 
 export const doLogout = async (_event?: unknown) => {
@@ -104,16 +110,19 @@ export const doLogout = async (_event?: unknown) => {
     // Clear client-side storage (sessionStorage, localStorage, IndexedDB, non-HttpOnly cookies)
     await clearBrowserStorageForCurrentDomain()
 
-    // Clear HttpOnly cookies via API endpoint (server-side)
+    // Clear HttpOnly cookies via API endpoint (server-side).
+    // Must await and consume the response so Set-Cookie headers are fully processed before redirect.
     try {
-      await fetch('/api/fs/logout', {
+      const res = await fetch('/api/fs/logout', {
         method: 'POST',
         credentials: 'include',
       })
+      await res.json().catch((): null => null)
     } catch {
-      // Continue even if API call fails
+      // Continue even if API call fails (e.g. network error)
     }
   } finally {
+    setReloadAfterLogoutReturn()
     window.location.assign(
       `${storeConfig.secureSubdomain}/api/vtexid/pub/logout?scope=${storeConfig.api.storeId}&returnUrl=${storeConfig.storeUrl}`
     )

package/src/components/account/MyAccountDrawer/OrganizationDrawer/useReloadAfterLogoutReturn.ts

@@ -0,0 +1,75 @@
+import { useEffect } from 'react'
+
+/**
+ * When the user logs out from the OrganizationDrawer, we redirect to VTEX ID logout
+ * and then return to the store. We need to reload so session-dependent data
+ * (e.g. ProductShelf) and caches are fresh. This module ties that reload to the drawer flow.
+ *
+ * The return can happen in two ways:
+ * 1) bfcache restore: user hits Back or browser restores from cache → pageshow with persisted=true
+ * 2) Fresh load: VTEX ID redirects back → new navigation, persisted=false
+ *
+ * We handle both: check the flag on mount (fresh load) and on pageshow (bfcache).
+ */
+
+export const RELOAD_AFTER_LOGOUT_KEY = 'faststore_reload_after_logout_return'
+
+/**
+ * Call before redirecting to logout. When the user returns to the store, the app
+ * will reload once so session state and caches are fresh.
+ */
+export const setReloadAfterLogoutReturn = (): void => {
+  if (typeof sessionStorage === 'undefined') return
+  try {
+    sessionStorage.setItem(RELOAD_AFTER_LOGOUT_KEY, '1')
+  } catch {
+    // Ignore
+  }
+}
+
+const RELOAD_DELAY_MS = 1000
+
+/**
+ * Forces a full navigation with cache-busting param instead of reload().
+ * Bypasses disk cache by changing the URL, ensuring fresh HTML and API responses.
+ */
+const forceRefreshWithoutCache = (): void => {
+  const url = new URL(window.location.href)
+  url.searchParams.set('_', Date.now().toString())
+  window.location.replace(url.toString())
+}
+
+const checkAndReloadIfReturnedFromLogout = (): void => {
+  try {
+    if (sessionStorage.getItem(RELOAD_AFTER_LOGOUT_KEY)) {
+      sessionStorage.removeItem(RELOAD_AFTER_LOGOUT_KEY)
+      setTimeout(forceRefreshWithoutCache, RELOAD_DELAY_MS)
+    }
+  } catch {
+    // Ignore.
+  }
+}
+
+/**
+ * Hook to use in _app. Ensures a full reload when the user returns from logout
+ * (either via bfcache or fresh redirect), so data matches the new session.
+ */
+export const useReloadAfterLogoutReturn = (): void => {
+  useEffect(() => {
+    if (typeof window === 'undefined') return
+
+    // 1) On mount: handles fresh load return (VTEX ID redirect). pageshow with persisted=false
+    //    means we never get the event for that case, so we must check here.
+    checkAndReloadIfReturnedFromLogout()
+
+    // 2) On pageshow with persisted: handles bfcache restore
+    const onPageShow = (event: PageTransitionEvent) => {
+      if (event.persisted) {
+        checkAndReloadIfReturnedFromLogout()
+      }
+    }
+
+    window.addEventListener('pageshow', onPageShow)
+    return () => window.removeEventListener('pageshow', onPageShow)
+  }, [])
+}

package/src/components/cms/global/Components.ts

@@ -36,6 +36,13 @@ const RegionSlider = dynamic(
     ),
   { ssr: false }
 )
+const ShoppingAssistant = dynamic(
+  () =>
+    import(
+      /* webpackChunkName: "ShoppingAssistant" */ 'src/components/sections/ShoppingAssistant'
+    ),
+  { ssr: false }
+)
 
 const COMPONENTS: Record<string, ComponentType<any>> = {
   [getComponentKey(Alert, 'Alert')]: Alert,
@@ -46,6 +53,7 @@ const COMPONENTS: Record<string, ComponentType<any>> = {
   [getComponentKey(RegionModal, 'RegionModal')]: RegionModal, // out of viewport
   [getComponentKey(RegionSlider, 'RegionSlider')]: RegionSlider, // out of viewport
   [getComponentKey(Footer, 'Footer')]: Footer, // out of viewport
+  [getComponentKey(ShoppingAssistant, 'ShoppingAssistant')]: ShoppingAssistant,
   ...PLUGINS_COMPONENTS,
   ...CUSTOM_COMPONENTS,
 }

package/src/components/product/ProductGrid/ProductGrid.tsx

@@ -48,6 +48,22 @@ interface Props {
    * Title for the `ProductGrid` component that will be send to GA events.
    */
   title?: string
+  searchId?: string
+  /**
+   * Function that returns optional external porps for each product summary.
+   * The returned key/value pairs will be spread onto the corresponding section element.
+   *
+   * @example
+   * buildExtraProductProps={(product, index, searchId) => ({
+   *   'data-af-category': product.category || 'unknown',
+   *   'data-af-index': String(index),
+   * })}
+   */
+  buildExtraProductProps?: (
+    product: Record<string, any>,
+    index: number,
+    searchId: string
+  ) => Record<string, string | number | boolean>
 }
 
 function ProductGrid({
@@ -64,6 +80,8 @@ function ProductGrid({
   shouldShowComparison,
   compareLabel,
   title,
+  searchId,
+  buildExtraProductProps = () => ({}),
 }: Props) {
   const { isMobile } = useScreenResize()
   const { __experimentalProductCard: ProductCard } =
@@ -77,7 +95,11 @@ function ProductGrid({
       aspectRatio={aspectRatio}
       loading={products.length === 0}
     >
-      <UIProductGrid>
+      <UIProductGrid
+        data-af-element={searchId && 'search-result'}
+        data-af-onimpression={!!searchId}
+        data-af-search-id={searchId}
+      >
         {isGridWithViewportObserver ? (
           // In mobile, the ProductGrid initially renders the first 2 items, the rest of the items are rendered when they come into the viewport.
           <>
@@ -108,6 +130,7 @@ function ProductGrid({
                     index={pageSize * page + idx + 1}
                     taxesConfiguration={taxesConfiguration}
                     sponsoredLabel={sponsoredLabel}
+                    {...buildExtraProductProps(product, idx, searchId)}
                   />
                 </ProductSentinel>
               </UIProductGridItem>
@@ -140,6 +163,7 @@ function ProductGrid({
                       index={pageSize * page + idx + 1}
                       taxesConfiguration={taxesConfiguration}
                       sponsoredLabel={sponsoredLabel}
+                      {...buildExtraProductProps(product, idx, searchId)}
                     />
                   </ProductSentinel>
                 </UIProductGridItem>
@@ -175,6 +199,7 @@ function ProductGrid({
                     index={pageSize * page + idx + 1}
                     taxesConfiguration={taxesConfiguration}
                     sponsoredLabel={sponsoredLabel}
+                    {...buildExtraProductProps(product, idx, searchId)}
                   />
                 </ProductSentinel>
               </UIProductGridItem>

package/src/components/search/SearchDropdown/SearchDropdown.tsx

@@ -48,7 +48,7 @@ function SearchDropdown({
   ...otherProps
 }: SearchDropdownProps) {
   const {
-    values: { onSearchSelection, products, term, terms },
+    values: { onSearchSelection, products, term, terms, searchId },
   } = useSearch()
 
   return (
@@ -92,7 +92,11 @@ function SearchDropdown({
           />
         ))}
       </UISearchAutoComplete>
-      <SearchProducts>
+      <SearchProducts
+        data-af-element={searchId && 'search-autocomplete'}
+        data-af-onimpression={!!searchId}
+        data-af-search-id={searchId}
+      >
         {products.map((product, index) => {
           const productParsed = product as ProductSummary_ProductFragment
           return (
@@ -104,6 +108,11 @@ function SearchDropdown({
               onChangeCustomSearchDropdownVisible={
                 onChangeCustomSearchDropdownVisible
               }
+              data-af-element={searchId && 'search-autocomplete'}
+              data-af-onclick={!!(searchId && productParsed.id)}
+              data-af-search-id={searchId}
+              data-af-product-position={searchId && index + 1} // Product position in Search Analytics starts with 1
+              data-af-product-id={searchId && productParsed.id}
             />
           )
         })}