View on GitHub
File Changes

                      
const calculateDateRange = (
  dateRange: string,
-
  customDateRange: { customFromDate: string, customToDate: string }
+
  customDateRange: { customFromDate: string, customToDate: string },
+
  defaultDateRange: { defaultFromDate: string, defaultToDate: string }
) => {
  const { customFromDate, customToDate } = customDateRange;
+
  const { defaultFromDate = '', defaultToDate = '' } = defaultDateRange || {};
  let fromDate = null;
  let toDate = null;

                      
  if (dateRange === DateRangeTypes.ALL) {
-
    fromDate = '';
-
    toDate = '';
+
    fromDate = defaultFromDate;
+
    toDate = defaultToDate;
  } else if (dateRange === DateRangeTypes.CUSTOM_DATE_RANGE) {
    fromDate = customFromDate;
    toDate = customToDate;
  handleSubmit = () =>
    this.form.submit({
      onSuccess: form => {
-
        const { onFilter } = this.props;
+
        const { onFilter, fromDate, toDate } = this.props;
        const {
          dateRange,
          customFromDate,
          customToDate,
          ...rest
        } = form.values();
-
        const dateRangePayload = calculateDateRange(dateRange, {
-
          customFromDate,
-
          customToDate,
-
        });
+
        const dateRangePayload = calculateDateRange(
+
          dateRange,
+
          { customFromDate, customToDate },
+
          { defaultFromDate: fromDate || '', defaultToDate: toDate || '' }
+
        );

                      
        onFilter({
          ...rest,
  "wallet.transferFunds.dialog2.passphraseFieldPlaceholder": "送信時パスワードを入力してください",
  "wallet.transferFunds.dialog2.passphraseLabel": "送信時パスワード",
  "wallet.transferFunds.dialog2.title": "残高ウォレットの資金を移し替える"
-
}
+
}
\ No newline at end of file
) => {
  const {
    searchTerm,
+
    dateRange,
    fromDate,
    toDate,
    fromAmount,
  if (searchTerm) {
    result++;
  }
-
  if (fromDate || toDate) {
+
  if (dateRange !== DateRangeTypes.ALL && (fromDate || toDate)) {
    result++;
  }
  if (fromAmount || toAmount) {