Skip to content

Commit

Permalink
chore: merge rc into main (#833)
Browse files Browse the repository at this point in the history
  • Loading branch information
ItsANameToo authored Nov 25, 2024
2 parents 72c9cec + ff57333 commit 049e7a4
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 16 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "arkvault",
"version": "1.19.0",
"version": "1.19.1",
"engines": {
"node": ">=20.12.2"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -471,7 +471,7 @@ exports[`PageSkeleton > should render without profile 1`] = `
class="h-10 w-10 bg-theme-secondary-100 dark:bg-theme-secondary-800"
/>
<div
class="mr-1.5 pr-1.5 text-theme-secondary-700 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-600 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
class="mr-1.5 pr-1.5 text-theme-secondary-300 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-800 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
height="16"
width="16"
>
Expand Down Expand Up @@ -512,7 +512,7 @@ exports[`PageSkeleton > should render without profile 1`] = `
class="h-10 w-10 bg-theme-secondary-100 dark:bg-theme-secondary-800"
/>
<div
class="mr-1.5 pr-1.5 text-theme-secondary-700 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-600 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
class="mr-1.5 pr-1.5 text-theme-secondary-300 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-800 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
height="16"
width="16"
>
Expand Down
2 changes: 1 addition & 1 deletion src/domains/profile/components/ProfileRow/ProfileRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export const ProfileRowSkeleton = () => (
<div className="h-10 w-10 bg-theme-secondary-100 dark:bg-theme-secondary-800" />
<Icon
name="EllipsisVerticalFilled"
className="mr-1.5 pr-1.5 text-theme-secondary-700 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-600 dark:group-hover:text-theme-secondary-200"
className="mr-1.5 pr-1.5 text-theme-secondary-300 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-800 dark:group-hover:text-theme-secondary-200"
size="md"
/>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ exports[`ProfileSliderSkeleton > should render 1`] = `
class="h-10 w-10 bg-theme-secondary-100 dark:bg-theme-secondary-800"
/>
<div
class="mr-1.5 pr-1.5 text-theme-secondary-700 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-600 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
class="mr-1.5 pr-1.5 text-theme-secondary-300 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-800 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
height="16"
width="16"
>
Expand Down Expand Up @@ -55,7 +55,7 @@ exports[`ProfileSliderSkeleton > should render 1`] = `
class="h-10 w-10 bg-theme-secondary-100 dark:bg-theme-secondary-800"
/>
<div
class="mr-1.5 pr-1.5 text-theme-secondary-700 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-600 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
class="mr-1.5 pr-1.5 text-theme-secondary-300 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-800 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
height="16"
width="16"
>
Expand Down Expand Up @@ -96,7 +96,7 @@ exports[`ProfileSliderSkeleton > should render 1`] = `
class="h-10 w-10 bg-theme-secondary-100 dark:bg-theme-secondary-800"
/>
<div
class="mr-1.5 pr-1.5 text-theme-secondary-700 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-600 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
class="mr-1.5 pr-1.5 text-theme-secondary-300 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-800 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
height="16"
width="16"
>
Expand Down Expand Up @@ -137,7 +137,7 @@ exports[`ProfileSliderSkeleton > should render 1`] = `
class="h-10 w-10 bg-theme-secondary-100 dark:bg-theme-secondary-800"
/>
<div
class="mr-1.5 pr-1.5 text-theme-secondary-700 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-600 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
class="mr-1.5 pr-1.5 text-theme-secondary-300 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-800 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
height="16"
width="16"
>
Expand Down Expand Up @@ -178,7 +178,7 @@ exports[`ProfileSliderSkeleton > should render 1`] = `
class="h-10 w-10 bg-theme-secondary-100 dark:bg-theme-secondary-800"
/>
<div
class="mr-1.5 pr-1.5 text-theme-secondary-700 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-600 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
class="mr-1.5 pr-1.5 text-theme-secondary-300 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-800 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
height="16"
width="16"
>
Expand Down Expand Up @@ -230,7 +230,7 @@ exports[`ProfileSliderSkeleton > should render with dots 1`] = `
class="h-10 w-10 bg-theme-secondary-100 dark:bg-theme-secondary-800"
/>
<div
class="mr-1.5 pr-1.5 text-theme-secondary-700 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-600 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
class="mr-1.5 pr-1.5 text-theme-secondary-300 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-800 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
height="16"
width="16"
>
Expand Down Expand Up @@ -271,7 +271,7 @@ exports[`ProfileSliderSkeleton > should render with dots 1`] = `
class="h-10 w-10 bg-theme-secondary-100 dark:bg-theme-secondary-800"
/>
<div
class="mr-1.5 pr-1.5 text-theme-secondary-700 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-600 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
class="mr-1.5 pr-1.5 text-theme-secondary-300 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-800 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
height="16"
width="16"
>
Expand Down Expand Up @@ -312,7 +312,7 @@ exports[`ProfileSliderSkeleton > should render with dots 1`] = `
class="h-10 w-10 bg-theme-secondary-100 dark:bg-theme-secondary-800"
/>
<div
class="mr-1.5 pr-1.5 text-theme-secondary-700 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-600 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
class="mr-1.5 pr-1.5 text-theme-secondary-300 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-800 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
height="16"
width="16"
>
Expand Down Expand Up @@ -353,7 +353,7 @@ exports[`ProfileSliderSkeleton > should render with dots 1`] = `
class="h-10 w-10 bg-theme-secondary-100 dark:bg-theme-secondary-800"
/>
<div
class="mr-1.5 pr-1.5 text-theme-secondary-700 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-600 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
class="mr-1.5 pr-1.5 text-theme-secondary-300 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-800 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
height="16"
width="16"
>
Expand Down Expand Up @@ -394,7 +394,7 @@ exports[`ProfileSliderSkeleton > should render with dots 1`] = `
class="h-10 w-10 bg-theme-secondary-100 dark:bg-theme-secondary-800"
/>
<div
class="mr-1.5 pr-1.5 text-theme-secondary-700 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-600 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
class="mr-1.5 pr-1.5 text-theme-secondary-300 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-800 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
height="16"
width="16"
>
Expand Down Expand Up @@ -474,7 +474,7 @@ exports[`ProfileSliderSkeleton > should render with length 1`] = `
class="h-10 w-10 bg-theme-secondary-100 dark:bg-theme-secondary-800"
/>
<div
class="mr-1.5 pr-1.5 text-theme-secondary-700 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-600 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
class="mr-1.5 pr-1.5 text-theme-secondary-300 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-800 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
height="16"
width="16"
>
Expand Down Expand Up @@ -515,7 +515,7 @@ exports[`ProfileSliderSkeleton > should render with length 1`] = `
class="h-10 w-10 bg-theme-secondary-100 dark:bg-theme-secondary-800"
/>
<div
class="mr-1.5 pr-1.5 text-theme-secondary-700 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-600 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
class="mr-1.5 pr-1.5 text-theme-secondary-300 transition-colors duration-200 group-hover:text-theme-navy-700 dark:text-theme-secondary-800 dark:group-hover:text-theme-secondary-200 css-v0ob3f"
height="16"
width="16"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ const DateRangeOptions = ({ isDisabled }: { isDisabled: boolean }) => {
return (
<FormField name="dateRange">
<Dropdown
wrapperClass="z-50"
variant="options"
data-testid="TransactionExportForm--daterange-options"
options={options}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ const SelectDelimiter = ({ value, onSelect }: { value: CsvDelimiter; onSelect?:
return (
<FormField name="delimiter">
<Dropdown
wrapperClass="z-50"
data-testid="TransactionExportForm--delimiter-options"
options={delimiterOptions.options}
onSelect={(option) => onSelect?.(option.value as CsvDelimiter)}
Expand Down

0 comments on commit 049e7a4

Please sign in to comment.