feat(trading currency): moved KYC modals to be always rendered on top

blockchain · Dec 15, 2021 · 32475b3 · 32475b3
1 parent 5d321de
commit 32475b3
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/packages/blockchain-wallet-v4-frontend/src/components/Flyout/Brokerage/Trade.tsx b/packages/blockchain-wallet-v4-frontend/src/components/Flyout/Brokerage/Trade.tsx
@@ -182,6 +182,4 @@ type RowType = {
   iconName: string
 }
 
-type Props = OwnPropsType
-
 export default Trade
diff --git a/packages/blockchain-wallet-v4-frontend/src/modals/index.tsx b/packages/blockchain-wallet-v4-frontend/src/modals/index.tsx
@@ -167,21 +167,12 @@ const Modals = (props: Props) => {
         {props.modals.find((modal) => modal.type === ModalName.FUND_RECOVERY_MODAL) ? (
           <FundRecovery />
         ) : null}
-        {props.modals.find((modal) => modal.type === ModalName.KYC_MODAL) ? (
-          <IdentityVerification />
-        ) : null}
         {props.modals.find((modal) => modal.type === ModalName.IMPORT_BTC_ADDRESS_MODAL) ? (
           <ImportBtcAddress />
         ) : null}
         {props.modals.find((modal) => modal.type === ModalName.INTEREST_MODAL) ? (
           <Interest />
         ) : null}
-        {props.modals.find((modal) => modal.type === ModalName.KYC_RESUBMIT_MODAL) ? (
-          <KycDocResubmit />
-        ) : null}
-        {props.modals.find((modal) => modal.type === ModalName.KYC_TIER_UPGRADE_MODAL) ? (
-          <KycTierUpgrade />
-        ) : null}
         {props.modals.find((modal) => modal.type === ModalName.LINK_FROM_EXCHANGE_ACCOUNT_MODAL) ? (
           <LinkFromExchangeAccount disableOutsideClose />
         ) : null}
@@ -315,6 +306,15 @@ const Modals = (props: Props) => {
         ) : null}
         {props.modals.find((modal) => modal.type === ModalName.MOBILE_NAV) ? <MobileNav /> : null}
         {props.modals.find((modal) => modal.type === ModalName.NFT_ORDER) ? <NftOrder /> : null}
+        {props.modals.find((modal) => modal.type === ModalName.KYC_MODAL) ? (
+          <IdentityVerification />
+        ) : null}
+        {props.modals.find((modal) => modal.type === ModalName.KYC_RESUBMIT_MODAL) ? (
+          <KycDocResubmit />
+        ) : null}
+        {props.modals.find((modal) => modal.type === ModalName.KYC_TIER_UPGRADE_MODAL) ? (
+          <KycTierUpgrade />
+        ) : null}
         {/* This should always be loaded */}
         <NewVersionAvailable disableOutsideClose />
       </>

diff --git a/packages/blockchain-wallet-v4/src/redux/walletOptions/selectors.ts b/packages/blockchain-wallet-v4/src/redux/walletOptions/selectors.ts
@@ -108,6 +108,6 @@ export const getHotWalletAddresses = (state: RootState, product: Product) =>
 export const getCompleteYourProfile = (state: RootState) =>
   getWebOptions(state).map(path(['featureFlags', 'completeYourProfile']))
 
-// show/hide complete your profile flyout
+// show/hide trading currency flyout
 export const getTradingCurrency = (state: RootState) =>
   getWebOptions(state).map(path(['featureFlags', 'tradingCurrency']))