Merge branch 'main' of https://gitea.bpsoft.co.kr/nicepayments/nice-app-web

src/entities/additional-service/ui/account-holder-auth/detail/account-holder-auth-detail.tsx

@@ -70,7 +70,6 @@ export const AccountHolderAuthDetail = ({
               ></FullMenuClose>
             </div>
           </div>
-          <div className="tab-pane sub active">
             <div className="pay-top">
               <div className="num-amount">
                 <span className="amount">{detail?.accountName}</span>
@@ -117,7 +116,6 @@ export const AccountHolderAuthDetail = ({
               </ul>
             </div>
           </div>
-        </div>
       </motion.div>
     </>
   );

src/entities/additional-service/ui/account-holder-search/detail/account-holder-search-detail.tsx

@@ -69,7 +69,6 @@ export const AccountHolderSearchDetail = ({
               ></FullMenuClose>
             </div>
           </div>
-          <div className="tab-pane sub active">
             <div className="pay-top">
               <div className="num-amount">
                 <span className="amount">{detail?.accountNo}</span>
@@ -111,7 +110,6 @@ export const AccountHolderSearchDetail = ({
                 </li>
               </ul>
             </div>
-          </div>
         </div>
       </motion.div>
     </>

src/entities/additional-service/ui/alimtalk/detail/alimtalk-detail.tsx

@@ -79,7 +79,6 @@ export const AlimtalkDetail = ({
               ></FullMenuClose>
             </div>
           </div>
-          <div className="tab-pane sub active">
             <div className="pay-top">
               <div className="num-amount">
                 <span className="amount">{ detail?.receiverName }</span>
@@ -125,7 +124,6 @@ export const AlimtalkDetail = ({
                 </li>
               </ul>
             </div>
-          </div>
         </div>
       </motion.div>
     </>

src/entities/additional-service/ui/ars/detail/ars-detail.tsx

@@ -101,7 +101,6 @@ export const ArsDetail = ({
                             ></FullMenuClose>
                         </div>
                     </div>
-                    <div className="tab-pane sub active">
                         <div className="pay-top">
                             <div className="num-amount">
                                 <span className="amount">
@@ -172,7 +171,6 @@ export const ArsDetail = ({
                                 >{t('additionalService.ars.smsResend')}</button>
                             </div>
                         )}
-                    </div>
                 </div>
                 <ArsResendSmsBottomSheet
                     setBottomSheetOn={setBottomSheetOn}

src/entities/additional-service/ui/fund-account/detail/result-detail.tsx

@@ -94,7 +94,6 @@ export const FundAccountResultDetail = ({
               ></FullMenuClose>
             </div>
           </div>
-          <div className="tab-pane sub active">
             <div className="pay-top">
               <div className="num-amount">
                 <span className="amount">
@@ -165,7 +164,6 @@ export const FundAccountResultDetail = ({
                 </li>
               </ul>
             </div>
-          </div>
         </div>
       </motion.div>
       <EmailBottomSheet

src/entities/additional-service/ui/fund-account/detail/transfer-detail.tsx

@@ -93,7 +93,6 @@ export const FundAccountTransferDetail = ({
               ></FullMenuClose>
             </div>
           </div>
-          <div className="tab-pane sub active">
             <div className="pay-top">
               <div className="num-amount">
                 <span className="amount">
@@ -155,7 +154,6 @@ export const FundAccountTransferDetail = ({
                 disabled={detail?.resultStatus !== FundAccountStatus.REGIST_COMPLETE}
               >{t('additionalService.fundAccount.transferRequestButton')}</button>
             </div>
-          </div>
         </div>
       </motion.div>
     </>

src/entities/additional-service/ui/link-payment/detail/link-payment-history-detail.tsx

@@ -167,7 +167,6 @@ export const LinkPaymentHistoryDetail = ({
               ></FullMenuClose>
             </div>
           </div>
-          <div className="tab-pane sub active">
             <div className="pay-top">
               <TitleInfoWrap
                 additionalServiceCategory={AdditionalServiceCategory.LinkPaymentHistory}
@@ -202,7 +201,6 @@ export const LinkPaymentHistoryDetail = ({
               >{t('additionalService.linkPayment.resend')}</button>
             </div>
           </div>
-        </div>
       </motion.div>
     </>
   )

src/entities/additional-service/ui/link-payment/detail/link-payment-wait-detail.tsx

@@ -114,7 +114,6 @@ export const LinkPaymentWaitDetail = ({
               ></FullMenuClose>
             </div>
           </div>
-          <div className="tab-pane sub active">
             <div className="pay-top">
               <TitleInfoWrap
                 additionalServiceCategory={AdditionalServiceCategory.LinkPaymentWait}
@@ -136,7 +135,6 @@ export const LinkPaymentWaitDetail = ({
               disabled={paymentInfo?.processStatus !== LinkPaymentProcessStatus.SEND_REQUEST}
             >{t('additionalService.linkPayment.delete')}</button>
           </div>
-        </div>
       </motion.div>
     </>
   )

src/entities/additional-service/ui/payout/detail/payout-detail.tsx

@@ -121,7 +121,6 @@ export const PayoutDetail = ({
                             ></FullMenuClose>
                         </div>
                     </div>
-                    <div className="tab-pane sub active">
                         <div className="pay-top">
                             <div className="num-amount">
                                 <span className="amount">
@@ -187,7 +186,6 @@ export const PayoutDetail = ({
                                 </li>
                             </ul>
                         </div>
-                    </div>
                 </div>
                 <DownloadTypeBottomSheet
                     bottomSheetOn={downloadTypeBottomSheetOn}

src/pages/setting/setting-page.tsx

@@ -282,7 +282,7 @@ export const SettingPage = () => {
     <>
       <main className="pop">
         <div className="sub-wrap">
-          {/* ✅ Android일 때는 앱 내 설정, 아니면 시스템 권한 표시 */}
+          {/* Android일 때는 앱 내 설정, 아니면 시스템 권한 표시 */}
           <div className="settings-header">
             <div className="settings-title">{t('settings.notificationSettings')}</div>
             <label className="settings-switch">
@@ -292,11 +292,7 @@ export const SettingPage = () => {
                 readOnly
                 onClick={(e) => {
                   e.preventDefault();
-                  if (isAndroid) {
+                  onClickPushNotificationToggle();
-                    onClickNotificationSettingToggle();
-                  } else {
-                    onClickPushNotificationToggle();
-                  }
                 }}
               />
               <span className="slider"></span>