action fixes

Author: narefyev91

src/pages/workspace/companyCards/BankConnection/index.native.tsx

@@ -52,11 +52,11 @@ function BankConnection({policyID: policyIDFromProps, feed, route}: BankConnecti
     const {bankName: bankNameFromRoute, backTo, policyID: policyIDFromRoute} = route?.params ?? {};
     const policyID = policyIDFromProps ?? policyIDFromRoute;
     const bankName = feed ? getBankName(feed) : (bankNameFromRoute ?? addNewCard?.data?.plaidConnectedFeed ?? selectedBank);
-    const {canUsePlaidCompanyCards} = usePermissions();
+    const {isBetaEnabled} = usePermissions();
     const plaidToken = addNewCard?.data?.publicToken ?? assignCard?.data?.plaidAccessToken;
     const plaidFeed = addNewCard?.data?.plaidConnectedFeed ?? assignCard?.data?.institutionId;
     const plaidFeedName = addNewCard?.data?.plaidConnectedFeedName ?? assignCard?.data?.plaidConnectedFeedName;
-    const url = canUsePlaidCompanyCards && plaidToken ? getCompanyCardPlaidConnection(policyID, plaidToken, plaidFeed, plaidFeedName) : getCompanyCardBankConnection(policyID, bankName);
+    const url = isBetaEnabled(CONST.BETAS.PLAID_COMPANY_CARDS) && plaidToken ? getCompanyCardPlaidConnection(policyID, plaidToken, plaidFeed, plaidFeedName) : getCompanyCardBankConnection(policyID, bankName);
     const [cardFeeds] = useCardFeeds(policyID);
     const [isConnectionCompleted, setConnectionCompleted] = useState(false);
     const prevFeedsData = usePrevious(cardFeeds?.settings?.oAuthAccountDetails);
@@ -67,7 +67,6 @@ function BankConnection({policyID: policyIDFromProps, feed, route}: BankConnecti
     );
     const headerTitleAddCards = !backTo ? translate('workspace.companyCards.addCards') : undefined;
     const headerTitle = feed ? translate('workspace.companyCards.assignCard') : headerTitleAddCards;
-    const {isBetaEnabled} = usePermissions();
 
     const renderLoading = () => <FullScreenLoadingIndicator />;
 

src/pages/workspace/companyCards/WorkspaceCompanyCardsPage.tsx

@@ -57,7 +57,7 @@ function WorkspaceCompanyCardsPage({route}: WorkspaceCompanyCardsPageProps) {
     const selectedFeed = getSelectedFeed(lastSelectedFeed, cardFeeds);
     const [cardsList] = useCardsList(policyID, selectedFeed);
     const [countryByIp] = useOnyx(ONYXKEYS.COUNTRY, {canBeMissing: false});
-    const {canUsePlaidCompanyCards} = usePermissions();
+    const {isBetaEnabled} = usePermissions();
 
     const {cardList, ...cards} = cardsList ?? {};
 
@@ -185,7 +185,7 @@ function WorkspaceCompanyCardsPage({route}: WorkspaceCompanyCardsPageProps) {
                             isDisabledAssignCardButton={!selectedFeedData || isFeedConnectionBroken}
                         />
                     )}
-                    {isGB && !!canUsePlaidCompanyCards && (isNoFeed || (isFeedAdded && !isPending)) && (
+                    {isGB && isBetaEnabled(CONST.BETAS.PLAID_COMPANY_CARDS) && (isNoFeed || (isFeedAdded && !isPending)) && (
                         <View style={[styles.sidebarFooter, styles.mb5]}>
                             <Text style={[styles.chatItemMessageHeaderTimestamp]}>{translate('workspace.companyCards.ukRegulation')}</Text>
                         </View>

src/pages/workspace/companyCards/addNew/CardTypeStep.tsx

@@ -88,8 +88,8 @@ function CardTypeStep() {
     const [addNewCard] = useOnyx(ONYXKEYS.ADD_NEW_COMPANY_CARD, {canBeMissing: true});
     const [typeSelected, setTypeSelected] = useState<CardFeedProvider>();
     const [isError, setIsError] = useState(false);
-    const {canUsePlaidCompanyCards} = usePermissions();
-    const data = getAvailableCompanyCardTypes({translate, typeSelected, styles: styles.mr3, canUsePlaidCompanyCards});
+    const {isBetaEnabled} = usePermissions();
+    const data = getAvailableCompanyCardTypes({translate, typeSelected, styles: styles.mr3, canUsePlaidCompanyCards: isBetaEnabled(CONST.BETAS.PLAID_COMPANY_CARDS)});
     const {bankName, selectedBank, feedType} = addNewCard?.data ?? {};
     const isOtherBankSelected = selectedBank === CONST.COMPANY_CARDS.BANKS.OTHER;
     const isNewCardTypeSelected = typeSelected !== feedType;