Feat - external provider changes

.changeset/angry-beans-yawn.md

@@ -0,0 +1,5 @@
+---
+"@stakekit/widget": patch
+---
+
+feat: tokens for enabled yields only option

.changeset/clean-teeth-love.md

@@ -0,0 +1,5 @@
+---
+"@stakekit/widget": patch
+---
+
+feat(externalProviders): add tron support

.changeset/six-rats-return.md

@@ -0,0 +1,5 @@
+---
+"@stakekit/widget": patch
+---
+
+feat(externalProviders): display signTransaction message

.changeset/sour-papers-grow.md

@@ -0,0 +1,5 @@
+---
+"@stakekit/widget": patch
+---
+
+feat(externalProviders): provider details in txMeta

.changeset/stupid-lights-taste.md

@@ -0,0 +1,5 @@
+---
+"@stakekit/widget": patch
+---
+
+fix(bundledWidget): allow multiple re-renders

.changeset/three-garlics-remain.md

@@ -0,0 +1,5 @@
+---
+"@stakekit/widget": patch
+---
+
+feat(tracking): add action steps cancelled event

packages/widget/package.json

@@ -71,7 +71,7 @@
     "@radix-ui/react-visually-hidden": "^1.1.3",
     "@safe-global/safe-apps-provider": "^0.18.6",
     "@safe-global/safe-apps-sdk": "^9.1.0",
-    "@stakekit/api-hooks": "0.0.98",
+    "@stakekit/api-hooks": "0.0.100",
     "@stakekit/common": "^0.0.48",
     "@stakekit/rainbowkit": "^2.2.4",
     "@tanstack/react-query": "^5.74.0",

packages/widget/src/App.tsx

