Skip to content

Commit a2244f0

Browse files
authored
fix: add warning on Transaction History table for MASP txns (#2070)
1 parent 8ae4d5b commit a2244f0

File tree

2 files changed

+65
-53
lines changed

2 files changed

+65
-53
lines changed

apps/namadillo/src/App/Transactions/LocalStorageTransactionCard.tsx

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { TokenCurrency } from "App/Common/TokenCurrency";
44
import { AssetImage } from "App/Transfer/AssetImage";
55
import { isShieldedAddress, isTransparentAddress } from "App/Transfer/common";
66
import clsx from "clsx";
7-
import { FaInfoCircle, FaLock } from "react-icons/fa";
7+
import { FaLock } from "react-icons/fa";
88
import { IoCheckmarkCircleOutline } from "react-icons/io5";
99
import { twMerge } from "tailwind-merge";
1010
import { TransferTransactionData } from "types";
@@ -133,13 +133,6 @@ export const LocalStorageTransactionCard = ({
133133
</div>
134134
}
135135
</h4>
136-
<div className="relative group/tooltip">
137-
<FaInfoCircle className="w-4 h-4 mb-3 mr-4" />
138-
<Tooltip position="left" className="p-2 w-[200px] z-10">
139-
This transaction is stored locally. It may not appear when viewing
140-
your history on other devices.
141-
</Tooltip>
142-
</div>
143136
</div>
144137
</div>
145138
</article>

apps/namadillo/src/App/Transactions/TransactionHistory.tsx

Lines changed: 64 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -151,51 +151,70 @@ export const TransactionHistory = (): JSX.Element => {
151151
<header className="text-sm ml-4 flex-none">
152152
<h2>History</h2>
153153
</header>
154-
<StyledSelectBox
155-
id="transfer-kind-filter"
156-
defaultValue="All"
157-
value={filter}
158-
containerProps={{
159-
className: clsx(
160-
"text-sm min-w-[200px] flex-1 border border-white rounded-sm",
161-
"px-4 py-[9px] ml-4 mt-2"
162-
),
163-
}}
164-
arrowContainerProps={{ className: "right-4" }}
165-
listContainerProps={{
166-
className:
167-
"w-[200px] mt-2 border border-white left-0 ml-4 transform-none",
168-
}}
169-
listItemProps={{
170-
className: "text-sm border-0 py-0 [&_label]:py-1.5",
171-
}}
172-
onChange={(e) => {
173-
setFilter(e.target.value);
174-
setCurrentPage(0);
175-
}}
176-
options={[
177-
{
178-
id: "all",
179-
value: "All",
180-
ariaLabel: "All",
181-
},
182-
{
183-
id: "transfer",
184-
value: "Transfer",
185-
ariaLabel: "Transfer",
186-
},
187-
{
188-
id: "ibc",
189-
value: "IBC",
190-
ariaLabel: "IBC",
191-
},
192-
{
193-
id: "bond",
194-
value: "Bond",
195-
ariaLabel: "Bond",
196-
},
197-
]}
198-
/>
154+
<div className="flex items-center justify-between mx-4 mt-2 gap-4 mb-2">
155+
<StyledSelectBox
156+
id="transfer-kind-filter"
157+
defaultValue="All"
158+
value={filter}
159+
containerProps={{
160+
className: clsx(
161+
"text-sm min-w-[200px] border border-white rounded-sm",
162+
"px-4 py-[9px]"
163+
),
164+
}}
165+
arrowContainerProps={{ className: "right-4" }}
166+
listContainerProps={{
167+
className:
168+
"w-[200px] mt-2 border border-white left-0 transform-none",
169+
}}
170+
listItemProps={{
171+
className: "text-sm border-0 py-0 [&_label]:py-1.5",
172+
}}
173+
onChange={(e) => {
174+
setFilter(e.target.value);
175+
setCurrentPage(0);
176+
}}
177+
options={[
178+
{
179+
id: "all",
180+
value: "All",
181+
ariaLabel: "All",
182+
},
183+
{
184+
id: "transfer",
185+
value: "Transfer",
186+
ariaLabel: "Transfer",
187+
},
188+
{
189+
id: "ibc",
190+
value: "IBC",
191+
ariaLabel: "IBC",
192+
},
193+
{
194+
id: "bond",
195+
value: "Bond",
196+
ariaLabel: "Bond",
197+
},
198+
]}
199+
/>
200+
<div className="flex items-center bg-yellow/10 border border-yellow/30 rounded-sm px-3 py-2 mr-3 text-xs text-yellow-600 dark:text-yellow-400">
201+
<svg
202+
className="w-4 h-4 mr-2 flex-shrink-0"
203+
fill="currentColor"
204+
viewBox="0 0 20 20"
205+
>
206+
<path
207+
fillRule="evenodd"
208+
d="M8.257 3.099c.765-1.36 2.722-1.36 3.486 0l5.58 9.92c.75 1.334-.213 2.98-1.742 2.98H4.42c-1.53 0-2.493-1.646-1.743-2.98l5.58-9.92zM11 13a1 1 0 11-2 0 1 1 0 012 0zm-1-8a1 1 0 00-1 1v3a1 1 0 002 0V6a1 1 0 00-1-1z"
209+
clipRule="evenodd"
210+
/>
211+
</svg>
212+
<span>
213+
Cross-chain shielded transactions are only visible on the
214+
Namadillo where they were created.
215+
</span>
216+
</div>
217+
</div>
199218

200219
<div className="flex flex-col flex-1 overflow-hidden min-h-0">
201220
<div className="flex flex-col flex-1 overflow-auto">

0 commit comments

Comments
 (0)