mobile: release nits draft (#1256)

* release nits * wip * rebase * revert history op
daimo-eth · Aug 10, 2024 · 1620e6c · 1620e6c
1 parent 072e57d
commit 1620e6c
Show file tree

Hide file tree

Showing 9 changed files with 66 additions and 29 deletions.
diff --git a/apps/daimo-mobile/src/view/screen/history/HistoryOpBottomSheet.tsx b/apps/daimo-mobile/src/view/screen/history/HistoryOpBottomSheet.tsx
@@ -8,9 +8,9 @@ import {
   amountToDollars,
   getAccountName,
   getChainDisplayName,
-  getDAv2Chain,
   getDisplayFromTo,
   getSynthesizedMemo,
+  getDAv2Chain,
   tryOrNull,
 } from "@daimo/common";
 import { ChainConfig, daimoChainFromId } from "@daimo/contract";

diff --git a/apps/daimo-mobile/src/view/screen/send/CoinDisplay.tsx b/apps/daimo-mobile/src/view/screen/send/CoinDisplay.tsx
@@ -3,17 +3,16 @@ import {
   ForeignToken,
   arbitrum,
   arbitrumSepolia,
-  arbitrumUSDC,
   base,
   baseSepolia,
   baseUSDC,
   getChainDisplayName,
   optimism,
   optimismSepolia,
-  optimismUSDC,
   polygon,
   polygonAmoy,
-  polygonUSDC,
+  getSupportedSendPairs,
+  SendPair,
 } from "@daimo/common";
 import {
   Image,
@@ -32,12 +31,8 @@ import IconPolygon from "../../../../assets/logos/poly-logo.png";
 import { useAccount } from "../../../logic/accountManager";
 import { color, ss } from "../../shared/style";
 
-type SendPair = {
-  chain: DAv2Chain;
-  coin: ForeignToken;
-};
-
 // Get the logo for the chain
+// TODO: move elsewhere
 const getChainUri = (chain: DAv2Chain) => {
   switch (chain) {
     case base:
@@ -78,14 +73,7 @@ export function SendCoinButton({
 
   const homeCoin = baseUSDC; // TODO: add home coin to account
   const chainUri = getChainUri(toChain);
-
-  // TODO
-  const supportedSendPairs: SendPair[] = [
-    { chain: base, coin: baseUSDC },
-    { chain: optimism, coin: optimismUSDC },
-    { chain: polygon, coin: polygonUSDC },
-    { chain: arbitrum, coin: arbitrumUSDC },
-  ];
+  const supportedSendPairs = getSupportedSendPairs(toChain.chainId);
 
   return (
     <SelectDropdown

diff --git a/apps/daimo-mobile/src/view/screen/send/SendTransferScreen.tsx b/apps/daimo-mobile/src/view/screen/send/SendTransferScreen.tsx
@@ -7,10 +7,8 @@ import {
   assert,
   assertNotNull,
   baseUSDC,
-  daimoChainToId,
   dollarsToAmount,
   getAccountName,
-  isTestnetChain,
   now,
   DAv2Chain,
   getDAv2Chain,
@@ -225,9 +223,8 @@ function SendChooseAmount({
   const result = rpcHook.validateMemo.useQuery({ memo });
   const memoStatus = result.data;
 
-  // Token swapping is not supported on testnet
-  const isTestnet = isTestnetChain(daimoChainToId(daimoChain));
-  const isFixed = recipient.name != null || isTestnet;
+  // If sending to another DAv2, will be same chain, same coin
+  const sendCoinIsFixed = recipient.name != null;
 
   return (
     <View>
@@ -245,15 +242,17 @@ function SendChooseAmount({
       <Spacer h={16} />
       <View style={styles.detailsRow}>
         <View style={styles.detail}>
-          {!isFixed && <TextMeta color={color.gray3}>{i18.memo()}</TextMeta>}
+          {!sendCoinIsFixed && (
+            <TextMeta color={color.gray3}>{i18.memo()}</TextMeta>
+          )}
           <SendMemoButton
             memo={memo}
             memoStatus={memoStatus}
             setMemo={setMemo}
           />
         </View>
 
-        {!isFixed && (
+        {!sendCoinIsFixed && (
           <View style={styles.detail}>
             <TextMeta color={color.gray3}>{i18.sendAs()}</TextMeta>
             <SendCoinButton

diff --git a/packages/daimo-common/src/i18n/languages/en.ts b/packages/daimo-common/src/i18n/languages/en.ts
@@ -54,7 +54,7 @@ function displayAddrLabel(type: AddrLabel): string {
     case AddrLabel.Binance:
       return `binance`;
     case AddrLabel.FastCCTP:
-      return `instant cross-chain`;
+      return `cross-chain`;
     default:
       return `unknown`;
   }

diff --git a/packages/daimo-common/src/i18n/languages/es.ts b/packages/daimo-common/src/i18n/languages/es.ts
@@ -56,7 +56,7 @@ function displayAddrLabel(type: AddrLabel): string {
     case AddrLabel.Binance:
       return `binance`;
     case AddrLabel.FastCCTP:
-      return `cross-chain instantáneo`;
+      return `cross-chain`;
     default:
       throw new Error(`Invalid AddrLabel: ${type}`);
   }

diff --git a/packages/daimo-common/src/index.ts b/packages/daimo-common/src/index.ts
@@ -26,3 +26,4 @@ export * from "./foreignToken";
 export * from "./chain";
 export * from "./retryBackoff";
 export * from "./cctp";
+export * from "./sendPair";
diff --git a/packages/daimo-common/src/model.ts b/packages/daimo-common/src/model.ts
@@ -21,7 +21,7 @@ export enum AddrLabel {
   LiFi = "li.fi bridge",
   UniswapETHPool = "swapped ETH",
   Binance = "binance",
-  FastCCTP = "instant cross-chain",
+  FastCCTP = "cross-chain",
 }
 
 /** Subset of EAccount for Daimo accounts, which always have a name. */

diff --git a/packages/daimo-common/src/op.ts b/packages/daimo-common/src/op.ts
@@ -37,14 +37,20 @@ export type PendingOp = {
   inviteCode?: string;
 };
 
-/** Original (non-home-coin) inbound transfer, for an inbound swap. */
+/**
+ * Original (non-home-coin) inbound transfer, for an inbound swap or inbound
+ * cross-chain transfer.
+ */
 export type PreSwapTransfer = {
   coin: ForeignToken;
   amount: BigIntStr; // in native unit of the token
   from: Address;
 };
 
-/** Non-home-coin outbound transfer, for an outbound swap. */
+/**
+ * Non-home-coin outbound transfer, for an outbound swap or outbound
+ * cross-chain transfer.
+ */
 export type PostSwapTransfer = {
   coin: ForeignToken;
   amount: BigIntStr; // in native unit of the token

diff --git a/packages/daimo-common/src/sendPair.ts b/packages/daimo-common/src/sendPair.ts
@@ -0,0 +1,43 @@
+import {
+  DAv2Chain,
+  arbitrum,
+  base,
+  baseSepolia,
+  ethereumSepolia,
+  isTestnetChain,
+  optimism,
+  polygon,
+} from "./chain";
+import {
+  ForeignToken,
+  arbitrumUSDC,
+  baseSepoliaUSDC,
+  baseUSDC,
+  ethereumSepoliaUSDC,
+  optimismUSDC,
+  polygonUSDC,
+} from "./foreignToken";
+
+// Supported Chain <> Coin send pair (any coin, any chain)
+export type SendPair = {
+  chain: DAv2Chain;
+  coin: ForeignToken;
+};
+
+const supportedSendPairsMainnet: SendPair[] = [
+  { chain: base, coin: baseUSDC },
+  { chain: optimism, coin: optimismUSDC },
+  { chain: polygon, coin: polygonUSDC },
+  { chain: arbitrum, coin: arbitrumUSDC },
+];
+
+const supportedSendPairsTestnet: SendPair[] = [
+  { chain: baseSepolia, coin: baseSepoliaUSDC },
+  { chain: ethereumSepolia, coin: ethereumSepoliaUSDC },
+];
+
+export const getSupportedSendPairs = (chainId: number): SendPair[] => {
+  return isTestnetChain(chainId)
+    ? supportedSendPairsTestnet
+    : supportedSendPairsMainnet;
+};