Updates based on PR review and reword messaging for amount minimum

Author: kjmitchelljr

src/_locales/en/messages.json

@@ -169,7 +169,7 @@
     "message": "Please enter a valid number for the amount."
   },
   "connectWallet_error_amountMinimum": {
-    "message": "An amount greater than $AMOUNT$ is required.",
+    "message": "An amount at least $AMOUNT$ is required.",
     "placeholders": {
       "AMOUNT": { "content": "$1", "example": "$2.05" }
     }

src/background/services/monetization.ts

@@ -434,22 +434,19 @@ export class MonetizationService {
 
     const { oneTimeGrant, recurringGrant, ...dataFromStorage } = storedData;
 
-    // #1071
-    let minSendAmount = '0';
-      if (tab.id) {
-        // If we have a payment manager for this tab, get the min send amount
-        const paymentManager = this.tabState.paymentManagers.get(tab.id);
-        if (paymentManager) {
-          minSendAmount = paymentManager.minSendAmount.toString();
-        }
-      }
+    const minSendAmount = tab.id
+      ? (this.tabState.paymentManagers.get(tab.id)?.minSendAmount?.toString() ??
+        '0')
+      : '0';
 
     return {
       ...dataFromStorage,
       balance: balance.total.toString(),
-      tab: this.tabState.getPopupTabData(tab),
+      tab: {
+        ...this.tabState.getPopupTabData(tab),
+        minSendAmount,
+      },
       transientState: this.storage.getPopupTransientState(),
-      minSendAmount,
       grants: {
         oneTime: oneTimeGrant?.amount,
         recurring: recurringGrant?.amount,

src/background/services/paymentManager.ts

@@ -150,15 +150,11 @@ export class PaymentManager {
     return this.sessions.filter((s) => s.isUsable);
   }
 
-  // bugfix #1071
   get minSendAmount(): bigint {
-    // Check to see if there are any payable sessions
-    if (!this.payableSessions.length) return 0n;
-
-    // NOTE: How is a payable session defined, i.e. are could the minSendAmount be different currencies?
     return this.payableSessions.reduce(
-      (max, session) => session.minSendAmount > max ? session.minSendAmount : max,
-      0n
+      (highestMin, session) =>
+        session.minSendAmount > highestMin ? session.minSendAmount : highestMin,
+      0n,
     );
   }
 

src/background/services/tabState.ts

@@ -122,7 +122,9 @@ export class TabState {
       status = 'monetized';
     }
 
-    return { tabId: tab.id, url, status };
+    const minSendAmount = '0';
+
+    return { tabId: tab.id, url, status, minSendAmount };
   }
 
   getIcon(tabId: TabId) {

src/pages/popup/components/PayWebsiteForm.tsx

@@ -14,7 +14,7 @@ type Errors = Record<ErrorsParams, ErrorInfo | null>;
 export const PayWebsiteForm = () => {
   const t = useTranslation();
   const message = useMessage();
-  const { walletAddress, tab, minSendAmount } = usePopupState();
+  const { walletAddress, tab } = usePopupState();
 
   const toErrorInfo = React.useCallback(
     (err?: string | ErrorWithKeyLike | null): ErrorInfo | null => {
@@ -100,9 +100,8 @@ export const PayWebsiteForm = () => {
         walletAddress={walletAddress}
         amount={amount}
         placeholder="0.00"
-        // #1071
         min={roundWithPrecision(
-          Number(minSendAmount) / 10 ** walletAddress.assetScale,
+          Number(tab.minSendAmount) / 10 ** walletAddress.assetScale,
           walletAddress.assetScale,
         )}
         errorMessage={errors.amount?.message}

src/shared/types.ts

@@ -119,6 +119,7 @@ export type PopupTabInfo = {
      */
     | 'all_sessions_invalid'
     | never; // just added for code formatting
+  minSendAmount: string;
 };
 
 export type PopupTransientState = Partial<{
@@ -140,7 +141,6 @@ export type PopupStore = Omit<
   balance: AmountValue;
   tab: PopupTabInfo;
   transientState: PopupTransientState;
-  minSendAmount: string; // # 1071
   grants?: Partial<{
     oneTime: OneTimeGrant['amount'];
     recurring: RecurringGrant['amount'];