diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/SendAction.kt b/app/src/main/java/com/tangem/tap/features/send/redux/SendAction.kt index 6621539b8d..1e28b71713 100644 --- a/app/src/main/java/com/tangem/tap/features/send/redux/SendAction.kt +++ b/app/src/main/java/com/tangem/tap/features/send/redux/SendAction.kt @@ -10,5 +10,5 @@ interface SendAction : Action sealed class FeeLayout : SendAction { object ToggleFeeLayoutVisibility : FeeLayout() data class ChangeSelectedFee(val id: Int) : FeeLayout() - class ChangeLoremState(val isChecked: Boolean) : FeeLayout() + class ChangeIncludeFee(val isChecked: Boolean) : FeeLayout() } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/SendReducer.kt b/app/src/main/java/com/tangem/tap/features/send/redux/SendReducer.kt index 7e70ffe625..69c58dde89 100644 --- a/app/src/main/java/com/tangem/tap/features/send/redux/SendReducer.kt +++ b/app/src/main/java/com/tangem/tap/features/send/redux/SendReducer.kt @@ -31,8 +31,8 @@ class SendReducer { val result = state.copy(selectedFeeId = action.id) updateLastState(sendState.copy(feeLayoutState = result), result) } - is FeeLayout.ChangeLoremState -> { - val result = state.copy(swLoremIsChecked = action.isChecked) + is FeeLayout.ChangeIncludeFee -> { + val result = state.copy(includeFeeIsChecked = action.isChecked) updateLastState(sendState.copy(feeLayoutState = result), result) } } diff --git a/app/src/main/java/com/tangem/tap/features/send/redux/SendState.kt b/app/src/main/java/com/tangem/tap/features/send/redux/SendState.kt index 9baf474de8..e2e5c5aa38 100644 --- a/app/src/main/java/com/tangem/tap/features/send/redux/SendState.kt +++ b/app/src/main/java/com/tangem/tap/features/send/redux/SendState.kt @@ -17,5 +17,5 @@ class NoneState : StateType data class FeeLayoutState( val visibility: Int = View.GONE, val selectedFeeId: Int = R.id.chipNormal, - val swLoremIsChecked: Boolean = false + val includeFeeIsChecked: Boolean = false ) : StateType \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/send/ui/SendFragment.kt b/app/src/main/java/com/tangem/tap/features/send/ui/SendFragment.kt index f7880fec0e..40f2689a18 100644 --- a/app/src/main/java/com/tangem/tap/features/send/ui/SendFragment.kt +++ b/app/src/main/java/com/tangem/tap/features/send/ui/SendFragment.kt @@ -27,8 +27,8 @@ class SendFragment : BaseStoreFragment(R.layout.fragment_send) { chipGroup.setOnCheckedChangeListener { group, checkedId -> store.dispatch(FeeLayout.ChangeSelectedFee(checkedId)) } - swLorem.setOnCheckedChangeListener { btn, isChecked -> - store.dispatch(FeeLayout.ChangeLoremState(isChecked)) + swIncludeFee.setOnCheckedChangeListener { btn, isChecked -> + store.dispatch(FeeLayout.ChangeIncludeFee(isChecked)) } } diff --git a/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt b/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt index 9e98f807ba..3f4ea153f4 100644 --- a/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt +++ b/app/src/main/java/com/tangem/tap/features/send/ui/stateSubscribers/SendStateSubscriber.kt @@ -30,8 +30,8 @@ class SendStateSubscriber(fragment: Fragment) : FragmentStateSubscriber + android:text="@string/send_fee_low" /> + android:text="@string/send_fee_normal" /> + android:text="@string/send_fee_priority" /> + android:text="" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 99d4f806f6..e2e3a516c9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -33,10 +33,11 @@ Send Address or PayID - Network fee - Low - Normal - Priority + Network fee + Include fee + Low + Normal + Priority Send Total Amount