Merge pull request #5592 from EdgeApp/matthew/thorchain-segwit

Add Thorchain Savers bech32 detection

Author: peachbits

CHANGELOG.md

@@ -8,6 +8,8 @@
 - changed: Auto launch QR scanner for multi-out payments if previously used
 - changed: Auto populate amount for multi-out payments if prior amounts are similar
 - changed: Auto scroll to end of `SendScene2` when addresses or amounts change
+- changed: Show Thorchain Savers positions associated with bech32 addresses
+- fixed: Show deprecated stake policies with allocations
 - fixed: No longer show FIO onboarding modal while in Duress Mode.
 - fixed: Prevent pin changes which match duress pin.
 

src/components/scenes/Staking/StakeOptionsScene.tsx

@@ -13,7 +13,7 @@ import { StakePolicy } from '../../../plugins/stake-plugins/types'
 import { useSelector } from '../../../types/reactRedux'
 import { EdgeAppSceneProps } from '../../../types/routerTypes'
 import { getTokenIdForced } from '../../../util/CurrencyInfoHelpers'
-import { getPluginFromPolicyId, getPolicyAssetName, getPolicyIconUris, getPolicyTitleName } from '../../../util/stakeUtils'
+import { getPluginFromPolicyId, getPoliciesFromPlugins, getPolicyAssetName, getPolicyIconUris, getPolicyTitleName } from '../../../util/stakeUtils'
 import { darkenHexColor } from '../../../util/utils'
 import { StakingOptionCard } from '../../cards/StakingOptionCard'
 import { AccentColors } from '../../common/DotsBackground'
@@ -39,16 +39,8 @@ const StakeOptionsSceneComponent = (props: Props) => {
   const { navigation, route, wallet } = props
   const { currencyCode } = route.params
   const [stakePlugins = []] = useAsyncValue(async () => await getStakePlugins(wallet.currencyInfo.pluginId))
-  const stakePolicies = stakePlugins.flatMap(stakePlugin =>
-    stakePlugin
-      .getPolicies({ pluginId })
-      .filter(
-        stakePolicy =>
-          !stakePolicy.deprecated &&
-          stakePolicy.stakeAssets.some(asset => asset.pluginId === wallet.currencyInfo.pluginId && asset.currencyCode === currencyCode)
-      )
-  )
   const stakePositionMap = useSelector(state => state.staking.walletStakingMap[wallet.id]?.stakePositionMap ?? {})
+  const stakePolicies = getPoliciesFromPlugins(stakePlugins, stakePositionMap, wallet, currencyCode)
   const theme = useTheme()
 
   const account = useSelector(state => state.core.account)

src/components/themed/TransactionListTop.tsx

@@ -34,7 +34,14 @@ import { GuiExchangeRates } from '../../types/types'
 import { CryptoAmount } from '../../util/CryptoAmount'
 import { isKeysOnlyPlugin } from '../../util/CurrencyInfoHelpers'
 import { triggerHaptic } from '../../util/haptic'
-import { getBestApyText, getFioStakingBalances, getPluginFromPolicyId, getPositionAllocations, isStakingSupported } from '../../util/stakeUtils'
+import {
+  getBestApyText,
+  getFioStakingBalances,
+  getPluginFromPolicyId,
+  getPoliciesFromPlugins,
+  getPositionAllocations,
+  isStakingSupported
+} from '../../util/stakeUtils'
 import { getUkCompliantString } from '../../util/ukComplianceUtils'
 import { convertNativeToDenomination, DECIMAL_PRECISION, removeIsoPrefix, zeroString } from '../../util/utils'
 import { IconButton } from '../buttons/IconButton'
@@ -738,15 +745,7 @@ export function TransactionListTop(props: OwnProps) {
   const { currencyCode } = tokenId == null ? wallet.currencyInfo : wallet.currencyConfig.allTokens[tokenId]
 
   const [stakePlugins = []] = useAsyncValue<StakePlugin[]>(async () => await getStakePlugins(wallet.currencyInfo.pluginId))
-  const stakePolicies = stakePlugins.flatMap(stakePlugin =>
-    stakePlugin
-      .getPolicies({ wallet, pluginId: wallet.currencyInfo.pluginId, currencyCode })
-      .filter(
-        stakePolicy =>
-          !stakePolicy.deprecated &&
-          stakePolicy.stakeAssets.some(asset => asset.pluginId === wallet.currencyInfo.pluginId && asset.currencyCode === currencyCode)
-      )
-  )
+  const stakePolicies = getPoliciesFromPlugins(stakePlugins, stakePositionMap, wallet, currencyCode)
 
   const displayDenomination = useSelector(state => selectDisplayDenomByCurrencyCode(state, wallet.currencyConfig, currencyCode))
   const exchangeDenomination = getExchangeDenomByCurrencyCode(wallet.currencyConfig, currencyCode)

src/plugins/stake-plugins/stakePlugins.ts

@@ -3,6 +3,7 @@ import { makeTronStakePlugin } from './currency/tronStakePlugin'
 import { makeGenericStakePlugin } from './generic/GenericStakePlugin'
 import { genericPlugins } from './generic/pluginInfo'
 import { makeTcSaversPlugin } from './thorchainSavers/tcSaversPlugin'
+import { makeTcSaversPluginSegwit } from './thorchainSavers/tcSaversPluginSegwit'
 import { StakePlugin } from './types'
 import { makeUniV2StakePlugin } from './uniswapV2/uniV2Plugin'
 
@@ -22,6 +23,9 @@ export const getStakePlugins = async (pluginId: string): Promise<StakePlugin[]>
     makeTcSaversPlugin(pluginId, { initOptions: tcInitOptions }).catch(e => {
       console.warn(e.message)
     }),
+    makeTcSaversPluginSegwit(pluginId, { initOptions: tcInitOptions }).catch(e => {
+      console.warn(e.message)
+    }),
     makeTronStakePlugin(pluginId).catch(e => {
       console.warn(e.message)
     }),

src/plugins/stake-plugins/thorchainSavers/tcSaversPlugin.tsx

@@ -288,7 +288,8 @@ export const makeTcSaversPlugin = async (pluginId: string, opts: EdgeGuiPluginOp
             ...policyDefault,
             stakePolicyId: `tcsavers/${pluginId}:${lowerCc}=${pluginId}:${lowerCc}`,
             rewardAssets: [{ pluginId: 'thorchainrune', currencyCode: 'TCY' }],
-            stakeAssets: [{ pluginId, currencyCode }]
+            stakeAssets: [{ pluginId, currencyCode }],
+            deprecated: true
           })
         }
       })