Merge branch 'main' into cs-7837-make-fitted-view-spec

Author: FadhlanR

packages/host/tests/acceptance/code-submode-test.ts

@@ -1865,6 +1865,9 @@ module('Acceptance | code submode tests', function (_hooks) {
 
       await click('[data-test-select-card-type]');
       await waitFor('[data-test-card-catalog-modal]');
+      await waitFor(
+        `[data-test-card-type-icon]`,
+      );
       await percySnapshot(assert);
       let cardCatalogModalOverlay = document.querySelector(
         '[data-test-card-catalog-modal]',

packages/host/tests/acceptance/code-submode/create-file-test.gts

@@ -855,6 +855,7 @@ export class FieldThatExtendsFromBigInt extends BigInteger {
     test<TestContextWithSave>('can create a new definition that extends card definition which uses default export', async function (assert) {
       assert.expect(1);
       await visitOperatorMode();
+      await waitFor(`[data-test-card-type-icon]`);
       await openNewFileModal('Card Definition');
 
       // select card type

packages/host/tests/acceptance/operator-mode-acceptance-test.gts

@@ -544,6 +544,9 @@ module('Acceptance | operator mode tests', function (hooks) {
             'the last known good state of the instance is displayed',
           );
 
+        await waitFor(
+          `[data-cards-grid-item="${testRealmURL}person-entry"] [data-test-card-type-icon]`,
+        );
         await percySnapshot(assert);
         await click(
           `[data-test-cards-grid-item="${testRealmURL}Person/fadhlan"]`,