Fixes for release v1.37.0

lib/contexts/rewards.tsx

@@ -138,7 +138,7 @@ export function RewardsContextProvider({ children }: Props) {
   // Save the API token to cookies and state
   const saveApiToken = useCallback((token: string | undefined) => {
     if (token) {
-      cookies.set(cookies.NAMES.REWARDS_API_TOKEN, token);
+      cookies.set(cookies.NAMES.REWARDS_API_TOKEN, token, { expires: 365 });
     } else {
       cookies.remove(cookies.NAMES.REWARDS_API_TOKEN);
     }

lib/mixpanel/index.ts

@@ -1,6 +1,7 @@
 import getPageType from './getPageType';
 import getUuid from './getUuid';
 import logEvent from './logEvent';
+import reset from './reset';
 import useInit from './useInit';
 import useLogPageView from './useLogPageView';
 import * as userProfile from './userProfile';
@@ -13,4 +14,5 @@ export {
   getPageType,
   getUuid,
   userProfile,
+  reset,
 };

lib/mixpanel/reset.ts

@@ -0,0 +1,10 @@
+import mixpanel from 'mixpanel-browser';
+
+import config from 'configs/app';
+
+export default function reset() {
+  if (!config.features.mixpanel.isEnabled) {
+    return;
+  }
+  mixpanel.reset();
+}

lib/web3/wagmiConfig.ts

@@ -31,6 +31,7 @@ const wagmi = (() => {
     projectId: feature.walletConnect.projectId,
     ssr: true,
     batch: { multicall: { wait: 100 } },
+    syncConnectedChain: false,
   });
 
   return { config: wagmiAdapter.wagmiConfig, adapter: wagmiAdapter };

mocks/address/tabCounters.ts

@@ -1,7 +1,7 @@
 import type { AddressTabsCounters } from 'types/api/address';
 
 export const base: AddressTabsCounters = {
-  internal_txs_count: 13,
+  internal_transactions_count: 13,
   logs_count: 51,
   token_balances_count: 3,
   token_transfers_count: 3,

stubs/address.ts

@@ -48,7 +48,7 @@ export const ADDRESS_COUNTERS: AddressCounters = {
 };
 
 export const ADDRESS_TABS_COUNTERS: AddressTabsCounters = {
-  internal_txs_count: 10,
+  internal_transactions_count: 10,
   logs_count: 10,
   token_balances_count: 10,
   token_transfers_count: 10,

types/api/address.ts

@@ -191,7 +191,7 @@ export type AddressWithdrawalsItem = {
 };
 
 export type AddressTabsCounters = {
-  internal_txs_count: number | null;
+  internal_transactions_count: number | null;
   logs_count: number | null;
   token_balances_count: number | null;
   token_transfers_count: number | null;

types/api/verifiedContracts.ts

@@ -1,5 +1,5 @@
 export interface VerifiedContractsSorting {
-  sort: 'balance' | 'txs_count';
+  sort: 'balance' | 'transactions_count';
   order: 'asc' | 'desc';
 }
 

ui/address/contract/ContractSourceAddressSelector.tsx

@@ -60,7 +60,7 @@ const ContractSourceAddressSelector = ({ className, selectedItem, onItemSelect,
       <Select
         options={ options }
         name="contract-source-address"
-        defaultValue={ options[0].value }
+        defaultValue={ selectedItem.address }
         onChange={ handleItemSelect }
         isLoading={ isLoading }
         maxW={{ base: '180px', lg: 'none' }}

ui/blocks/BlocksTableItem.tsx

@@ -136,7 +136,7 @@ const BlocksTableItem = ({ data, isLoading, enableTimeIncrement }: Props) => {
       ) }
       { !isRollup && !config.UI.views.block.hiddenFields?.base_fee && Boolean(baseFeeValue) && (
         <Td fontSize="sm" isNumeric>
-          <Skeleton isLoaded={ !isLoading } display="inline-block">
+          <Skeleton isLoaded={ !isLoading } display="inline-block" whiteSpace="pre-wrap" wordBreak="break-word">
             { baseFeeValue }
           </Skeleton>
         </Td>

ui/pages/Address.tsx

@@ -206,7 +206,7 @@ const AddressPageContent = () => {
       {
         id: 'internal_txns',
         title: 'Internal txns',
-        count: addressTabsCountersQuery.data?.internal_txs_count,
+        count: addressTabsCountersQuery.data?.internal_transactions_count,
         component: <AddressInternalTxs scrollRef={ tabsScrollRef } shouldRender={ !isTabsLoading } isQueryEnabled={ areQueriesEnabled }/>,
       },
       addressTabsCountersQuery.data?.celo_election_rewards_count ? {

ui/snippets/auth/useLogout.ts

@@ -34,11 +34,13 @@ export default function useLogout() {
 
       if (config.features.rewards.isEnabled) {
         const rewardsToken = cookies.get(cookies.NAMES.REWARDS_API_TOKEN);
-        await apiFetch('rewards_logout', { fetchParams: {
-          method: 'POST',
-          headers: { Authorization: `Bearer ${ rewardsToken }` },
-        } });
-        cookies.remove(cookies.NAMES.REWARDS_API_TOKEN);
+        if (rewardsToken) {
+          await apiFetch('rewards_logout', { fetchParams: {
+            method: 'POST',
+            headers: { Authorization: `Bearer ${ rewardsToken }` },
+          } });
+          cookies.remove(cookies.NAMES.REWARDS_API_TOKEN);
+        }
       }
 
       queryClient.resetQueries({
@@ -51,6 +53,7 @@ export default function useLogout() {
       });
 
       mixpanel.logEvent(mixpanel.EventTypes.ACCOUNT_ACCESS, { Action: 'Logged out' }, { send_immediately: true });
+      mixpanel.reset();
 
       if (
         PROTECTED_ROUTES.includes(router.pathname) ||

ui/txs/sortTxs.ts

@@ -13,6 +13,12 @@ export default function sortTxs(sorting: TransactionsSortingValue | undefined) {
         return compareBns(tx2.fee.value || 0, tx1.fee.value || 0);
       case 'fee-asc':
         return compareBns(tx1.fee.value || 0, tx2.fee.value || 0);
+      case 'block_number-asc': {
+        if (tx1.block_number && tx2.block_number) {
+          return tx1.block_number - tx2.block_number;
+        }
+        return 0;
+      }
       default:
         return 0;
     }

ui/txs/useTxsSort.tsx

@@ -15,6 +15,7 @@ export const SORT_OPTIONS: Array<SelectOption<TransactionsSortingValue>> = [
   { label: 'Value descending', value: 'value-desc' },
   { label: 'Fee ascending', value: 'fee-asc' },
   { label: 'Fee descending', value: 'fee-desc' },
+  { label: 'Block number ascending', value: 'block_number-asc' },
 ];
 
 type SortingValue = TransactionsSortingValue | undefined;

ui/verifiedContracts/VerifiedContractsTable.tsx

@@ -40,8 +40,14 @@ const VerifiedContractsTable = ({ data, sort, setSorting, isLoading }: Props) =>
             </Link>
           </Th>
           <Th width="130px" isNumeric>
-            <Link display="flex" alignItems="center" justifyContent="flex-end" onClick={ isLoading ? undefined : onSortToggle('txs_count') } columnGap={ 1 }>
-              { sort?.includes('txs_count') && <IconSvg name="arrows/east" boxSize={ 4 } transform={ sortIconTransform }/> }
+            <Link
+              display="flex"
+              alignItems="center"
+              justifyContent="flex-end"
+              onClick={ isLoading ? undefined : onSortToggle('transactions_count') }
+              columnGap={ 1 }
+            >
+              { sort?.includes('transactions_count') && <IconSvg name="arrows/east" boxSize={ 4 } transform={ sortIconTransform }/> }
               Txs
             </Link>
           </Th>

ui/verifiedContracts/utils.ts

@@ -5,11 +5,11 @@ export const SORT_OPTIONS: Array<SelectOption<VerifiedContractsSortingValue>> =
   { label: 'Default', value: undefined },
   { label: 'Balance descending', value: 'balance-desc' },
   { label: 'Balance ascending', value: 'balance-asc' },
-  { label: 'Txs count descending', value: 'txs_count-desc' },
-  { label: 'Txs count ascending', value: 'txs_count-asc' },
+  { label: 'Txs count descending', value: 'transactions_count-desc' },
+  { label: 'Txs count ascending', value: 'transactions_count-asc' },
 ];
 
 export const SORT_SEQUENCE: Record<VerifiedContractsSortingField, Array<VerifiedContractsSortingValue | undefined>> = {
   balance: [ 'balance-desc', 'balance-asc', undefined ],
-  txs_count: [ 'txs_count-desc', 'txs_count-asc', undefined ],
+  transactions_count: [ 'transactions_count-desc', 'transactions_count-asc', undefined ],
 };