Fix balance related blockers for migration #612
Conversation
| const displayedBalance = useMemo(() => { | ||
| // olas across master wallets, safes and eoa | ||
| // olas across master wallet -- safes and eoa -- on relevant chains for agent | ||
| const masterWalletOlasBalance = masterWalletBalances?.reduce( | ||
| (acc, { symbol, balance }) => { | ||
| if (symbol === TokenSymbol.OLAS) { | ||
| (acc, { symbol, balance, evmChainId }) => { | ||
| if ( | ||
| symbol === TokenSymbol.OLAS && | ||
| selectedAgentConfig.requiresAgentSafesOn.includes(evmChainId) | ||
| ) { |
There was a problem hiding this comment.
fine to aggregate olas across potential chains for display balance
| // olas across all wallets owned by selected service | ||
| const serviceWalletOlasBalance = serviceWalletBalances?.reduce( | ||
| (acc, { symbol, balance }) => { | ||
| if (symbol === TokenSymbol.OLAS) { | ||
| (acc, { symbol, balance, evmChainId }) => { | ||
| if ( | ||
| symbol === TokenSymbol.OLAS && | ||
| selectedAgentConfig.requiresAgentSafesOn.includes(evmChainId) | ||
| ) { |
There was a problem hiding this comment.
ensuring we don't calculate funds not on chains irrelevant to the agent
| const requiredOlasDeposit = | ||
| requiredStakedOlas - | ||
| sum([ | ||
| masterSafeBalanceOnHomeChain[TokenSymbol.OLAS], | ||
| totalStakedOlasBalanceOnHomeChain, | ||
| ]); |
There was a problem hiding this comment.
removed this condition, may be breaking due to suspension or eviction
sum allows for null/undefined so don't need to guard here
middleware will migrate funds from the current contract if migration required
| const masterSafeOlasBalance = masterWalletBalances | ||
| ?.filter((walletBalance) => walletBalance.symbol === TokenSymbol.OLAS) | ||
| ?.filter( | ||
| (walletBalance) => | ||
| walletBalance.symbol === TokenSymbol.OLAS && | ||
| selectedAgentConfig.requiresMasterSafesOn.includes( | ||
| walletBalance.evmChainId, | ||
| ), | ||
| ) | ||
| .reduce((acc, balance) => acc + balance.balance, 0); |
There was a problem hiding this comment.
found this confusing as funds from base where shown here while on predict
There was a problem hiding this comment.
yeah, fixed in a different PR, please feel free to keep your change in the conflicts.
| const masterSafeOlasBalance = masterWalletBalances | ||
| ?.filter((walletBalance) => walletBalance.symbol === TokenSymbol.OLAS) | ||
| ?.filter( | ||
| (walletBalance) => | ||
| walletBalance.symbol === TokenSymbol.OLAS && | ||
| selectedAgentConfig.requiresMasterSafesOn.includes( | ||
| walletBalance.evmChainId, | ||
| ), | ||
| ) | ||
| .reduce((acc, balance) => acc + balance.balance, 0); |
There was a problem hiding this comment.
yeah, fixed in a different PR, please feel free to keep your change in the conflicts.
Proposed changes
Types of changes
What types of changes does your code introduce?
Put an
xin the boxes that apply