@@ -239,14 +239,14 @@ export const SKApp = (props: SKAppProps) => {
 };
 
 export type BundledSKWidgetProps = SKAppProps & {
-  ref?: RefObject<{ rerender: (newProps: SKAppProps) => void }>;
+  ref?: RefObject<{ rerender: (newProps: BundledSKWidgetProps) => void }>;
 };
 
 const BundledSKWidget = (_props: BundledSKWidgetProps) => {
   const [props, setProps] = useState(_props);
 
   useImperativeHandle(props.ref, () => ({
-    rerender: (newProps: SKAppProps) => setProps(newProps),
+    rerender: (newProps: BundledSKWidgetProps) => setProps(newProps),
   }));
 
   return <SKApp {...props} />;
@@ -269,6 +269,7 @@ export const renderSKWidget = ({
   root.render(<BundledSKWidget {...rest} ref={appRef} />);
 
   return {
-    rerender: (newProps: SKAppProps) => appRef.current.rerender(newProps),
+    rerender: (newProps: SKAppProps) =>
+      appRef.current.rerender({ ...newProps, ref: appRef }),
   };
 };

packages/widget/src/common/get-token-balances.ts

@@ -3,21 +3,28 @@ import { EitherAsync, Right } from "purify-ts";
 import type { SKWallet } from "../domain/types";
 import { getDefaultTokens } from "../hooks/api/use-default-tokens";
 import { getTokenBalancesScan } from "../hooks/api/use-token-balances-scan";
+import type { SettingsProps } from "../providers/settings";
 
 export const getTokenBalances = ({
   additionalAddresses,
   address,
   network,
   queryClient,
+  tokensForEnabledYieldsOnly,
 }: {
   additionalAddresses: SKWallet["additionalAddresses"];
   address: SKWallet["address"];
   queryClient: QueryClient;
   network: SKWallet["network"];
+  tokensForEnabledYieldsOnly: SettingsProps["tokensForEnabledYieldsOnly"];
 }) =>
   EitherAsync.fromPromise(() =>
     Promise.all([
-      getDefaultTokens({ queryClient, network }),
+      getDefaultTokens({
+        queryClient,
+        network: network ?? undefined,
+        enabledYieldsOnly: tokensForEnabledYieldsOnly,
+      }),
       EitherAsync.liftEither(
         Right({ additionalAddresses, address, network })
       ).chain(async (params) => {

packages/widget/src/domain/types/chains.ts

@@ -124,6 +124,10 @@ export const isTonChain = (chain: string): chain is SupportedMiscChains => {
   return chain === MiscNetworks.Ton;
 };
 
+export const isTronChain = (chain: string): chain is SupportedMiscChains => {
+  return chain === MiscNetworks.Tron;
+};
+
 export const isSupportedChain = (chain: string): chain is SupportedSKChains => {
   return (
     isEvmChain(chain) ||

packages/widget/src/domain/types/external-providers.ts

@@ -1,36 +1,33 @@
-import type { ActionDto, TransactionDto } from "@stakekit/api-hooks";
-import { EitherAsync, Left } from "purify-ts";
+import { EitherAsync, Left, Maybe, Right } from "purify-ts";
 import type { RefObject } from "react";
 import type { SKExternalProviders } from "./wallets";
-import type { SKTx } from "./wallets/generic-wallet";
+import type { SKTx, SKTxMeta } from "./wallets/generic-wallet";
 
 export class ExternalProvider {
   constructor(private variantProvider: RefObject<SKExternalProviders>) {}
 
-  private invalidProviderType() {
-    return EitherAsync.liftEither(Left(new Error("Invalid provider type")));
-  }
-
-  sendTransaction(
-    tx: SKTx,
-    txMeta: {
-      txId: TransactionDto["id"];
-      actionId: ActionDto["id"];
-      actionType: ActionDto["type"];
-      txType: TransactionDto["type"];
-    }
-  ) {
-    const _sendTransaction =
-      this.variantProvider.current.provider.sendTransaction;
+  sendTransaction(tx: SKTx, txMeta: SKTxMeta) {
+    return EitherAsync.liftEither(
+      Maybe.fromNullable(
+        this.variantProvider.current.provider.sendTransaction
+      ).toEither(new Error("Invalid provider type"))
+    )
+      .chain((_sendTransaction) =>
+        EitherAsync(() => _sendTransaction(tx, txMeta)).mapLeft(
+          () => new Error("Failed to send transaction, unknown error")
+        )
+      )
+      .chain((res) => {
+        if (typeof res === "string") {
+          return EitherAsync.liftEither(Right(res));
+        }
 
-    if (!_sendTransaction) {
-      return this.invalidProviderType();
-    }
+        if (res.type === "success") {
+          return EitherAsync.liftEither(Right(res.txHash));
+        }
 
-    return EitherAsync(() => _sendTransaction(tx, txMeta)).mapLeft((e) => {
-      console.log(e);
-      return new Error("Failed to send transaction");
-    });
+        return EitherAsync.liftEither(Left(res.error));
+      });
   }
 
   switchChain({ chainId }: { chainId: number }) {

packages/widget/src/domain/types/wallet.ts

@@ -1,32 +1,25 @@
 import type { Account } from "@ledgerhq/wallet-api-client";
+import type { SendTransactionError } from "@sk-widget/providers/sk-wallet/errors";
+import type { TransactionDecodeError } from "@sk-widget/providers/sk-wallet/errors";
 import type {
-  ActionDto,
   AddressWithTokenDtoAdditionalAddresses,
   Networks,
   TransactionDto,
 } from "@stakekit/api-hooks";
 import type { EitherAsync } from "purify-ts";
 import type { Chain } from "viem";
 import type { Connector } from "wagmi";
-import type {
-  SendTransactionError,
-  TransactionDecodeError,
-} from "../../pages/steps/hooks/errors";
 import type { Nullable } from "../../types";
 import type { SupportedSKChains } from "./chains";
+import type { SKTxMeta } from "./wallets/generic-wallet";
 
 type SignedTxOrMessage = string;
 
 export type SKWallet = {
   disconnect: () => Promise<void>;
   signTransaction: (args: {
     tx: NonNullable<TransactionDto["unsignedTransaction"]>;
-    txMeta: {
-      txId: TransactionDto["id"];
-      actionId: ActionDto["id"];
-      actionType: ActionDto["type"];
-      txType: TransactionDto["type"];
-    };
+    txMeta: SKTxMeta;
     ledgerHwAppId: Nullable<string>;
     network: Networks;
   }) => EitherAsync<

packages/widget/src/domain/types/wallets/generic-wallet.ts

@@ -1,8 +1,11 @@
-import type { ActionDto, TransactionDto } from "@stakekit/api-hooks";
+import type {
+  ActionDto,
+  RewardTypes,
+  TransactionDto,
+} from "@stakekit/api-hooks";
+import type * as TronWeb from "tronweb";
 import type { Hex } from "viem";
 
-type Base64String = string;
-
 export enum TxType {
   Legacy = "0x1",
   EIP1559 = "0x2",
@@ -29,29 +32,53 @@ export type EVMTx = {
   );
 };
 
-export type SolanaTx = { type: "solana"; tx: Base64String };
+export type SolanaTx = { type: "solana"; tx: string };
 
 export type TonTx = {
   type: "ton";
   tx: {
     seqno: bigint;
-    message: Base64String;
+    message: string;
   };
 };
 
-export type SKTx = EVMTx | SolanaTx | TonTx;
+export type TronTx = {
+  type: "tron";
+  tx: TronWeb.Types.Transaction;
+};
+
+export type SKTx = EVMTx | SolanaTx | TonTx | TronTx;
+
+export type ActionMeta = {
+  actionId: ActionDto["id"];
+  actionType: ActionDto["type"];
+  amount: ActionDto["amount"];
+  inputToken: ActionDto["inputToken"];
+  providersDetails: {
+    name: string;
+    address: string | undefined;
+    rewardRate: number | undefined;
+    rewardType: RewardTypes;
+    website: string | undefined;
+    logo: string | undefined;
+  }[];
+};
+
+export type SKTxMeta = ActionMeta & {
+  txId: TransactionDto["id"];
+  txType: TransactionDto["type"];
+};
 
 export type SKWallet = {
   signMessage: (message: string) => Promise<string>;
   switchChain: (chainId: number) => Promise<void>;
   getTransactionReceipt?(txHash: string): Promise<{ transactionHash?: string }>;
   sendTransaction(
     tx: SKTx,
-    txMeta: {
-      txId: TransactionDto["id"];
-      actionId: ActionDto["id"];
-      actionType: ActionDto["type"];
-      txType: TransactionDto["type"];
-    }
-  ): Promise<string>;
+    txMeta: SKTxMeta
+  ): Promise<
+    | string
+    | { type: "success"; txHash: string }
+    | { type: "error"; error: string }
+  >;
 };

packages/widget/src/hooks/api/use-default-tokens.ts

@@ -1,17 +1,27 @@
-import type { TokenBalanceScanResponseDto } from "@stakekit/api-hooks";
+import { useSettings } from "@sk-widget/providers/settings";
+import type {
+  TokenBalanceScanResponseDto,
+  TokenGetTokensParams,
+} from "@stakekit/api-hooks";
 import { getTokenGetTokensQueryKey, tokenGetTokens } from "@stakekit/api-hooks";
 import type { QueryClient } from "@tanstack/react-query";
 import { useQuery } from "@tanstack/react-query";
 import { EitherAsync } from "purify-ts";
-import type { SKWallet } from "../../domain/types";
 import { useSKWallet } from "../../providers/sk-wallet";
 
 export const useDefaultTokens = () => {
   const { network } = useSKWallet();
+  const { tokensForEnabledYieldsOnly } = useSettings();
 
   return useQuery({
     queryKey: getTokenGetTokensQueryKey({ network: network ?? undefined }),
-    queryFn: async () => (await queryFn({ network })).unsafeCoerce(),
+    queryFn: async () =>
+      (
+        await queryFn({
+          network: network ?? undefined,
+          enabledYieldsOnly: !!tokensForEnabledYieldsOnly,
+        })
+      ).unsafeCoerce(),
     staleTime: 1000 * 60 * 5,
   });
 };
@@ -33,10 +43,13 @@ export const getDefaultTokens = (
 
 const queryFn = ({
   network,
-}: {
-  network: SKWallet["network"];
-}) =>
-  EitherAsync(() => tokenGetTokens({ network: network ?? undefined })).map(
-    (val) =>
-      val.map<TokenBalanceScanResponseDto>((v) => ({ ...v, amount: "0" }))
+  enabledYieldsOnly,
+}: Pick<TokenGetTokensParams, "network" | "enabledYieldsOnly">) =>
+  EitherAsync(() =>
+    tokenGetTokens({
+      network,
+      enabledYieldsOnly: enabledYieldsOnly || undefined,
+    })
+  ).map((val) =>
+    val.map<TokenBalanceScanResponseDto>((v) => ({ ...v, amount: "0" }))
   );

packages/widget/src/pages/details/earn-page/state/use-init-token.ts

@@ -23,7 +23,7 @@ export const useInitToken = () => {
   const queryClient = useSKQueryClient();
   const { data: positionsData } = usePositionsData();
 
-  const { externalProviders } = useSettings();
+  const { externalProviders, tokensForEnabledYieldsOnly } = useSettings();
 
   return useQuery({
     staleTime: Number.POSITIVE_INFINITY,
@@ -41,6 +41,7 @@ export const useInitToken = () => {
           address,
           network,
           queryClient,
+          tokensForEnabledYieldsOnly,
         }).chain((val) =>
           getInitParams({
             isLedgerLive,

packages/widget/src/pages/details/earn-page/state/use-init-yield.ts

@@ -21,7 +21,7 @@ export const useInitYield = ({
   const { isLedgerLive, isConnected, network, additionalAddresses, address } =
     useSKWallet();
   const queryClient = useSKQueryClient();
-  const { externalProviders } = useSettings();
+  const { externalProviders, tokensForEnabledYieldsOnly } = useSettings();
   const { data: positionsData } = usePositionsData();
 
   return useQuery({
@@ -44,6 +44,7 @@ export const useInitYield = ({
             address,
             network,
             queryClient,
+            tokensForEnabledYieldsOnly,
           })
             .chain((val) =>
               EitherAsync.liftEither(