[C-963] Migrate wallet sagas (#1857)

* Migrate wallet sagas * Fix types
AudiusProject · Sep 2, 2022 · 436cd27 · 436cd27
1 parent 238d729
commit 436cd27
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 3 deletions.
diff --git a/packages/mobile/src/store/sagas.ts b/packages/mobile/src/store/sagas.ts
@@ -10,6 +10,7 @@ import confirmerSagas from 'common/store/confirmer/sagas'
 import signOnSagas from 'common/store/pages/signon/sagas'
 import signOutSagas from 'common/store/sign-out/sagas'
 import tippingSagas from 'common/store/tipping/sagas'
+import walletSagas from 'common/store/wallet/sagas'
 import { all, fork } from 'typed-redux-saga'
 
 import initKeyboardEvents from './keyboard/sagas'
@@ -37,6 +38,8 @@ export default function* rootSaga() {
     // Tipping
     ...tippingSagas(),
 
+    ...walletSagas(),
+
     initKeyboardEvents,
     ...remoteConfig(),
     ...oauthSagas()

diff --git a/packages/web/src/store/wallet/sagas.ts → ...ages/web/src/common/store/wallet/sagas.ts b/packages/web/src/store/wallet/sagas.ts → ...ages/web/src/common/store/wallet/sagas.ts
@@ -20,7 +20,8 @@ import { all, call, put, take, takeEvery, select } from 'typed-redux-saga'
 
 import { make } from 'common/store/analytics/actions'
 import { SETUP_BACKEND_SUCCEEDED } from 'common/store/backend/actions'
-import { getAssociatedTokenRentExemptionMinimum } from 'services/audius-backend/BuyAudio'
+
+const ATA_SIZE = 165 // Size allocated for an associated token account
 
 const {
   getBalance,
@@ -233,15 +234,25 @@ function* fetchBalanceAsync() {
  */
 function* checkAssociatedTokenAccountOrSol(action: InputSendDataAction) {
   const walletClient = yield* getContext('walletClient')
+  const { audiusLibs } = yield* getContext('audiusBackendInstance')
   const address = action.payload.wallet
+
+  const connection = audiusLibs.solanaWeb3Manager!.connection
+
   const associatedTokenAccount = yield* call(() =>
     walletClient.getAssociatedTokenAccountInfo(address)
   )
   if (!associatedTokenAccount) {
     const balance: BNWei = yield* call(() =>
       walletClient.getWalletSolBalance(address)
     )
-    const minRentForATA = yield* call(getAssociatedTokenRentExemptionMinimum)
+
+    // TODO: this can become a call to getAssociatedTokenRentExemptionMinimum
+    // when the BuyAudio service has been migrated
+    const minRentForATA = yield* connection.getMinimumBalanceForRentExemption(
+      ATA_SIZE,
+      'processed'
+    )
     const minRentBN = new BN(minRentForATA)
     if (balance.lt(minRentBN)) {
       yield* put(

diff --git a/packages/web/src/store/sagas.ts b/packages/web/src/store/sagas.ts
@@ -47,6 +47,7 @@ import notificationUsersPageSagas from 'common/store/user-list/notifications/sag
 import repostPageSagas from 'common/store/user-list/reposts/sagas'
 import supportingPageSagas from 'common/store/user-list/supporting/sagas'
 import topSupportersPageSagas from 'common/store/user-list/top-supporters/sagas'
+import walletSagas from 'common/store/wallet/sagas'
 import addToPlaylistSagas from 'components/add-to-playlist/store/sagas'
 import changePasswordSagas from 'components/change-password/store/sagas'
 import firstUploadModalSagas from 'components/first-upload-modal/store/sagas'
@@ -79,7 +80,6 @@ import playlistLibrarySagas from 'store/playlist-library/sagas'
 import routingSagas from 'store/routing/sagas'
 import solanaSagas from 'store/solana/sagas'
 import tokenDashboardSagas from 'store/token-dashboard/sagas'
-import walletSagas from 'store/wallet/sagas'
 
 const NATIVE_MOBILE = process.env.REACT_APP_NATIVE_MOBILE